branch test
AND simple
& simple
conflict fixed
first time to use git gui