Revert "move rmerge to kits.map and make it handle nils as empty maps"

This reverts commit 91adf3b33e8799f0b5d76ae53d59d946222efb35.