Branch test
AND simple
& simple
Conflict fixed
Add merge
Merge with no-ff