add fromdev2.txt
merge with no-ff
add other line in description.txt