chore: Axe-2572 axe core upgrade phase 2 v2

[gaganmBrowserStack]

<< Describe the changes >>

Closes:

[deploybs-com]

⚠️ Git Merge Conflict Detected

Error Details:

Error occured while merging master/main - Cmd('git') failed due to: exit code(1)
  cmdline: git merge main
  stdout: 'Auto-merging lib/core/utils/performance-timer.js
CONFLICT (content): Merge conflict in lib/core/utils/performance-timer.js
Automatic merge failed; fix conflicts and then commit the result.'

How to Fix:

1. Pull the latest changes from the target branch
2. Resolve the merge conflicts in the affected files
3. After resolving conflicts, stage the changes: git add <resolved-files>
4. Complete the merge: git commit
5. Push your changes and re-run the SCA scan

💡 Tip: Use git status to see which files have conflicts.

[deploybs-com]

⚠️ Git Merge Conflict Detected

Error Details:

Error occured while merging master/main - Cmd('git') failed due to: exit code(1)
  cmdline: git merge main
  stdout: 'Auto-merging lib/core/utils/performance-timer.js
CONFLICT (content): Merge conflict in lib/core/utils/performance-timer.js
Automatic merge failed; fix conflicts and then commit the result.'

How to Fix:

1. Pull the latest changes from the target branch
2. Resolve the merge conflicts in the affected files
3. After resolving conflicts, stage the changes: git add <resolved-files>
4. Complete the merge: git commit
5. Push your changes and re-run the SCA scan

💡 Tip: Use git status to see which files have conflicts.