diff --git a/probe_src/libprobe/generated/libc_hooks.h b/probe_src/libprobe/generated/libc_hooks.h
index 5b88f07b..31e99d6f 100644
--- a/probe_src/libprobe/generated/libc_hooks.h
+++ b/probe_src/libprobe/generated/libc_hooks.h
@@ -4,7 +4,10 @@
 #include <ftw.h>
 #include <sys/wait.h>
 #include <threads.h>
+<<<<<<< HEAD
 #include "../src/prov_enable.c"
+=======
+>>>>>>> ecbb6e8ea2433c165586298c196b4613b1f9141f
 
 static FILE * (*unwrapped_fopen)(const char *filename, const char *opentype);
 static FILE * (*unwrapped_freopen)(const char *filename, const char *opentype, FILE *stream);
diff --git a/probe_src/libprobe/src/prov_buffer.c b/probe_src/libprobe/src/prov_buffer.c
index 5d7bed77..8d9acf10 100644
--- a/probe_src/libprobe/src/prov_buffer.c
+++ b/probe_src/libprobe/src/prov_buffer.c
@@ -10,10 +10,13 @@
 #include <pthread.h> 
 #include <threads.h> 
 
+<<<<<<< HEAD
 #ifndef CLONE_VFORK
 #define CLONE_VFORK 0x00004000
 #endif
 
+=======
+>>>>>>> ecbb6e8ea2433c165586298c196b4613b1f9141f
 #ifndef likely
 #define likely(x) __builtin_expect(!!(x), 1)
 #endif
diff --git a/probe_src/libprobe/src/prov_ops.c b/probe_src/libprobe/src/prov_ops.c
index c3689d01..753b5542 100644
--- a/probe_src/libprobe/src/prov_ops.c
+++ b/probe_src/libprobe/src/prov_ops.c
@@ -8,9 +8,12 @@
 #include <sys/types.h>
 #include <limits.h>
 #include <linux/stat.h>
+<<<<<<< HEAD
 #include "../generated/libc_hooks.h"
 #include "../include/prov_ops.h"
 
+=======
+>>>>>>> ecbb6e8ea2433c165586298c196b4613b1f9141f
 #define BORROWED
 #ifndef likely
 #define likely(x) __builtin_expect((x), 1)