add test
add test2
ad text.txt
add this is a another test!
add --
conflict fixed
add hahahaha
add force not ff
merge with no -ff
null
commit from issus-101
merged bug fix 101
modified test.txt and add new file third.txt
null
fix conflict