Resolve conflicts

.vscode/launch.json

hypha/apply/activity/adapters/__init__.py

hypha/apply/activity/context_processors.py

hypha/apply/activity/messaging.py

...ity/templates/messages/email/submission_confirmation.html

hypha/apply/activity/views.py

hypha/apply/funds/files.py

hypha/apply/funds/models/submissions.py

hypha/apply/funds/models/utils.py

hypha/apply/funds/notificaitons.py

...ply/funds/templates/funds/applicationsubmission_form.html

hypha/apply/funds/tests/test_models.py

...projects/templates/application_projects/invoice_form.html

...templates/application_projects/project_approval_form.html

...ojects/templates/application_projects/project_detail.html

.../projects/templates/application_projects/report_form.html

.../projects/templates/application_projects/vendor_form.html

...ojects/templates/application_projects/vendor_success.html

hypha/apply/stream_forms/testing/factories.py

hypha/static_src/src/javascript/apply/list-input-files.js