benchmar: more merge fixing