Fix/staging merge cnonflicts

[harshithad0703]

No description provided.

[github-actions]

Coverage report for commit: 0af5062
File: coverage/clover.xml

Cover ┌─────────────────────────┐ Freq.
   0% │ ░░░░░░░░░░░░░░░░░░░░░░░ │  0.0%
  10% │ ░░░░░░░░░░░░░░░░░░░░░░░ │  0.0%
  20% │ ░░░░░░░░░░░░░░░░░░░░░░░ │  0.0%
  30% │ ░░░░░░░░░░░░░░░░░░░░░░░ │  0.0%
  40% │ ░░░░░░░░░░░░░░░░░░░░░░░ │  0.0%
  50% │ ░░░░░░░░░░░░░░░░░░░░░░░ │  0.0%
  60% │ ░░░░░░░░░░░░░░░░░░░░░░░ │  0.0%
  70% │ ░░░░░░░░░░░░░░░░░░░░░░░ │  0.0%
  80% │ █████████░░░░░░░░░░░░░░ │ 18.4%
  90% │ ███████████████████████ │ 46.9%
 100% │ █████████████████░░░░░░ │ 34.7%
      └─────────────────────────┘
 *Legend:* █ = Current Distribution 

Summary - Lines: 89.34% | Methods: 98.58% | Branches: 72.40%

Files	Lines	Methods	Branches
lib/app/authorization
index.js	91.67%	100.00%	72.09%
lib/app/hosting
deployment.js	85.29%	100.00%	65.79%
index.js	80.70%	100.00%	59.09%
lib/app
index.js	92.78%	100.00%	66.12%
lib/app/installation
index.js	84.62%	100.00%	59.55%
lib/app/request
index.js	91.43%	100.00%	65.85%
lib
contentstack.js	100.00%	100.00%	100.00%
contentstackClient.js	80.85%	92.86%	64.15%
contentstackCollection.js	94.12%	100.00%	93.33%
entity.js	83.33%	100.00%	67.67%
lib/core
Util.js	96.36%	100.00%	83.64%
concurrency-queue.js	86.01%	87.18%	76.00%
contentstackError.js	100.00%	100.00%	100.00%
contentstackHTTPClient.js	98.33%	100.00%	95.08%
oauthHandler.js	92.54%	100.00%	70.07%
lib/organization
index.js	83.33%	100.00%	60.67%
lib/organization/teams
index.js	92.11%	100.00%	68.42%
lib/organization/teams/stackRoleMappings
index.js	89.29%	100.00%	58.14%
lib/organization/teams/teamUsers
index.js	100.00%	100.00%	93.75%
lib/query
index.js	80.43%	100.00%	67.27%
lib/stack/asset/folders
index.js	100.00%	100.00%	100.00%
lib/stack/asset
index.js	93.06%	100.00%	81.18%
lib/stack/auditlog
index.js	95.83%	100.00%	75.00%
lib/stack/branch
compare.js	81.82%	100.00%	71.88%
index.js	97.44%	100.00%	80.56%
mergeQueue.js	100.00%	100.00%	73.68%
lib/stack/branchAlias
index.js	86.21%	100.00%	65.85%
lib/stack/contentType/entry
index.js	88.39%	100.00%	64.60%
lib/stack/contentType/entry/variants
index.js	86.21%	100.00%	68.57%
lib/stack/contentType
index.js	89.23%	100.00%	74.03%
lib/stack/deliveryToken
index.js	100.00%	100.00%	94.44%
lib/stack/environment
index.js	100.00%	100.00%	100.00%
lib/stack/extension
index.js	95.92%	100.00%	87.76%
lib/stack/globalField
index.js	94.59%	100.00%	82.22%
lib/stack
index.js	84.92%	92.86%	72.76%
lib/stack/label
index.js	100.00%	100.00%	100.00%
lib/stack/locale
index.js	100.00%	100.00%	100.00%
lib/stack/managementToken
index.js	100.00%	100.00%	94.44%
lib/stack/release
index.js	91.11%	100.00%	72.34%
lib/stack/roles
index.js	100.00%	100.00%	100.00%
lib/stack/taxonomy
index.js	88.00%	100.00%	64.52%
lib/stack/taxonomy/terms
index.js	92.31%	100.00%	72.55%
lib/stack/variantGroup
index.js	86.84%	100.00%	65.12%
lib/stack/variantGroup/variants
index.js	85.00%	100.00%	60.78%
lib/stack/variants
index.js	84.21%	100.00%	59.57%
lib/stack/webhook
index.js	89.66%	100.00%	72.88%
lib/stack/workflow
index.js	89.09%	100.00%	72.31%
lib/stack/workflow/publishRules
index.js	100.00%	100.00%	100.00%
lib/user
index.js	94.29%	100.00%	82.14%

_{🤖 comment via lucassabreu/comment-coverage-clover}