bug fix: merge conflict code in admin.min.js removed