setup changes
changes to map styles
fix merge conflict