add test.txt
AND feature1
& simple
conflict fixed
add dev to files
replace fix
add merge
merge with no-ff