commit before merge
merge
暂存