diff --git a/src/App.vue b/src/App.vue
index 30f5b53..4a70dae 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -26,23 +26,18 @@ import Toast from 'primevue/toast'
             <GHIcon height="25" width="25"/>
         </Button></a>
       </div>
-<<<<<<< HEAD
 
       <div class="bot-right-nav">
         <Button class="nav-btn" @click="getLocation">
             <img src="./assets/icons/location.svg" height="30" width="30"/>
         </Button>
       </div>
-  </header>
-
-=======
     </header>
     <div id="mobile-nav">
         <Teleport to="#left-nav" :disabled="global.aspectRatio > 1.5">
           <AutoComplete class="search" :style="{'width':'100%'}" :input-style="{'width': '100%'}" v-model="selection" :placeholder="ex" :suggestions="suggest" @complete="filterRes" @item-select="goTo" @focus.native="searchFocus(true)" @blur.native="searchFocus(false)"></AutoComplete>
         </Teleport>
     </div>
->>>>>>> dev
 
   <RouterView />
 </template>
@@ -51,12 +46,10 @@ import Toast from 'primevue/toast'
 export default {
   data() {
     return {
-<<<<<<< HEAD
       filteredResults: [],
       selection: "",
       RAD2DEG: 180/Math.PI,
-      DEG2RAD: Math.PI/180
-=======
+      DEG2RAD: Math.PI/180,
       exs: [
         "a building:  Russell Sage",
         "a dept. code:  CSCI 1200",
@@ -66,7 +59,6 @@ export default {
       ex: "",
       suggest: [],
       selection: ""
->>>>>>> dev
     }
   },
   inject: ["global"],
@@ -271,7 +263,6 @@ header {
   right: 0;
 }
 
-<<<<<<< HEAD
 .bot-right-nav {
   position: fixed;
   pointer-events: none;
@@ -279,7 +270,6 @@ header {
   bottom: 0;
   right: 0;
 }
-=======
 #mobile-nav {
   width: 100%;
   display: flex;
@@ -290,5 +280,4 @@ header {
   z-index: 6;
 }
 
->>>>>>> dev
 </style>