Fixing busted merge