remove merge conflict insertions