Redid review logic
Cleanup merge conflicts.
update development environment file.:
update product model with touch true.