Merged map with master