more random file differences in conflict
added conflict test files
create conflicts with many differences per file
Merge branch 'master' of github.com:tom-weiss-github/home