branch1 test
master branch test
branch2 test
branch3 test
branch2 update
Merge branch 'test_branch2'
test conflict
fix by branch1
merge over