Removed jQuery noConflict from main js file