Make this paragraph more consistent:
Proposals in some communities to hold Halloween the following weekend. Whenever conditions returned to normal, met with protest from some parents.
Proposals in some communities to hold Halloween the following weekend, or whenever conditions returned to normal, met with protest from some parents.