编辑状态更新
Merge remote-tracking branch 'origin/master'