Incorporate changes from production.
Add Changes from production
Add missing files.