提交跳过conflict