diff --git a/src/router/index.js b/src/router/index.js
index 781dc27..c87dfd9 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -7,34 +7,21 @@ const router = createRouter({
       name: 'home',
       component: () => import('@/views/home/index.vue')
     },
-<<<<<<< HEAD
     {
       path: '/monitor',
       name: 'monitor',
       component: () => import('../views/monitor/index.vue')
     },
     {
-      path: '/testing',
-      name: 'testing',
+      path: '/sceneTesting',
+      name: 'sceneTesting',
       component: () => import('../views/testing/index.vue')
     },
-=======
-	{
-	  path: '/monitor',
-	  name: 'monitor',
-	  component: () => import('../views/monitor/index.vue')
-	},
-	{
-	  path: '/sceneTesting',
-	  name: 'sceneTesting',
-	  component: () => import('../views/testing/index.vue')
-	},
-	{
-	  path: '/roadTesting',
-	  name: 'roadTesting',
-	  component: () => import('../views/testing/road.vue')
-	},
->>>>>>> 5f31856ac0b5635af49bbc759a9121742cbe2f23
+    {
+      path: '/roadTesting',
+      name: 'roadTesting',
+      component: () => import('../views/testing/road.vue')
+    },
     {
       path: '/scenic',
       name: 'scenic',