diff --git a/addons/report_crm/report_crm_opportunity_view.xml b/addons/report_crm/report_crm_opportunity_view.xml
index 8ddd83a4120..a31adbbe6b7 100644
--- a/addons/report_crm/report_crm_opportunity_view.xml
+++ b/addons/report_crm/report_crm_opportunity_view.xml
@@ -78,9 +78,6 @@
 	        <field name="view_mode">tree</field>
 	        <field name="view_id" ref="view_crm_opportunity_tree"/>
 	        <field name="act_window_id" ref="action_report_crm_opportunity"/>
-<<<<<<< TREE
-	    </record>                
-=======
 	    </record> 
         <record model="ir.actions.act_window.view" id="action_report_crm_opportunity_graph">
 	        <field name="sequence" eval="1"/>
@@ -88,7 +85,7 @@
 	        <field name="view_id" ref="view_crm_opportunity_graph"/>
 	        <field name="act_window_id" ref="action_report_crm_opportunity"/>
 	    </record>  
->>>>>>> MERGE-SOURCE
+
         <menuitem name="Opportinities" action="action_report_crm_opportunity" id="menu_crm_opportunity_tree" parent="crm.next_id_52"/>        
 	</data>
 </openerp>
diff --git a/addons/report_crm/report_crm_view.xml b/addons/report_crm/report_crm_view.xml
index 33e855beea7..4dafe212dc3 100644
--- a/addons/report_crm/report_crm_view.xml
+++ b/addons/report_crm/report_crm_view.xml
@@ -57,6 +57,7 @@
                    		<separator orientation="vertical"/>
                    		<filter string="This Year" icon="terp-hr" domain="[('name','=',time.localtime()[0])]"/>
 						<filter string="This Month" icon="terp-hr" domain="[('month','=',time.strftime('%%m'))]"/>
+						<filter string="Current" icon="terp-hr" domain="[('state','=','draft')]"/>
 						<filter string="Won" icon="terp-hr" domain="[('state','=','done')]"/>
 						<filter string="Lost" icon="terp-hr" domain="[('state','=','cancel')]"/>						
 						<separator orientation="vertical"/>