Normal merge branches and resolve conflicts.It will automatically solve your conflicts in pull request. If you want to merge devbranch into Main

Steps to merge and resolve conflicts:

1. git checkout devbranch
2. git pull devbranch
3. git checkout main
4. git pull main
5. git merge devbranch
6. resolve conflicts using merge editor