diff --git a/bash/decoders/rtlsdr-ogn.sh b/bash/decoders/rtlsdr-ogn.sh
index 0fc9d71..fcf3867 100644
--- a/bash/decoders/rtlsdr-ogn.sh
+++ b/bash/decoders/rtlsdr-ogn.sh
@@ -156,7 +156,6 @@ else
     sudo mknod gpu_dev c 249 0
 fi
 
-<<<<<<< HEAD
 ## ASSIGN THE RTL-SDR TUNER DEVICE TO THIS DECODER
 
 # Check for multiple tuners...