Fix most merge conflicts.