fixing merge the hard way