Resolve conflicts

hypha/apply/activity/tasks.py

...ply/activity/templates/messages/email/applicant_base.html

...ctivity/templates/messages/email/invited_to_proposal.html

...a/apply/activity/templates/messages/email/transition.html

hypha/apply/api/v1/filters.py

hypha/apply/api/v1/views.py

hypha/apply/funds/admin_forms.py

..._labbaseexternalreviewform_roundbaseexternalreviewform.py

hypha/apply/funds/models/applications.py

hypha/apply/funds/models/forms.py

hypha/apply/funds/models/utils.py

hypha/apply/funds/templates/funds/email/confirmation.html

hypha/apply/funds/tests/test_admin_form.py

hypha/apply/funds/tests/test_admin_views.py

hypha/apply/review/views.py

hypha/apply/templates/forms/includes/field.html

hypha/apply/users/templates/two_factor/_wizard_actions.html

.../apply/users/templates/two_factor/core/backup_tokens.html

...ers/templates/two_factor/core/backup_tokens_password.html

hypha/apply/users/templates/two_factor/core/setup.html