branch test
AND simple
& simple
conflict fixed
hello world
merge with no-ff
add gitskills
fix bug 101
merged bug fix 101