diff --git a/src/backend/distributed/utils/multi_partitioning_utils.c b/src/backend/distributed/utils/multi_partitioning_utils.c
index b70711cbc..ede2008ca 100644
--- a/src/backend/distributed/utils/multi_partitioning_utils.c
+++ b/src/backend/distributed/utils/multi_partitioning_utils.c
@@ -50,10 +50,6 @@
 #include "distributed/version_compat.h"
 #include "distributed/worker_protocol.h"
 
-<<<<<<< HEAD
-extern List * FullShardPlacementList(Oid relationId, ArrayType *excludedShardArray);
-=======
->>>>>>> parent of c48bf5eba (Rename per worker)
 static char * PartitionBound(Oid partitionId);
 static Relation try_relation_open_nolock(Oid relationId);
 static List * CreateFixPartitionConstraintsTaskList(Oid relationId);