add branch
add simple
& simple
confict fixed
add merge
merge with no-ff