Squashing bugs in merge..