Added conflict resolution for merges.
The map legend now defaults to open so that it will display as soon as the user adds layers.  Toggling the legend is now handled by a button on the map below the ‘zoom to world’ button.