add a line
change one lien
conflict fixed
add merge
merge with no-ff
fix bug 101
merged bug fix 101
fix bug101
merged bug fix 101