diff --git a/vue-project/src/components/List.vue b/vue-project/src/components/List.vue
index 33dc50f..5f5b594 100644
--- a/vue-project/src/components/List.vue
+++ b/vue-project/src/components/List.vue
@@ -18,16 +18,4 @@
 </script>
 
 <style lang="css">
-<<<<<<< HEAD
-.list {
-  padding: 1em;
-  background-color: cadetblue;
-}
-
-table {
-  border-collapse: collapse;
-}
-=======
->>>>>>> 7fee405... move global css
-
 </style>
\ No newline at end of file