delete merge conflict pdf