修改M6
Md
erge remote-tracking branch 'origin/new'