diff --git a/src/common-components/text-block/text-block.vue b/src/common-components/text-block/text-block.vue
index 53cf8ce87..aee7fc5c6 100644
--- a/src/common-components/text-block/text-block.vue
+++ b/src/common-components/text-block/text-block.vue
@@ -34,8 +34,4 @@ export default {
       font-weight: 500;
     }
   }
-<<<<<<< HEAD
 </style>
-=======
-</style>
->>>>>>> release/2022.09.29