Deleting some merge conflicts