Tidy up merge conflicts.