branch test
& simple
gitskills/README.md
AND simple
conflic fixed
add --no-ff
merge with --no-f