branch testa
AND simple
& simple
conflict fixed
add xxx