add -no-ff
merge no ff
add dev
delete 2.txt
add 2.txt