Hi I am working in Magento cloud when merging the code from staging to production i am getting merge conflict issue
Preparing to merge environment ‘staging’ into master
Checking out repository
Executing merge
Auto-merging .magento/routes.yaml
CONFLICT (content): Merge conflict in .magento/routes.yaml
Automatic merge failed; fix conflicts and then commit the result.
E: Error: Unable to merge, resolve the conflict manually.
Please help me if anyone know how to solve.