Try again from vs, with conflicts
Merge branch 'master' of https://github.com/bridwell/TestSourceTree.git