# Conflicts: # modules/settings/assets/js/pages/icon-settings.js # modules/settings/assets/js/pages/menu.js # package-lock.json