AND simple
& simple
conflict fixed
add merge
merge with no-ff
添加功能文件
添加功能合并
Merge branch 'dev'