# Conflicts: # dist/mix-manifest.json # dist/scripts/aldine.js # dist/styles/aldine.css # dist/styles/editor.css # package.json # webpack.mix.js