diff --git a/www/common/application_config_internal.js b/www/common/application_config_internal.js
index 87880a12e..e3271ac1d 100644
--- a/www/common/application_config_internal.js
+++ b/www/common/application_config_internal.js
@@ -193,12 +193,7 @@ define(function() {
         poll: 'cptools-poll',
         form: 'cptools-poll',
         whiteboard: 'cptools-whiteboard',
-<<<<<<< HEAD
         diagram: 'cptools-diagram',
-||||||| c94666efb
-=======
-        drawio: 'cptools-diagram',
->>>>>>> origin/drawio-bower
         todo: 'cptools-todo',
         contacts: 'fa-address-book',
         calendar: 'fa-calendar',