diff --git a/src/routes.js b/src/routes.js
index 158b1c9..af8b93b 100644
--- a/src/routes.js
+++ b/src/routes.js
@@ -2,11 +2,8 @@ import Vue from 'vue'
 import VueRouter from 'vue-router'
 
 import Home from './view/Home.vue'
-<<<<<<< HEAD
 import PersonalData from './view/PersonalData.vue'
-=======
 import Cart from './view/Cart.vue'
->>>>>>> origin
 
 const routes = [
     {
@@ -20,15 +17,14 @@ const routes = [
         name: 'home'
     },
     {
-<<<<<<< HEAD
         path: '/datosPersonales',
         component: PersonalData,
         name: 'personalData'
-=======
+    },
+    {
         path: '/cart',
         component: Cart,
         name: 'cart'
->>>>>>> origin
     }
 ]