branch test
AND simple
& simple
conflict fixed
add \n
delete line
merge with no-ff
fix bug 101
merge fix bug 101
add new files