Resolve conflicts with develop

Author: jlubken

…/assets/PPE_Calculator_for_COVID-19.xlsx defaults/assets/PPE_Calculator.xlsxdefaults/assets/PPE_Calculator_for_COVID-19.xlsx renamed to defaults/assets/PPE_Calculator.xlsx defaults/assets/PPE_Calculator_for_COVID-19.xlsx renamed to defaults/assets/PPE_Calculator.xlsx

@@ -97,6 +97,9 @@ en:
     <a download="{filename}" href="data:file/csv;base64,{csv}">Download {filename}</a>
   presentation-excel-download: |+
     Download the PPE Forecasting Calculator: <a download="{filename}" href="data:file/xlsx;base64,{excel}">{filename}</a>.
+    <br />
+    <br />
+    This Excel-based calculator can use input from any model. To use CHIME’s projections with your existing parameters, download the csv below:
   admits_hospitalized: "Hospitalized Admissions"
   admits_icu: "ICU Admissions"
   admits_ventilated: "Ventilated Admissions"

src/penn_chime/locales/en.yml

@@ -9,6 +9,5 @@ class PPE:
     def __init__(self, env: Dict[str, str]):
         """__init__."""
         self.assets = assets = env['ASSETS']
-        self.filename = filename = "PPE_Calculator_for_COVID-19.xlsx"
+        self.filename = filename = "PPE_Calculator.xlsx"
         self.src = os.path.join(assets, filename)
-        self.screenshot = os.path.join(assets, 'PPE_Screenshot.jpg')