diff --git a/addons/marketing_campaign_crm_demo/marketing_campaign_demo.xml b/addons/marketing_campaign_crm_demo/marketing_campaign_demo.xml
index 26ea71f1618..7b45c959035 100644
--- a/addons/marketing_campaign_crm_demo/marketing_campaign_demo.xml
+++ b/addons/marketing_campaign_crm_demo/marketing_campaign_demo.xml
@@ -39,10 +39,6 @@
             <field model="ir.actions.act_window" name="ref_ir_act_window" search="[('name', '=', u'For OpenERP OnDemand Free Trial 2010 Mail Form')]"/>
             <field model="ir.values" name="ref_ir_value" search="[('name', '=', u'Send Mail (For OpenERP OnDemand Free Trial 2010)')]"/>
             <field name="model_id" ref="crm.model_crm_lead"/>
-<<<<<<< TREE
-            <field eval="0" name="user_signature"/>
-=======
->>>>>>> MERGE-SOURCE
             <field name="body_text">Hello,Thanks for generous interest you have shown in the openERP.Regards,OpenERP Team,</field>
             <field name="name">For OpenERP OnDemand Free Trial 2010</field>
         </record>
@@ -52,10 +48,6 @@
             <field model="ir.actions.act_window" name="ref_ir_act_window" search="[('name', '=', u'For OpenERP OnDemand Free Trial 2010 Mail Form')]"/>
             <field model="ir.values" name="ref_ir_value" search="[('name', '=', u'Send Mail (For OpenERP OnDemand Free Trial 2010)')]"/>
             <field name="model_id" ref="crm.model_crm_lead"/>
-<<<<<<< TREE
-            <field eval="0" name="user_signature"/>
-=======
->>>>>>> MERGE-SOURCE
             <field name="body_text">Hello,We have very good offer that might suit you.
             We propose you to subscribe to the OpenERP Discovery Day on May 2010.
             If any further information required kindly revert back.
@@ -64,20 +56,12 @@
             <field name="name">For OpenERP Discovery Day on May 2010</field>
         </record>
 
-<<<<<<< TREE
-            <record id="email_template_3" model="email.template">
-=======
         <record id="email_template_3" model="email.template">
->>>>>>> MERGE-SOURCE
             <field name="subject">Thanks for subscribing to the OpenERP Discovery Day</field>
             <field name="email_to">info@tinyerp.com</field>
             <field model="ir.actions.act_window" name="ref_ir_act_window" search="[('name', '=', u'For OpenERP OnDemand Free Trial 2010 Mail Form')]"/>
             <field model="ir.values" name="ref_ir_value" search="[('name', '=', u'Send Mail (For OpenERP OnDemand Free Trial 2010)')]"/>
             <field name="model_id" ref="crm.model_crm_lead"/>
-<<<<<<< TREE
-            <field eval="0" name="user_signature"/>
-=======
->>>>>>> MERGE-SOURCE
             <field name="body_text">Hello,Thanks for showing intrest and for subscribing to the OpenERP Discovery Day.
              If any further information required kindly revert back.
              I really appreciate your co-operation on this.
@@ -85,20 +69,12 @@
             <field name="name">For OpenERP Discovery Day</field>
         </record>
 
-<<<<<<< TREE
-             <record id="email_template_4" model="email.template">
-=======
         <record id="email_template_4" model="email.template">
->>>>>>> MERGE-SOURCE
             <field name="subject">Thanks for buying the OpenERP book</field>
             <field name="email_to">info@tinyerp.com</field>
             <field model="ir.actions.act_window" name="ref_ir_act_window" search="[('name', '=', u'For OpenERP OnDemand Free Trial 2010 Mail Form')]"/>
            <field model="ir.values" name="ref_ir_value" search="[('name', '=', u'Send Mail (For OpenERP OnDemand Free Trial 2010)')]"/>
              <field name="model_id" ref="crm.model_crm_lead"/>
-<<<<<<< TREE
-            <field eval="0" name="user_signature"/>
-=======
->>>>>>> MERGE-SOURCE
             <field name="body_text">Hello,Thanks for showing intrest and buying the OpenERP book.
             If any further information required kindly revert back.
             I really appreciate your co-operation on this.
@@ -112,10 +88,6 @@
             <field model="ir.actions.act_window" name="ref_ir_act_window" search="[('name', '=', u'For OpenERP OnDemand Free Trial 2010 Mail Form')]"/>
             <field model="ir.values" name="ref_ir_value" search="[('name', '=', u'Send Mail (For OpenERP OnDemand Free Trial 2010)')]"/>
             <field name="model_id" ref="crm.model_crm_lead"/>
-<<<<<<< TREE
-            <field eval="0" name="user_signature"/>
-=======
->>>>>>> MERGE-SOURCE
             <field name="body_text">Hello, We have very good offer that might suit you.
             For our gold partners,We are arranging free technical training on june,2010.
             If any further information required kindly revert back.
@@ -130,10 +102,6 @@
             <field model="ir.actions.act_window" name="ref_ir_act_window" search="[('name', '=', u'For OpenERP OnDemand Free Trial 2010 Mail Form')]"/>
             <field model="ir.values" name="ref_ir_value" search="[('name', '=', u'Send Mail (For OpenERP OnDemand Free Trial 2010)')]"/>
             <field name="model_id" ref="crm.model_crm_lead"/>
-<<<<<<< TREE
-            <field eval="0" name="user_signature"/>
-=======
->>>>>>> MERGE-SOURCE
             <field name="body_text">Hello, We have very good offer that might suit you.
             For our silver partners,We are  paid technical training on june,2010.
             If any further information required kindly revert back.
@@ -148,10 +116,6 @@
             <field model="ir.actions.act_window" name="ref_ir_act_window" search="[('name', '=', u'For OpenERP OnDemand Free Trial 2010 Mail Form')]"/>
             <field model="ir.values" name="ref_ir_value" search="[('name', '=', u'Send Mail (For OpenERP OnDemand Free Trial 2010)')]"/>
             <field name="model_id" ref="crm.model_crm_lead"/>
-<<<<<<< TREE
-            <field eval="0" name="user_signature"/>
-=======
->>>>>>> MERGE-SOURCE
             <field name="body_text">Hello, We have very good offer that might suit you.
             For our silver partners,We are  offering Gold partnership.
             If any further information required kindly revert back.
@@ -166,10 +130,6 @@
             <field model="ir.actions.act_window" name="ref_ir_act_window" search="[('name', '=', u'For OpenERP OnDemand Free Trial 2010 Mail Form')]"/>
             <field model="ir.values" name="ref_ir_value" search="[('name', '=', u'Send Mail (For OpenERP OnDemand Free Trial 2010)')]"/>
             <field name="model_id" ref="crm.model_crm_lead"/>
-<<<<<<< TREE
-            <field eval="0" name="user_signature"/>
-=======
->>>>>>> MERGE-SOURCE
             <field name="body_text">Hello, Thanks for showing intrest and for subscribing to technical training.If any further information required kindly revert back.I really appreciate your co-operation on this.
             Regards,OpenERP Team,</field>
             <field name="name">For subscribing to technical training</field>