branch test
add simple
& simple
confilct fixed
add merge
merge with --no-ff