Congress Averts Shutdown; Fight Continues Over Pandemic Aid