diff --git a/Makefile b/Makefile
index f1b7b9c56..191a6e6f7 100644
--- a/Makefile
+++ b/Makefile
@@ -44,9 +44,9 @@ clean: clean-csql
 
 # apply or check style
 reindent:
-	cd ${citusdb_abs_top_srcdir} && citus_indent --quiet
+	cd ${citus_abs_top_srcdir} && citus_indent --quiet
 check-style:
-	cd ${citusdb_abs_top_srcdir} && citus_indent --quiet --check
+	cd ${citus_abs_top_srcdir} && citus_indent --quiet --check
 .PHONY: reindent check-style
 
 # depend on install for now
diff --git a/src/include/distributed/citus_ruleutils.h b/src/include/distributed/citus_ruleutils.h
index 70b879291..e53b1c34d 100644
--- a/src/include/distributed/citus_ruleutils.h
+++ b/src/include/distributed/citus_ruleutils.h
@@ -1,13 +1,8 @@
 /*-------------------------------------------------------------------------
  *
  * citus_ruleutils.h
-<<<<<<< HEAD
  *	  Citus ruleutils wrapper functions and exported PostgreSQL ruleutils
- * 	  functions.
-=======
- *	  CitusDB ruleutils wrapper functions and exported PostgreSQL ruleutils
- *    functions.
->>>>>>> origin
+ *	  functions.
  *
  * Copyright (c) 2012-2015, Citus Data, Inc.
  *-------------------------------------------------------------------------