newfilecreatedlocally.txt after merge from stash
Merge branch 'master' of https://github.com/courtenayt/test
update newfilecreatedlocally.txt introduce merge conflict from jci-teska local
Merge pull request #2 from jci-teska/master

merge me