diff --git a/mail_to/i18n/de.po b/mail_to/i18n/de.po
index c15403f4..e8c9db3c 100644
--- a/mail_to/i18n/de.po
+++ b/mail_to/i18n/de.po
@@ -13,12 +13,7 @@ msgstr ""
 "POT-Creation-Date: 2018-05-05 23:09+0000\n"
 "PO-Revision-Date: 2018-04-21 00:05+0000\n"
 "Last-Translator: Ermin Trevisan <trevi@twanda.com>, 2019\n"
-<<<<<<< HEAD
 "Language-Team: German (https://www.transifex.com/it-projects-llc/teams/76080/de/)\n"
-=======
-"Language-Team: German (https://www.transifex.com/it-projects-llc/teams/76080/"
-"de/)\n"
->>>>>>> upstream/11.0
 "Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
diff --git a/mail_to/i18n/mail_to.pot b/mail_to/i18n/mail_to.pot
index 153ed4c9..c7963c35 100644
--- a/mail_to/i18n/mail_to.pot
+++ b/mail_to/i18n/mail_to.pot
@@ -4,11 +4,7 @@
 #
 msgid ""
 msgstr ""
-<<<<<<< HEAD
 "Project-Id-Version: Odoo Server 12.0\n"
-=======
-"Project-Id-Version: Odoo Server 11.0\n"
->>>>>>> upstream/11.0
 "Report-Msgid-Bugs-To: \n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
@@ -18,48 +14,22 @@ msgstr ""
 "Plural-Forms: \n"
 
 #. module: mail_to
-<<<<<<< HEAD
 #. openerp-web
 #: code:addons/mail_to/static/src/xml/recipient.xml:10
-=======
-#: model:ir.model,name:mail_to.model_mail_message
-msgid "Message"
-msgstr ""
-
-#. module: mail_to
-#. openerp-web
-#: code:addons/mail_to/static/src/js/test_mail_to.js:13
-#, python-format
-msgid "Open Partners Form From Recipient Link"
-msgstr ""
-
-#. module: mail_to
-#. openerp-web
-#: code:addons/mail_to/static/src/xml/recipient.xml:10
-#: code:addons/mail_to/static/src/xml/recipient.xml:11
->>>>>>> upstream/11.0
 #, python-format
 msgid "To:"
 msgstr ""
 
 #. module: mail_to
 #. openerp-web
-<<<<<<< HEAD
 #: code:addons/mail_to/static/src/xml/recipient.xml:19
-=======
-#: code:addons/mail_to/static/src/xml/recipient.xml:32
->>>>>>> upstream/11.0
 #, python-format
 msgid "and"
 msgstr ""
 
 #. module: mail_to
 #. openerp-web
-<<<<<<< HEAD
 #: code:addons/mail_to/static/src/xml/recipient.xml:20
-=======
-#: code:addons/mail_to/static/src/xml/recipient.xml:33
->>>>>>> upstream/11.0
 #, python-format
 msgid "more"
 msgstr ""
diff --git a/mail_to/tests/test_default.py b/mail_to/tests/test_default.py
index 14f8d6d8..3fedfe02 100644
--- a/mail_to/tests/test_default.py
+++ b/mail_to/tests/test_default.py
@@ -40,11 +40,17 @@ def test_01_mail_to(self):
                 'mail_message_id': msg.id,
                 'is_read': False,
             })
-        code = """
-            setTimeout(function () {
-                console.log($('a.recipient_link').length && 'ok' || 'error');
-            }, 3000);
-        """
 
-        link = '/web#%s' % url_encode({'action': 'mail.action_discuss'})
-        self.phantom_js(link, code, "odoo.__DEBUG__.services['web_tour.tour'].tours.mail_tour.ready", login="admin")
+        cr = self.registry.cursor()
+        cr._lock.release()
+        # code = """
+        #     setTimeout(function () {
+        #         console.log($('a.recipient_link').length && 'ok' || 'error');
+        #     }, 3000);
+        # """
+        #
+        # link = '/web#%s' % url_encode({'action': 'mail.action_discuss'})
+        self.phantom_js("/web",
+                        "odoo.__DEBUG__.services['web_tour.tour'].run('mail_to_tour', 1000)",
+                        "odoo.__DEBUG__.services['web_tour.tour'].tours.mail_to_tour.ready",
+                        login="admin", timeout=90)