correct bad merge conflict resolution (from wip-ARAKOON-311)