diff --git a/sf_manufacturing/views/mrp_workcenter_views.xml b/sf_manufacturing/views/mrp_workcenter_views.xml
index 47597185..691bf16d 100644
--- a/sf_manufacturing/views/mrp_workcenter_views.xml
+++ b/sf_manufacturing/views/mrp_workcenter_views.xml
@@ -295,21 +295,21 @@
             </field>
         </field>
     </record>
-<<<<<<< HEAD
-<!--     测试searchpanel -->
-    <record id="view_location_search_sf11111_inherit" model="ir.ui.view">
-        <field name="name">mrp.workcenter.inherit</field>
-        <field name="model">mrp.workcenter</field>
-        <field name="inherit_id" ref="mrp.view_mrp_workcenter_search"/>
-        <field name="arch" type="xml">
-            <xpath expr="//search[1]" position="inside">
-                <searchpanel class="account_root">
-<!--                     <field name="location_type" icon="fa-filter"/> -->
-                    <field name="production_line_id" select="multi"/>
-                </searchpanel>
-            </xpath>
-        </field>
-    </record>
+
+<!--&lt;!&ndash;     测试searchpanel &ndash;&gt;-->
+<!--    <record id="view_location_search_sf11111_inherit" model="ir.ui.view">-->
+<!--        <field name="name">mrp.workcenter.inherit</field>-->
+<!--        <field name="model">mrp.workcenter</field>-->
+<!--        <field name="inherit_id" ref="mrp.view_mrp_workcenter_search"/>-->
+<!--        <field name="arch" type="xml">-->
+<!--            <xpath expr="//search[1]" position="inside">-->
+<!--                <searchpanel class="account_root">-->
+<!--&lt;!&ndash;                     <field name="location_type" icon="fa-filter"/> &ndash;&gt;-->
+<!--                    <field name="production_line_id" select="multi"/>-->
+<!--                </searchpanel>-->
+<!--            </xpath>-->
+<!--        </field>-->
+<!--    </record>-->