resolve conflicts
more work on revert and resolve conflicts
finish up the UI; leave TODOs for the scm implementations
Merge pull request #1082 from devoncarew/devoncarew_resolve_conflicts

Devoncarew resolve conflicts