new file conflict from 2
resolve with theirs
Merge branch 'master' of github.com:macmike/test
Yeah man!