diff --git a/elf2cfetbl.c b/elf2cfetbl.c
index 877cfba..e18f11e 100644
--- a/elf2cfetbl.c
+++ b/elf2cfetbl.c
@@ -35,6 +35,10 @@
 #include "ELF_Structures.h"
 #include "cfe_tbl_filedef.h"
 #include "cfe_version.h"
+<<<<<<< HEAD
+=======
+#include "cfe_config.h"
+>>>>>>> origin/pull/144/head
 #include "elf2cfetbl_version.h"
 
 #define MAX_SECTION_HDR_NAME_LEN (128)