diff --git a/src/app/ui/tooltip.js b/src/app/ui/tooltip.js
index b49f70ae57..c9265ebb1b 100644
--- a/src/app/ui/tooltip.js
+++ b/src/app/ui/tooltip.js
@@ -25,6 +25,7 @@ class Toaster {
   }
   render (tooltipText, actionElement, opts) {
     opts = defaultOptions(opts)
+<<<<<<< HEAD
 <<<<<<< HEAD
     let canShorten = true
     if (tooltipText instanceof Element) {
@@ -42,6 +43,8 @@ class Toaster {
     if (typeof (tooltipText) === 'object' && tooltipText.message !== undefined) {
       tooltipText = tooltipText.message
     }
+=======
+>>>>>>> 9211c21f... removed double implementation
 
     if (typeof tooltipText === 'object') {
       if (tooltipText.message) {