Remove conflict marker left in by mistake