diff --git a/inc/tools/code-block.php b/inc/tools/code-block.php
index 269e0c7..9e8da36 100644
--- a/inc/tools/code-block.php
+++ b/inc/tools/code-block.php
@@ -69,10 +69,6 @@ function ztfr_enqueue_code_assets() {
 		return;
 	}
 	
-<<<<<<< HEAD
-=======
-	// 🔥 Nur laden wenn Codeblock vorhanden
->>>>>>> 1ee3574d03f75ed3016267f2fdfbc78f468fcaa0
 	if ( ! ztfr_has_code_block() ) {
 		return;
 	}