Fix up last merge detritus