branch test
add simple branch
& simple
conflict fiexed
add merge
merge dev