Remove some detritus remaining from merge errors