Fix patch conflicts.