Remove some merge conflicts