Add test.txt
add in branch
ADD simple
& simple
conflict fixed
new branch dev
merge with on-ff
fix bug 101
merged bug fix 101