add simple
test branch
featur1 branch
conflict branch
test branch again
dev branch
merge branch
add merge
merge with no-ff
testing fast forward
test fast forward master
testing again
haha
hehe
hello
helloworld
hello git
merge test
whatis
Merge branch 'test' into dev