Resolve duplicate mapping