resolved conflict

css/app.css

@@ -1064,7 +1064,17 @@ div.typeahead a:first-child {
 }
 
 .Browse .tooltip .tooltip-arrow {
-    left: 30px;
-    }
-
+  left: 30px;
+}
 
+.tail {
+  pointer-events:none;
+  position: absolute;
+  background: rgba(255, 255, 255, 0.7);
+  max-width: 250px;
+  margin-top: -15px;
+  padding: 5px;
+  -webkit-border-radius: 4px;
+     -moz-border-radius: 4px;
+          border-radius: 4px;
+}

css/map.css

@@ -65,9 +65,12 @@ g.vertex circle.stroke {
     fill:#333;
 }
 
-g.vertex.shared circle {
+g.vertex.shared circle.fill {
     fill:#aff;
 }
+g.vertex.shared circle.stroke {
+    fill:#044;
+}
 
 g.vertex.hover circle.fill {
     -webkit-transform:scale(1.5, 1.5);
@@ -81,9 +84,12 @@ g.vertex.hover circle.stroke {
     transform:scale(1.4, 1.4);
 }
 
-g.vertex circle.selected {
+g.vertex circle.selected.fill {
     fill: #ffff00;
 }
+g.vertex circle.selected.stroke {
+    fill: #38380A;
+}
 
 circle.midpoint {
     fill:#aaa;
@@ -252,9 +258,6 @@ path.casing.tag-highway-secondary_link {
     stroke:#444;
 }
 
-path.stroke.tag-bridge-yes {
-    stroke:#eee;
-}
 path.casing.tag-bridge-yes {
     stroke-width: 14;
     stroke: #000;