added in concat for the javascript files in prod only
fixed conflict