fixing up nasty merge