diff --git a/src/backend/distributed/executor/local_executor.c b/src/backend/distributed/executor/local_executor.c
index 0776b30ef..588fcc05b 100644
--- a/src/backend/distributed/executor/local_executor.c
+++ b/src/backend/distributed/executor/local_executor.c
@@ -83,7 +83,11 @@
 #include "distributed/transaction_management.h"
 #include "executor/tstoreReceiver.h"
 #include "executor/tuptable.h"
+#if PG_VERSION_NUM >= 120000
+#include "optimizer/optimizer.h"
+#else
 #include "optimizer/planner.h"
+#endif
 #include "nodes/params.h"
 #include "utils/snapmgr.h"
 
diff --git a/src/test/regress/.gitignore b/src/test/regress/.gitignore
index 38f055cfc..e53a4cc02 100644
--- a/src/test/regress/.gitignore
+++ b/src/test/regress/.gitignore
@@ -18,4 +18,4 @@
 /proxy.output
 
 # python
-**.pyc
+*.pyc