Today, if a merge conflict shows up in a Pull Request, Gitness shows steps for resolving the conflict in the CLI. It would be nice to allow users to resolve merge conflicts directly in the PR experience.