diff --git a/application/admin/view/shopro/commission/agent/detail.html b/application/admin/view/shopro/commission/agent/detail.html
index 2f00cf6..de92569 100644
--- a/application/admin/view/shopro/commission/agent/detail.html
+++ b/application/admin/view/shopro/commission/agent/detail.html
@@ -257,15 +257,10 @@
                                     <el-button class="ml-2" type="primary" link @click="onChangeParentUser">更换
                                     </el-button>
                                 </el-form-item>
-<<<<<<< Updated upstream
                                 <el-form-item v-if="state.data.partner_mode" label="佣金规则:">
                                     <div class="tip" style="color: var(--sa-subfont); line-height: 1.4;">
                                         已切换为收益中心固定金额规则，旧百分比不再生效。
                                     </div>
-=======
-                                <el-form-item v-if="state.data.partner_mode" label="佣金比例:">
-                                    <div class="tip">已切换为收益中心固定金额，旧百分比不再生效。</div>
->>>>>>> Stashed changes
                                 </el-form-item>
                                 <el-form-item v-else label="佣金比例:">
                                     <div class="commission-item">