Remove more diff markers