removed merge detritus