Remove conflict marker