I have two cangku
branch test
on branch dev1
AND simple
& simple
conflict fixed
new test
AND simple
&simple
conflict fixed