test -1
test-2
some branch
branch1
branch2
confilct
merge
er
Merge branch 'master' into feature/test
merge
hi all