add rename column executor

Author: sxzh93

src/executor/alter_executor.cpp

@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 //===----------------------------------------------------------------------===//
 //
 //                         Peloton
@@ -10,6 +11,8 @@
 //
 //===----------------------------------------------------------------------===//
 
+=======
+>>>>>>> add rename column executor
 #include "executor/alter_executor.h"
 
 #include "catalog/catalog.h"

src/include/executor/executors.h

@@ -39,3 +39,4 @@
 #include "executor/projection_executor.h"
 #include "executor/seq_scan_executor.h"
 #include "executor/update_executor.h"
+#include "executor/alter_executor.h"