Remove merge detritus