How to resolve conflict in branches

1. git clone the directory
2. git pull origin main
3. git checkout new_arch <-- the branch you want to merge to main
4. git merge main
5. fix conflicts
6. git add .
7. git commit -m "Resolve merge conflict on pull request #2"
8. git push -u origin new_arch <-- the conflicted branch
9. togo your PR and now the conflict is resolved, the reviewer can now merge it.