From your feature branch:
git fetch
git rebase origin/master
If any conflict shall arise, resolve them one by one. Once all conflicts are dealt with:
git rebase --continue
git push --force-with-lease (git push --force)
git merge --strategy-option ours main
git merge --strategy-option theirs main