add second file
AND simple
&simple
conflict fix
add merge
merge with no--ff
fix bug 101