Fix merge conflict

[mukeshpanchal27]

Summary

The PR fix merge conflict for #2004

[codecov]

Codecov Report

Attention: Patch coverage is 80.34188% with 23 lines in your changes missing coverage. Please review.

Project coverage is 72.50%. Comparing base (fb58db7) to head (2f07c38).
Report is 51 commits behind head on feature/1511-incorporate-layout-constraints-from-ancestors.

Files with missing lines	Patch %	Lines
plugins/view-transitions/includes/functions.php	41.17%	10 Missing ⚠️
plugins/view-transitions/includes/theme.php	78.26%	10 Missing ⚠️
plugins/optimization-detective/optimization.php	66.66%	2 Missing ⚠️
plugins/view-transitions/hooks.php	0.00%	1 Missing ⚠️

Additional details and impacted files

@@                                      Coverage Diff                                       @@
##           feature/1511-incorporate-layout-constraints-from-ancestors    #2013      +/-   ##
==============================================================================================
+ Coverage                                                       72.49%   72.50%   +0.01%     
==============================================================================================
  Files                                                              87       88       +1     
  Lines                                                            7064     7144      +80     
==============================================================================================
+ Hits                                                             5121     5180      +59     
- Misses                                                           1943     1964      +21     

Flag	Coverage Δ
multisite	72.50% <80.34%> (+0.01%)	⬆️
single	40.14% <38.46%> (-0.36%)	⬇️

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.

[github-actions]

The following accounts have interacted with this PR and/or linked issues. I will continue to update these lists as activity occurs. You can also manually ask me to refresh this list by adding the props-bot label.

If you're merging code through a pull request on GitHub, copy and paste the following into the bottom of the merge commit message.

Co-authored-by: ShyamGadde <shyamgadde@git.wordpress.org>
Co-authored-by: felixarntz <flixos90@git.wordpress.org>
Co-authored-by: westonruter <westonruter@git.wordpress.org>
Co-authored-by: mukeshpanchal27 <mukesh27@git.wordpress.org>
Co-authored-by: swissspidy <swissspidy@git.wordpress.org>

To understand the WordPress project's expectations around crediting contributors, please review the Contributor Attribution page in the Core Handbook.