test diff class conflict
test 2 diff class conflict from windows
test trying to merge on mac
Merge branch 'master' of git@github.com:russelhealey/test2.git