fix: solve merge conflicts

conftest.py

program/serializers.py

program/tests/factories.py

program/tests/test_categories.py

program/tests/test_funding_categories.py

program/tests/test_languages.py

program/tests/test_licenses.py

program/tests/test_link_types.py

program/tests/test_music_focus.py

program/tests/test_profiles.py

program/tests/test_shows.py

program/tests/test_timeslots.py

program/tests/test_topics.py

program/tests/test_types.py

program/views.py