resolve merge conflict

.gitignore

@@ -176,7 +176,7 @@ pyrightconfig.json
 data/
 study_export_*
 study_files.db
-study_files.json
+study_files_new.json
 
 infra/ecs_config.toml
 aws-cli.pdf

study_files.json

@@ -1,5 +0,0 @@
-{
-    "Vaccine coverage": "data/vaccine_coverage_zotero_items.json",
-    "Ebola Virus": "data/ebola_virus_zotero_items.json",
-    "GeneXpert": "data/gene_xpert_zotero_items.json"
-}