Fix build failure due to incorrect conflict resolution in executor.h

Author: Shalini Lohia

src/include/executor/executor.h

@@ -258,9 +258,9 @@ extern void standard_ExecutorEnd(QueryDesc *queryDesc);
 extern void ExecutorRewind(QueryDesc *queryDesc);
 extern bool ExecCheckPermissions(List *rangeTable,
 								 List *rteperminfos, bool ereport_on_violation);
+extern bool ExecCheckOneRelPerms(RTEPermissionInfo *perminfo);
 /* Wrapper around ExecCheckOneRelPerms */
 extern bool ExecCheckOneRelPerms_wrapper(RTEPermissionInfo *perminfo);
-extern bool ExecCheckOneRelPerms(RTEPermissionInfo *perminfo);
 extern void CheckValidResultRel(ResultRelInfo *resultRelInfo, CmdType operation,
 								OnConflictAction onConflictAction,
 								List *mergeActions);