added option to keep all mappings in merge