SomeText.txt
texttest
merge fixed
SomeText.txt
SomeText.txt
fixed merge conflict
Merge branch 'master' of https://github.com/pi-xi/myfirstrepo