branch test
add 7777777777
add 11111
add 8888888888
change 888888888
comflict fixed
branch test
AND simple
& simple
config fixed
add merge
merge with no-ff
fix bug 101
merged bug fix 101