Remove merge conflict markup