diff --git a/src/util/sftp.py b/src/util/sftp.py
index a1835c7..33c284e 100644
--- a/src/util/sftp.py
+++ b/src/util/sftp.py
@@ -12,11 +12,7 @@
 from google.cloud import logging as cloud_logging
 
 
-<<<<<<< HEAD
-# TODO [$65aeb18b145c120009e43399]: Convert to agnostic Boto client
-=======
-# TODO [$65aeaf6b5159da0008241be0]: Convert to agnostic Boto client 
->>>>>>> c003877bbc264e4d7587c47004afda935bc32987
+# TODO: Convert to agnostic Boto client
 # Use the slick smart-open library to handle S3 connections. This maintains the agnostic nature
 # of sftp, not tied to any specific cloud provider, but is way more efficient than paramiko/sftp in terms of $$
 class SFTPClient: