benchmar: even more merge fixes