Merge production and development contexts into a single workspace architecture