branch test
an dev2
manual checkout and branch
AND simple
& simple
conflict fixed
manual git graph