From 2745dbea9b487fe00d6bbcffbe14b05b74ea19e0 Mon Sep 17 00:00:00 2001
From: sunil-lakshman <104969541+sunil-lakshman@users.noreply.github.com>
Date: Wed, 2 Jul 2025 11:11:05 +0530
Subject: [PATCH] Fixed branch header conflits issue

---
 .gitignore         | 3 ++-
 CHANGELOG.md       | 3 +++
 lib/stack/index.js | 2 +-
 package-lock.json  | 4 ++--
 package.json       | 2 +-
 5 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index 52bba02c..b16a4a66 100644
--- a/.gitignore
+++ b/.gitignore
@@ -67,4 +67,5 @@ tsconfig.json
 .next
 .dccache
 dist
-jsdocs
\ No newline at end of file
+jsdocs
+.early.coverage
\ No newline at end of file
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8abd625d..8605e14f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,7 @@
 # Changelog
+## [v1.21.8](https://github.com/contentstack/contentstack-management-javascript/tree/v1.21.8) (2025-07-07)
+ - Fix
+   - Fixed branch header conflits
 ## [v1.21.7](https://github.com/contentstack/contentstack-management-javascript/tree/v1.21.7) (2025-06-30)
  - Fix
    - Fixed Request-URI Too Large error
diff --git a/lib/stack/index.js b/lib/stack/index.js
index c954e81c..f4a4984c 100644
--- a/lib/stack/index.js
+++ b/lib/stack/index.js
@@ -168,8 +168,8 @@ export function Stack (http, data) {
     this.globalField = (uidOrOptions = null, option = {}) => {
       let globalFieldUid = null
       let apiVersion = '3.0'
-      let branch = 'main'
       const stackHeaders = { ...this.stackHeaders }
+      let branch = stackHeaders.branch || http.defaults.headers.branch || 'main'
       if (typeof uidOrOptions === 'object' && uidOrOptions !== null) {
         option = uidOrOptions
       } else {
diff --git a/package-lock.json b/package-lock.json
index a1c14318..67054cc1 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@contentstack/management",
-  "version": "1.21.7",
+  "version": "1.21.8",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@contentstack/management",
-      "version": "1.21.7",
+      "version": "1.21.8",
       "license": "MIT",
       "dependencies": {
         "assert": "^2.1.0",
diff --git a/package.json b/package.json
index 376be90e..e05e986a 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@contentstack/management",
-  "version": "1.21.7",
+  "version": "1.21.8",
   "description": "The Content Management API is used to manage the content of your Contentstack account",
   "main": "./dist/node/contentstack-management.js",
   "browser": "./dist/web/contentstack-management.js",