Fix wrong merge conflict resolution by deleting marked