diff --git a/app/assets/javascripts/src/Metamaps.js b/app/assets/javascripts/src/Metamaps.js
index 053fda2a..156a90f7 100644
--- a/app/assets/javascripts/src/Metamaps.js
+++ b/app/assets/javascripts/src/Metamaps.js
@@ -1458,7 +1458,7 @@ Metamaps.Realtime = {
         });
         $('body').click(self.close);
 
-        self.socket = io.connect('http://localhost:5001'); 
+        self.socket = io.connect('http://gentle-savannah-1303.herokuapp.com');
         self.startActiveMap();
     },
     toggleBox: function (event) {
@@ -1635,7 +1635,7 @@ Metamaps.Realtime = {
             $('#mapper' + data.userid).remove();
             $('.realtimeMapperList ul').append(mapperListItem);
 
-<<<<<<< HEAD
+<<<<<<< HEAD
         // create a div for the collaborators compass
         $('#compass' + data.userid).remove();
         $('<div/>', {
@@ -1643,7 +1643,7 @@ Metamaps.Realtime = {
             class: 'collabCompass'
         }).html('<img width="28" height="28" src="'+data.userimage+'" /><p>'+data.username+'</p>').appendTo('#wrapper');
 
-=======
+=======
             // create a div for the collaborators compass
             $('#compass' + data.userid).remove();
             $('<div/>', {
@@ -1652,7 +1652,7 @@ Metamaps.Realtime = {
                 class: 'collabCompass'
             }).appendTo('#wrapper');
         }
->>>>>>> fe1f35d63eda20b39e97f11c8bb75135281d5b98
+>>>>>>> fe1f35d63eda20b39e97f11c8bb75135281d5b98
     },
     newPeerOnMap: function (data) {
         var self = Metamaps.Realtime;
@@ -1669,7 +1669,7 @@ Metamaps.Realtime = {
         };
 
         // create an item for them in the realtime box
-<<<<<<< HEAD
+<<<<<<< HEAD
         var mapperListItem = '<li id="mapper' + data.userid + '" class="rtMapper littleRtOn">';
         mapperListItem += '<img src="' + data.userimage + '" width="24" height="24" class="rtUserImage" />';
         mapperListItem += data.username;
@@ -1697,7 +1697,7 @@ Metamaps.Realtime = {
             mapid: Metamaps.Active.Map.id
         };
         socket.emit('updateNewMapperList', update);
-=======
+=======
         if (data.userid !== Metamaps.Active.Mapper.id) {
             var mapperListItem = '<li id="mapper' + data.userid + '" class="rtMapper littleRtOn">';
             mapperListItem += '<img src="' + data.userimage + '" width="24" height="24" class="rtUserImage" />';
@@ -1728,7 +1728,7 @@ Metamaps.Realtime = {
             };
             socket.emit('updateNewMapperList', update);
         }
->>>>>>> fe1f35d63eda20b39e97f11c8bb75135281d5b98
+>>>>>>> fe1f35d63eda20b39e97f11c8bb75135281d5b98
     },
     lostPeerOnMap: function (data) {
         var self = Metamaps.Realtime;