squashing bugs in merge