Ability to resolve conflicts in the browser

Allow user to resolve conflicts directly in Bitbucket UI via browser when fixing a PR.

Dare I say similar to GitHub

This is useful as opposed to merging from target branch locally which might not be possible for release branches as release branches are not meant to take the latest from master branch

The user could merge to master locally and resolve the conflict, however, master branches a protected normally so user will not be able to push to master