merged manufacturer model with uncommitted changes from production server