Try conflict
Merge branch 'master' of https://github.com/bitcrest/test.git