resolve merge conflict

calendar_utils/models.py

district/blocks.py

district/migrations/0109_alter_districthomepage_subheader.py

district/migrations/0109_districthomepage_footer_links.py

...ictelectioncampaignpage_campaign_funding_info_and_more.py

.../migrations/0110_districthomepage_footer_extra_content.py

district/migrations/0111_merge_20230502_1633.py

...rations/0112_alter_districtcenterpage_content_and_more.py

district/migrations/0113_merge_20230502_1854.py

district/models.py

district/templates/district/base.html

district/templates/district/blocks/article_links_block.html

district/templates/district/blocks/articles_block.html

district/templates/district/blocks/hero_banner_block.html

...t/templates/district/district_election_campaign_page.html

...s/district/includes/election_subpage_sidebar_content.html

main/templates/main/includes/layout/footer.html

...ations/0011_senatcampaignhomepage_footer_extra_content.py

...ign/migrations/0011_senatcampaignhomepage_footer_links.py

senat_campaign/migrations/0012_merge_20230502_1854.py