diff --git a/frontend/src/app/components/block/block.component.scss b/frontend/src/app/components/block/block.component.scss
index 3d96495e6..71d5fa6fb 100644
--- a/frontend/src/app/components/block/block.component.scss
+++ b/frontend/src/app/components/block/block.component.scss
@@ -232,8 +232,6 @@ h1 {
     margin-right: 1em;
   }
 }
-<<<<<<< hunicus/block-health-faq
-=======
 
 .beta {
   font-size: 10px;
@@ -243,4 +241,3 @@ h1 {
   top: 11px;
   margin-left: 10px;
 }
->>>>>>> master