smashing bugs
merge