Remove conflict mark