branch test
git branch note
AND simple
& simple
conflict fixed