Correctly resolve merge conflicts.