Resolve conflicts related to base settings

.circleci/config.yml

.gitignore

.nvmrc

.vscode/launch.json

Makefile

docker/Dockerfile.dev

hypha/apply/activity/adapters/__init__.py

hypha/apply/activity/adapters/activity_feed.py

hypha/apply/activity/adapters/base.py

hypha/apply/activity/adapters/django_messages.py

hypha/apply/activity/adapters/emails.py

hypha/apply/activity/adapters/slack.py

hypha/apply/activity/adapters/utils.py

hypha/apply/activity/context_processors.py

hypha/apply/activity/messaging.py

hypha/apply/activity/migrations/0064_alter_event_type.py

hypha/apply/activity/options.py

...ply/activity/templates/activity/include/comment_form.html

...ply/activity/templates/activity/include/listing_base.html

...ty/templates/activity/include/notifications_dropdown.html