branch test
add a newF flolder
change 1.txt
 AND simple
& simple
conflict fixed
conflict fixed really
add new line
merge without no-ff
bug 169 fixed
merged bug fix169