diff --git a/bfg.c b/bfg.c
index c13f58d..e500051 100644
--- a/bfg.c
+++ b/bfg.c
@@ -1,8 +1,5 @@
 
-/* code original by Jan Dlabal <dlabaljan@gmail.com>, partially rewritten by vh,
-<<<<<<< HEAD
- rainy tweaks by yvain douard*/
- rainy tweaks by owein <yvain29@gmail.com>*/
+/* code original by Jan Dlabal <dlabaljan@gmail.com>, partially rewritten by vh*/
 
 #include <ctype.h>
 #include <math.h>
diff --git a/hydra-http-form.c b/hydra-http-form.c
index 6bb84c2..b7449bb 100644
--- a/hydra-http-form.c
+++ b/hydra-http-form.c
@@ -1284,22 +1284,10 @@ ptr_header_node initialize(char *ip, unsigned char options, char *miscptr) {
     *ptr++ = 0;
 
   cond = ptr;
-<<<<<<< HEAD
   while (*ptr != 0 && (*ptr != ':' || *(ptr - 1) == '\\'))
     ptr++;
   if (*ptr != 0)
     *ptr++ = 0;
-=======
-
-  if ((ptr2 = index(ptr, ':')) != NULL) {
-    *ptr2++ = 0;
-    if (*ptr2)
-      optional1 = ptr2;
-    else
-      optional1 = NULL;
-  } else
-    optional1 = NULL;
->>>>>>> 6fc51db156b0f0dc533941bb24aa4f24f07f2124
 
   optional1 = ptr;
   if (strstr(url, "\\:") != NULL) {