diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index 9e04ae580c8..517fdc7070c 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -5,8 +5,12 @@
         <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
 
     <!-- EVENTS  -->
 
@@ -258,7 +262,8 @@
 
        <menuitem name="Events" id="menu_event_event" action="action_event_view" parent="base.menu_event_main" />
 
-        <!-- EVENTS/REGISTRATIONS/EVENTS  -->
+    <!-- EVENTS/REGISTRATIONS/EVENTS  -->
+
         <record model="ir.ui.view" id="view_event_registration_tree">
             <field name="name">event.registration.tree</field>
             <field name="model">event.registration</field>
diff --git a/addons/membership/membership_view.xml b/addons/membership/membership_view.xml
index a1c39165c82..921afcd1b54 100644
--- a/addons/membership/membership_view.xml
+++ b/addons/membership/membership_view.xml
@@ -126,7 +126,7 @@
         </record>
 
         <menuitem name="Association" id="base.menu_association" icon="terp-calendar" sequence="9"/>
-        <menuitem name="Membership" id="menu_membership" sequence="0" parent="base.menu_association"/>
+        <menuitem name="Members" id="menu_membership" sequence="0" parent="base.menu_association"/>
         <menuitem name="Configuration" id="base.menu_marketing_config_association"
             parent="base.menu_association" sequence="30" groups="base.group_extended"/>