resolving merge conflicts

modules/renderer/background.js

@@ -169,6 +169,7 @@ export function rendererBackground(context) {
         var streetside = context.layers().layer('streetside');
         if (streetside && streetside.enabled()) {
             imageryUsed.push('Bing Streetside');
+        }
 
         var mvt = context.layers().layer('mvt');
         if (mvt && mvt.enabled() && mvt.hasMvt()) {

modules/svg/layers.js

@@ -9,11 +9,8 @@ import { select as d3_select } from 'd3-selection';
 
 import { svgDebug } from './debug';
 import { svgGpx } from './gpx';
-<<<<<<< HEAD
 import { svgStreetside } from './streetside';
-=======
 import { svgMvt } from './mvt';
->>>>>>> 9b88bc9d1... button works with .gpx
 import { svgMapillaryImages } from './mapillary_images';
 import { svgMapillarySigns } from './mapillary_signs';
 import { svgOpenstreetcamImages } from './openstreetcam_images';