add quick.txt
conflict fixed
add merge
merge with no-ff