Fix system.min.js merge