diff --git a/lib/osal/core/net.v b/lib/osal/core/net.v
index e7b74e31..73bc39d1 100644
--- a/lib/osal/core/net.v
+++ b/lib/osal/core/net.v
@@ -4,11 +4,8 @@ import net
 import time
 import freeflowuniverse.herolib.ui.console
 import freeflowuniverse.herolib.core
-<<<<<<< HEAD
 
 import os
-=======
->>>>>>> development
 
 pub enum PingResult {
 	ok
diff --git a/lib/osal/tmux/readme.md b/lib/osal/tmux/readme.md
index 88b5019c..13f7b87c 100644
--- a/lib/osal/tmux/readme.md
+++ b/lib/osal/tmux/readme.md
@@ -76,7 +76,7 @@ hero run -p <heroscript_file>
 
 #### Ttyd Management
 
-```heroscript
+```hs
 // Start ttyd for session access
 !!tmux.session_ttyd
     name:'mysession'
@@ -105,7 +105,7 @@ hero run -p <heroscript_file>
 
 ### Complete Example
 
-```heroscript
+```hs
 #!/usr/bin/env hero
 
 // Create development environment