pull request should be able to resolve simple collisions with flag --ours or --theirs

If a pull request detects a collision and can resolve it with the git flag --ours or --theirs without requiring a rebase, the pull request should allow for this option and selection. This way, in most cases, the UI can resolve the conflict in the pull request. This also allows for comments and suggestions from the reviewers about which path to take. This also allows for the discussion of why it has to be resolved and pushed from an endpoint.