branch test
AND simple
& simpel
conflict fixed
branch merge
merge with no-ff