When we have conflicts between main and production, we cannot open PR directly. We do the following:

1. git fetch and then go to production -> git checkout production
2. Create a new branch from production -> git checkout -b <branchname>
3. Pull latest changes from main -> git pull origin main or git merge main
4. Resolve conflicts
5. Push the changes and create a pull request with base branch as production
6. And chill :slightly_smiling_face: