add merge
merge with no-ff
add learngit.txt