resolve merge conflict

district/blocks.py

...rations/0106_alter_districtcrossroadpage_cards_content.py

district/templates/district/base.html

main/blocks.py

.../migrations/0046_alter_mainpeoplepage_options_and_more.py

main/migrations/0047_alter_mainhoaxpage_content.py

main/migrations/0053_merge_20230406_1446.py

main/models.py

main/static/main/images/hoax.webp

main/static/main/images/person-table.png

main/templates/main/blocks/article_download_block.html

.../templates/main/blocks/card_link_with_headline_block.html

main/templates/main/blocks/hoax_block.html

...plates/main/includes/layout/person_photo_page_header.html

main/templates/main/includes/layout/simple_page_header.html

main/templates/main/includes/newsletter_section.html

main/templates/main/main_article_search.html

main/templates/main/main_articles_page.html

main/templates/main/main_hoax_page.html

main/templates/main/main_people_page.html