fix merge conflict checker gh action

[sudo87]

Description

This PR tries to address merge-conflict-checker github action.

Types of changes

• Breaking change (fix or feature that would cause existing functionality to change)
• New feature (non-breaking change which adds functionality)
• Bug fix (non-breaking change which fixes an issue)
• Enhancement (improves an existing feature and functionality)
• Cleanup (Code refactoring and cleanup, that may add test cases)
• Build/CI
• Test (unit or integration test code)

Feature/Enhancement Scale or Bug Severity

Feature/Enhancement Scale

• Major
• Minor

Bug Severity

• BLOCKER
• Critical
• Major
• Minor
• Trivial

Screenshots (if appropriate):

How Has This Been Tested?

How did you try to break this feature and the system with this change?

[codecov]

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 18.02%. Comparing base (b744824) to head (88cc0b1).

Additional details and impacted files

@@            Coverage Diff            @@
##               main   #12886   +/-   ##
=========================================
  Coverage     18.02%   18.02%           
- Complexity    16450    16454    +4     
=========================================
  Files          5968     5968           
  Lines        537086   537086           
  Branches      65961    65961           
=========================================
+ Hits          96819    96831   +12     
+ Misses       429347   429336   -11     
+ Partials      10920    10919    -1     

Flag	Coverage Δ
uitests	3.53% <ø> (ø)
unittests	19.19% <ø> (+<0.01%)	⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:

• ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
• 📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.