diff --git a/CHANGELOG.md b/CHANGELOG.md
index aacea80..0d90a30 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,10 @@
 CHANGELOG
 =====================
 
+v1.1.3
+---------------------
+* Bugfix: Compatibility with Adminlte v2.6.0 (conflict of $.fn.tree plugin name). @ap
+
 v1.1.2
 ---------------------
 * AccessControl filter update default regexp to ^site, in debug mode add gii and debug modules.
diff --git a/src/assets/js/jstree-double-panel.js b/src/assets/js/jstree-double-panel.js
index 12db9ee..b867827 100644
--- a/src/assets/js/jstree-double-panel.js
+++ b/src/assets/js/jstree-double-panel.js
@@ -6,7 +6,7 @@
 // This file will be compiled into app.js and will not be minified.
 // Feel free with using ES6 here.
 (function ($) {
-  var Tree = function Tree(options) {
+  var TreePanels = function TreePanels(options) {
     var defaultList = {
       'plugins': ['search', 'checkbox'],
       'core': {
@@ -237,12 +237,12 @@
     }(options);
   };
 
-  $.fn.tree = function (options) {
-    var settings = $.extend({}, $.fn.tree.defaults, options);
-    return Tree(settings);
+  $.fn.treePanels = function (options) {
+    var settings = $.extend({}, $.fn.treePanels.defaults, options);
+    return TreePanels(settings);
   };
 
-  $.fn.tree.defaults = {
+  $.fn.treePanels.defaults = {
     dataFrom: [],
     dataTo: [],
     fromTreeElement: '#jstree-in',
diff --git a/src/assets/js/rbac.js b/src/assets/js/rbac.js
index 7190364..e4901bd 100755
--- a/src/assets/js/rbac.js
+++ b/src/assets/js/rbac.js
@@ -4,7 +4,7 @@
   })
 
   function init_role_permissions_tree() {
-    $.fn.tree({
+    $.fn.treePanels({
       dataFrom: window.allowPermissions,
       dataTo: window.denyPermissions,
       fromTreeElement:'#allowPermissions',