remove merge conflict markers