Resolve conflicts and update requirements

hypha/settings/base.py

@@ -6,7 +6,6 @@ Django settings for hypha project.
 import os
 
 import dj_database_url
-
 from environs import Env
 
 env = Env()

requirements.txt

@@ -33,6 +33,7 @@ djangorestframework-api-key==2.1.0
 djangorestframework==3.12.4
 drf-nested-routers==0.93.4
 drf-yasg==1.20.0
+environs==9.5.0
 gunicorn==20.1.0
 mailchimp3==3.0.16
 mistune==0.8.4