diff --git a/borgmatic/execute.py b/borgmatic/execute.py
index bc6a016a..4fc7745d 100644
--- a/borgmatic/execute.py
+++ b/borgmatic/execute.py
@@ -247,9 +247,12 @@ def execute_command(
         env=environment,
         cwd=working_directory,
     )
+<<<<<<< HEAD
     """ logging.warning(f"{process.args}") """
     """ logging.warning(f"{process.wait()}") """
 
+=======
+>>>>>>> ff68541 (Add ntfy warning)
 
     if not run_to_completion:
         return process