Remove stray conflict marker