diff --git a/lib/entry-points.js b/lib/entry-points.js
index 5fd8835db..fd2fe602d 100644
--- a/lib/entry-points.js
+++ b/lib/entry-points.js
@@ -145967,6 +145967,11 @@ var LINKED_CODEQL_VERSION = {
   tagName: bundleVersion
 };
 var featureConfig = {
+  ["allow_merge_config_files" /* AllowMergeConfigFiles */]: {
+    defaultValue: false,
+    envVar: "CODEQL_ACTION_ALLOW_MERGE_CONFIG_FILES",
+    minimumVersion: void 0
+  },
   ["allow_multiple_analysis_kinds" /* AllowMultipleAnalysisKinds */]: {
     defaultValue: false,
     envVar: "CODEQL_ACTION_ALLOW_MULTIPLE_ANALYSIS_KINDS",
diff --git a/src/feature-flags.ts b/src/feature-flags.ts
index f71ecab57..5b6d623a7 100644
--- a/src/feature-flags.ts
+++ b/src/feature-flags.ts
@@ -70,6 +70,8 @@ export interface CodeQLDefaultVersionInfo {
  * Legacy features should end with `_enabled`.
  */
 export enum Feature {
+  /** Allows supported properties of configuration files to be merged. */
+  AllowMergeConfigFiles = "allow_merge_config_files",
   /** Controls whether we allow multiple values for the `analysis-kinds` input. */
   AllowMultipleAnalysisKinds = "allow_multiple_analysis_kinds",
   AllowToolcacheInput = "allow_toolcache_input",
@@ -171,6 +173,11 @@ export type FeatureConfig = {
 };
 
 export const featureConfig = {
+  [Feature.AllowMergeConfigFiles]: {
+    defaultValue: false,
+    envVar: "CODEQL_ACTION_ALLOW_MERGE_CONFIG_FILES",
+    minimumVersion: undefined,
+  },
   [Feature.AllowMultipleAnalysisKinds]: {
     defaultValue: false,
     envVar: "CODEQL_ACTION_ALLOW_MULTIPLE_ANALYSIS_KINDS",