Path to common ancestor bailout
Grunt watch
Merge visualization
Merge conflict detection in api
Merge conflict handling in ui