Remove conflict marker left in error