fix production environment flagging
fix merge conflict (two version of prod flag fix)