Remove UserName and Domain from URL
1. Add Resolve Conflicts View
1. Fix Bug with Undo
2. Send to Resolve Conflicts on Commit Failure