fix on merge issues

CHANGELOG

+minerva (11.0.0) stable; urgency=medium
+
 minerva (10.0.5) stable; urgency=medium
 
   * Bug fix: interacting drugs can be found for RNAs

frontend-js/src/main/js/Functions.js

@@ -196,9 +196,9 @@ Functions.overlayToColor = function(elementOverlay) {
     blue = blue & MAX_BLUE;
 
     var color = red | green | blue;
-    return intToColorString(color);
+    return this.intToColorString(color);
   } else {
-    logger.error("elementOverlay doesn't have neither color nor value set!");
+    throw new Error("elementOverlay doesn't have neither color nor value set!");
   }
 };