补充提交跳过conflict