diff --git a/views/pages/index.ejs b/views/pages/index.ejs
index 7171d95..27bed3d 100644
--- a/views/pages/index.ejs
+++ b/views/pages/index.ejs
@@ -78,14 +78,10 @@
           var place = autoOrigin.getPlace();
           // Testing.
           console.log(place);
-<<<<<<< HEAD
           //localStorage.setItem("from", place.formatted_address);
           localStorage.setItem("fromIn", temp.value);
           localStorage.setItem("originLat", place.geometry.location.lat());
           localStorage.setItem("originLng", place.geometry.location.lng());
-=======
-          localStorage.setItem("from", place.formatted_address);
->>>>>>> 044c2fcc67b88e2e59ea2720d1eb8ababb014660
         });
       }
 
@@ -98,7 +94,6 @@
           var place = autoDest.getPlace();
           // Testing.
           console.log(place);
-<<<<<<< HEAD
           //localStorage.setItem("to", place.formatted_address);
           localStorage.setItem("toIn", temp.value);
           localStorage.setItem("destLat", place.geometry.location.lat());
@@ -127,19 +122,13 @@
               };
             }
           });
-=======
-          localStorage.setItem("to", place.formatted_address);
->>>>>>> 044c2fcc67b88e2e59ea2720d1eb8ababb014660
         });
       }
 
       function saveFrom() {
         var fromInput = document.getElementById("origin").value;
         localStorage.setItem("from", fromInput);
-<<<<<<< HEAD
         localStorage.setItem("fromIn", fromInput);
-=======
->>>>>>> 044c2fcc67b88e2e59ea2720d1eb8ababb014660
       }
       function saveTo() {
         var toInput = document.getElementById("dest").value;