Please follow steps in Github official documentation to resolve merge conflicts: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/addressing-merge-conflicts/resolving-a-merge-conflict-on-github
There was an error while loading. Please reload this page.