test branch
branch feature1
master branch
conflict fixed
Merge branch 'master' of github.com:codeBing/learngit