test.txt
adding a.md
haha and hehe
clear and silence
conflict fixed
addmerge
merge with no-ff