deleted merge conflict