branch test
AND simple
& simple
conflict fixed
test -no-ff
merge with -no-ff
default
Merge branch 'master' into dev
test default
figure out an issue
Development
Get developtment