[stable31] fix(ui): style conflict resolution buttons

[backportbot]

Backport of PR #6964

[codecov]

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 47.32%. Comparing base (293cd92) to head (ab64e00).
Report is 6 commits behind head on stable31.

Additional details and impacted files

@@ Coverage Diff @@## stable31 #6972 +/- ##
=========================================
Coverage 47.31% 47.32% =========================================
Files 750 742 -8 Lines 34753 34736 -17 Branches 1284 1275 -9 =========================================
- Hits 16444 16439 -5 + Misses 17690 17686 -4 + Partials 619 611 -8 

☔ 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.