Remove some merge conflicts.