AND simple
& simple
conflict fixed
feature2
add test2.txt
add merge
merge with no-ff
fix bug 101
merged bug fix 101
commit test.txt,test2.txt
fix conflix test.txt,test2.txt