diff --git a/resources/assets/js/pages/admin/home.vue b/resources/assets/js/pages/admin/home.vue
index 491bc3c3..3068a292 100644
--- a/resources/assets/js/pages/admin/home.vue
+++ b/resources/assets/js/pages/admin/home.vue
@@ -291,8 +291,4 @@ export default {
   }
 
 }
-<<<<<<< HEAD
 </script>
-=======
-</script>
->>>>>>> 9aaafd24d6527f6f6e60dfeaf2846fbc42363eed