Update merge conflicts.