diff --git a/src/layouts/address-lookup/address-lookup.vue b/src/layouts/address-lookup/address-lookup.vue
index 60e8d263e..d83df2247 100644
--- a/src/layouts/address-lookup/address-lookup.vue
+++ b/src/layouts/address-lookup/address-lookup.vue
@@ -1,16 +1,4 @@
 <template>
-<<<<<<< HEAD
-	<Form ref="theForm" @submit="onSubmit" @invalid-submit="onInvalidSubmit" v-slot="{ meta }" autocomplete="off">
-		<div class="container-fluid shadow rounded-3 p-2 position-relative make-tall px-5">
-			<loadingModal :showCloseButton=false :clickOutCloses=false ref="loadingModal">
-				<template v-slot:body>
-					Please wait...
-				</template>
-				<template v-slot:subtext>
-					This process can take up 20 seconds.
-				</template>
-			</loadingModal>
-=======
 	<Form
 		@submit="onSubmit"
 		@invalid-submit="onInvalidSubmit"
@@ -19,7 +7,6 @@
 		autocomplete="off" >
 		<div class="page-container-grouped-styles">
 			<loadingModal ref="loadingModal"/>
->>>>>>> develop
 			<funnelHeader cmsWidgetName="FunnelHeaderWidget" ref="funnelHeader" />
 			<vehicleBanner ref="vehicleBanner" :displayGenericVehicleImage=false />
 			<funnelSubHeader cmsWidgetName="FunnelSubHeaderWidget" ref="funnelSubHeader" />