Working on the Maps screen
Merging
Maps on maps on maps
Resolving merge conflicts
Resolving merge conflicts