diff --git a/addons/mail/wizard/mail_compose_message.py b/addons/mail/wizard/mail_compose_message.py
index 205fa3a8ef0..301dff515b3 100644
--- a/addons/mail/wizard/mail_compose_message.py
+++ b/addons/mail/wizard/mail_compose_message.py
@@ -21,11 +21,7 @@
 
 import re
 from openerp import tools
-<<<<<<< TREE
-=======
-
 from openerp import SUPERUSER_ID
->>>>>>> MERGE-SOURCE
 from openerp.osv import osv
 from openerp.osv import fields
 from openerp.tools.safe_eval import safe_eval as eval