Remove stray diff markers