branch test
AND simple
& commit
conflict fixed