diff --git a/beesdoo_base/views/partner.xml b/beesdoo_base/views/partner.xml
index 4ef4a26..9aa98d2 100644
--- a/beesdoo_base/views/partner.xml
+++ b/beesdoo_base/views/partner.xml
@@ -14,7 +14,6 @@
 		<field name="target">new</field>
 	</record>
 
-<<<<<<< HEAD
 	<record model="ir.ui.view" id="beesdoo_partner_form_view">
 		<field name="name">beesdoo.partner.form.view</field>
 		<field name="model">res.partner</field>
@@ -72,60 +71,6 @@
 			</field>
 		</field>
 	</record>
-=======
-    <record model="ir.ui.view" id="beesdoo_partner_form_view">
-        <field name="name">beesdoo.partner.form.view</field>
-        <field name="model">res.partner</field>
-        <field name="inherit_id" ref="point_of_sale.view_partner_property_form" />
-        <field name="arch" type="xml">
-            <field name="name" position="replace">
-                <field name="name" class="oe_read_only" />
-                <field name="first_name" placeholder="First Name" class="oe_edit_only"
-                    attrs="{'invisible' : [('company_type', '=', 'company')]}" />
-                <field name="last_name" placeholder="Last Name" class="oe_edit_only"
-                    default_focus="1" />
-            </field>
-            <field name="website" position="after">
-                <field name="eater"
-                    attrs="{'invisible': [('company_type', '=', 'company')]}" />
-                <field name="parent_eater_id" attrs="{'invisible' : [('eater', '!=', 'eater')]}" />
-            </field>
-            <xpath expr="//notebook" position="inside">
-                <page string="Member Cards"
-                    attrs="{'invisible': ['|', ('customer', '=', False), ('eater', '!=', 'worker_eater')]}">
-                    <separator string="Printing" />
-                    <group>
-                      <field name="member_card_to_be_printed" />
-                      <field name="last_printed" />
-                    </group>
-                    <separator string="Eaters" />
-                    <field name="child_eater_ids" widget="many2many_tags" />
-                    <separator string="Cards" />
-                    <field string="Cards" name="member_card_ids">
-                        <tree editable="bottom">
-                            <field name="barcode" />
-                            <field name="create_date" />
-                            <field name="end_date" />
-                            <field name="responsible_id" />
-                            <field name="comment" />
-                            <field name="valid" />
-                        </tree>
-                    </field>
-                    <group>
-                        <button string="New Card" name="%(action_membercard_wizard)d"
-                            type="action" />
-                    </group>
-                </page>
-            </xpath>
-            <field name="barcode" position="attributes">
-                <attribute name="attrs">{'invisible' : [('eater', '!=', 'worker_eater')]}</attribute>
-            </field>
-            <field name="barcode" position="after">
-                <field name="parent_barcode" attrs="{'invisible' : [('eater', '!=', 'eater')]}" />
-            </field>
-        </field>
-    </record>
->>>>>>> 428b5a87e862d422af23bd418dc92bf7ac082b2d
 
 	<!-- S022 : By default a supplier should be a company -->
 	<record id="base.action_partner_supplier_form" model="ir.actions.act_window">