Fix merge errors

src/backend/columnar/columnar_debug.c

@@ -11,7 +11,6 @@
 #include "postgres.h"
 
 #include "funcapi.h"
-#include "pg_config.h"
 #include "access/nbtree.h"
 #include "access/table.h"
 #include "catalog/pg_am.h"

src/backend/columnar/mod.c

@@ -29,4 +29,8 @@ void _PG_init(void);
 
 void
 _PG_init(void)
+{
+	columnar_init_gucs();
+	columnar_tableam_init();
+}
 

src/backend/distributed/Makefile

@@ -38,7 +38,7 @@ NO_PGXS = 1
 
 SHLIB_LINK += $(libpq) 
 SHLIB_LINK_INTERNAL += -L../columnar -l:columnar.so
-
+override enable_rpath = yes
 include $(citus_top_builddir)/Makefile.global
 
 rpathdir = $(shell $(PG_CONFIG) --libdir):$(shell $(PG_CONFIG) --pkglibdir)