diff --git a/src/components/products/ProductRepository.vue b/src/components/products/ProductRepository.vue
index f3976e6..bdd955a 100644
--- a/src/components/products/ProductRepository.vue
+++ b/src/components/products/ProductRepository.vue
@@ -1,9 +1,5 @@
 <template>
-<<<<<<< HEAD
-    <v-container>
-=======
     <v-container style="padding: 0px">
->>>>>>> a8d0ff06c77a4b51b4c896c8333775d3ca27446f
         <v-card
                 color="amber"
         >
diff --git a/src/main.js b/src/main.js
index 450f050..6cdee43 100644
--- a/src/main.js
+++ b/src/main.js
@@ -46,20 +46,12 @@ Vue.component('OrderFinish',OrderFinish);
 Vue.component('OrderPage', OrderPage)
 Vue.component('Survey',Survey);
 Vue.component('SurveyForm',SurveyForm);
-<<<<<<< HEAD
-Vue.component('UserInfo', UserInfo);
-Vue.component('DeliveryStatus', DeliveryStatus);
-Vue.component('ProductSimple', ProductSimple);
-Vue.component('ProductRepository',ProductRepository);
-Vue.component('ProductDelete',ProductDelete);
-=======
 Vue.component('UserInfo', UserInfo)
 Vue.component('DeliveryStatus', DeliveryStatus)
 Vue.component('Product',Product)
 Vue.component('ProductSimple', ProductSimple)
 Vue.component('ProductRepository',ProductRepository)
 Vue.component('ProductDelete',ProductDelete)
->>>>>>> a8d0ff06c77a4b51b4c896c8333775d3ca27446f
 
 Vue.config.productionTip = false