diff --git a/src/detect.c b/src/detect.c
index eca9e6f59e..253ea63abc 100644
--- a/src/detect.c
+++ b/src/detect.c
@@ -2594,11 +2594,8 @@ void SigTableSetup(void) {
     DetectDecodeEventRegister();
     DetectIpOptsRegister();
     DetectFlagsRegister();
-<<<<<<< HEAD:src/detect.c
     DetectFragBitsRegister();
-=======
     DetectGidRegister();
->>>>>>> Gid Keyword:src/detect.c
     DetectCsumRegister();
     DetectStreamSizeRegister();