diff --git a/addons/crm/__openerp__.py b/addons/crm/__openerp__.py
index 791a98233f0..988dcfc5d37 100644
--- a/addons/crm/__openerp__.py
+++ b/addons/crm/__openerp__.py
@@ -109,14 +109,10 @@ between mails and Open ERP.""",
         'crm_opportunity_demo.xml',
         'crm_phonecall_demo.xml'
     ],
-<<<<<<< TREE
-    'test1': [
-#            'test/test_crm_meeting.yml', 
-            'test/test_crm_lead.yml',
-=======
+
     'test': ['test/test_crm_lead.yml',
             'test/test_crm_meeting.yml', 
->>>>>>> MERGE-SOURCE
+
             'test/test_crm_opportunity.yml',
             'test/test_crm_phonecall.yml', 
              ],
diff --git a/addons/crm/crm.py b/addons/crm/crm.py
index 40ca13578f3..f3e0d7c8ea9 100644
--- a/addons/crm/crm.py
+++ b/addons/crm/crm.py
@@ -67,7 +67,7 @@ class crm_case_section(osv.osv):
         'resource_calendar_id': fields.many2one('resource.calendar', "Resource's Calendar"),
         'server_id':fields.many2one('email.smtpclient', 'Server ID'),
         'note': fields.text('Description'),
-        
+        'working_hours': fields.float('Working Hours', digits=(16,2 )),
     }
 
     _defaults = {
diff --git a/addons/crm/crm_view.xml b/addons/crm/crm_view.xml
index 5c171236836..c5028c17541 100644
--- a/addons/crm/crm_view.xml
+++ b/addons/crm/crm_view.xml
@@ -13,31 +13,29 @@
             <field name="arch" type="xml">
                 <form string="Sales Team">
                     <group col="6" colspan="4">
-                        <field name="name" select="1" colspan="4"/>
+                        <field name="name" select="1" colspan="2"/>
+                        <field name="parent_id" select="2" widget="selection"/>
                         <field name="code" select="1"/>
                         <newline/>
-                        <field name="resource_calendar_id" select="2"/>
+                        <field name="user_id" select="2"/>
+                        <field name="working_hours" widget="float_time"/>
+                        <field name="active" select="2"/>
                     </group>
                     <notebook colspan="4">
                         <page string="Sales Team">
                             <group col="2" colspan="1">
-                                <separator string="Responsible" colspan="2"/>
-                                <field name="parent_id" select="2" widget="selection"/>
-                                <field name="user_id" select="2"/>
-                            </group>
-                            <group col="2" colspan="1">
-                                <separator string="Contact Information" colspan="2"/>
-                                <field name="server_id" select="2"/>
+                                <separator string="Mailgateway" colspan="2"/>
                                 <field name="reply_to" select="2"/>
                             </group>
                             <group col="2" colspan="1">
-                                <separator string="Sales Team Property" colspan="2"/>
-                                <field name="active" select="2"/>
+                                <separator string="Configuration" colspan="2"/>
                                 <field name="allow_unlink" select="2"/>
                             </group>
-                            <separator string="Members List" colspan="4"/>
+                            <separator string="Team Members" colspan="4"/>
                             <field name="member_ids" nolabel="1" colspan="4"/>
-                            <separator string="Note" colspan="4"/>
+                        </page>
+                        <page string="Note">
+							<separator string="Note" colspan="4"/>
                             <field name="note" select="1" colspan="4" nolabel="1"/>
                         </page>
                     </notebook>
diff --git a/addons/crm/report/crm_report_view.xml b/addons/crm/report/crm_report_view.xml
index 814b056dbf1..701c9e3c835 100644
--- a/addons/crm/report/crm_report_view.xml
+++ b/addons/crm/report/crm_report_view.xml
@@ -171,16 +171,6 @@
         	id="act_res_users_2_report_crm_case_user" name="Monthly cases"
         	res_model="crm.case.report" src_model="res.users" />
 
-        <act_window domain="[('section_id', '=', active_id)]"
-        	id="act_crm_case_section_2_report_crm_case_user"
-        	name="Monthly cases by user" res_model="crm.case.report"
-        	src_model="crm.case.section" />
-
-        <act_window domain="[('section_id', '=', active_id)]"
-        	id="act_crm_case_section_2_report_crm_case_categ"
-        	name="Monthly cases by Sales Team" res_model="crm.case.report"
-        	src_model="crm.case.section" />
-
 <!-- Closed & Open CRM Case view for Random Activities dashboard Tree View -->
 
         <record id="board_view_crm_case_open_dashboard_tree" model="ir.ui.view">