diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index 517fdc7070c..9936624c243 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -5,12 +5,9 @@
         <menuitem name="Association" id="base.menu_association" icon="terp-calendar" sequence="9"/>
         <menuitem name="Marketing" icon="terp-crm" id="base.marketing_menu" sequence="17"/>
 
-<<<<<<< TREE
-        <menuitem name="Events" id="base.menu_event_main" parent="base.marketing_menu" />
-        <menuitem name="Events" id="base.menu_event_association" parent="base.menu_association" />
-=======
-        <menuitem name="Events Organisation" id="base.menu_event_main" parent="base.marketing_menu" />
->>>>>>> MERGE-SOURCE
+
+        <menuitem  name="Events" id="event_main_menu"/>
+        <menuitem name="Events Organisation" id="base.menu_event_main" parent="event_main_menu" />
 
     <!-- EVENTS  -->