Try Conflict commit
Merge branch 'master' of https://github.com/TommySun/TestingRep.git