commit conflict
Merge branch 'master' of https://github.com/hiiru/test.git
d
Merge branch 'branchtest'