remove diff markers