add merge
merge with no-ff
'初始化readme文件'