dev append 'new branch'
AND simple
& simple
conflict fixed