change from origin
Merge branch 'master' of https://github.com/CrisGroup/gitRepoTest
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Delete origin_textFile1.txt
Delete upstream_textFile1.txt
change from origin
PR commit 1
resync