Delete merge conflict with head