test branch
amd simple
& simple
conflict fixed
commit
add merge
merge with no-ff