Add UI-based merge conflict resolution

[pedrogaudencio]

• add conflicts tab to change request menu/view
• add active state styling to conflicts tab in change request menu
• create conflicts template for change request view
• use base branch commit instead of merge base for change request conflict resolution
• add resolve box/selection for each conflict
• add submit flow to commit changes
• UI tweaks
• add tests

Closes #153