nasty merge