diff --git a/wells/index.html b/wells/index.html
index 86d856f..29d6b47 100644
--- a/wells/index.html
+++ b/wells/index.html
@@ -174,8 +174,7 @@ $("#about").click(function(){
 
 </script>
 
-<<<<<<< HEAD
-=======
+
 <!-- scaleable wrapper -->
 <!-- <script>
 var $el = $("#thesis");
@@ -211,7 +210,7 @@ size: {
 }
 doResize(null, starterData);
 </script> -->
->>>>>>> f589ef5ab8aff787a3421ad0701fb57769be1f4c
+
 
 </div>
 </body>
diff --git a/wells/static/js/d3_map.js b/wells/static/js/d3_map.js
index d210bce..b5e7a26 100644
--- a/wells/static/js/d3_map.js
+++ b/wells/static/js/d3_map.js
@@ -76,7 +76,6 @@ var divBio = d3.select("body").append("div").style("opacity", 1);
 
 
 
-
       force.on("tick", function() {
         link.attr("x1", function(d) { return d.source.x; })
             .attr("y1", function(d) { return d.source.y; })