test git branch
add branch
master test
test branching issue1
solve conflic, merge with testing