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 @@
new
-<<<<<<< HEAD
beesdoo.partner.form.view
res.partner
@@ -72,60 +71,6 @@
-=======
-
- beesdoo.partner.form.view
- res.partner
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {'invisible' : [('eater', '!=', 'worker_eater')]}
-
-
-
-
-
-
->>>>>>> 428b5a87e862d422af23bd418dc92bf7ac082b2d