diff --git a/README.md b/README.md
index 33d9283..d29b4e7 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,9 @@
 Folder,Script,Purpose
+<<<<<<< HEAD
 church-tools,elvanto_attendance_fetcher.py,scrapes attendance figures from an elvanto attendance report.
+=======
+church-tools,elvanto_attendance_fetcher.py,scrapes attendance figures from an elvanto attendance report
+>>>>>>> c00fdfea354ce2e9bbf24c7c4b4cc2bb38d1ef01
 church-tools,msfs_spreadsheet_generator.py,generates an excel spreadsheet for reporting ministry support fund information to PCQ CMR.
 file-tools,list_s3_files.py, lists files in an s3 bucket and their urls.
 file-tools,s3_gui_tool.py, lists and syncs files in an S# bucket using a gui.