Updated map files
Fixed merge issues