branch test
AND simple
& simple
first fix conflict
second fix
feature2
ola The World Cup
conflicts real fixed
add merge
merge with no-ff
branch one
one1 andy1
merge with andy1
fix bug 101
merged bug fix 101