diff --git a/README.md b/README.md
index bdbce55..257e0d2 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,5 @@
 # ComfyUI-LineSignalRouter
-<<<<<<< HEAD
+# ComfyUI-LineSignalRouter
 
 A custom ComfyUI node for routing signals through named lines.
 
@@ -54,17 +54,16 @@ git clone https://github.com/USERNAME/ComfyUI-LineSignalRouter.git
 Then restart ComfyUI.
 
 ## Update
+
 ```bash
 cd ComfyUI/custom_nodes/ComfyUI-LineSignalRouter
 git pull
 ```
+
 ## Notes
 
 Line titles are stored in the node UI state
 
 Disabled lines do not pass signals
 
-In single mode, only one line can be active at a time
-=======
-ComfyUI custom node for routing signals through named lines with single and multi-line modes.
->>>>>>> a4d2ccb656945327351aefac7b4f7fc7ae2b91d8
+In single mode, only one line can be active at a time
\ No newline at end of file