moved some conflicting mappings: