branch test
AND simple
& simple
conflict fixed
merge with no-ff
add merge
fix bug 101
merged bug fix 101
fix bug 101
merged bug fix 101
mod 123 to 1234
conflict fixed 2