branch test
AND simple.wq
& simple
conflice fixed
add merge
merge with no-ff