hello2.txt
new changes blah blah
yadda yadda
hi
hello
conflict
okay
hello
Merge branch 'master' of github.com:m3rs33/test