diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index 9dc4781e26c..552246f2513 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -28,11 +28,7 @@ from tools.translate import _
 from tools import DEFAULT_SERVER_DATE_FORMAT, DEFAULT_SERVER_DATETIME_FORMAT, float_compare
 import decimal_precision as dp
 import netsvc
-<<<<<<< TREE
-from openerp.addons.base.res import res_config_sale as sale_config
-=======
 #from openerp.addons.base.res import res_config_sale as sale_config
->>>>>>> MERGE-SOURCE
 
 class sale_shop(osv.osv):
     _name = "sale.shop"