diff --git a/app/views/map/index.html.haml b/app/views/map/index.html.haml
index a128c61872..9fec2290d8 100644
--- a/app/views/map/index.html.haml
+++ b/app/views/map/index.html.haml
@@ -1,9 +1,3 @@
-<<<<<<< HEAD
-- content_for :scripts do
-  %script{src: "//maps.googleapis.com/maps/api/js?sensor=false"}
-
-=======
->>>>>>> master
 = inject_json "enterprisesForMap" , "enterprises_for_map", collection: @enterprises
 
 .ofn-map-container{"fill-vertical" => true}