Update
fix merge conflicts
Production build added