Fixing merged files and updating base.min.js