branch test
AND simple
& sisisi
conflict fixed
add merge
del And Simple
merge with no-ff
add a
renove the another lien