diff --git a/pre-commit b/pre-commit
index 6e68347..31948eb 100755
--- a/pre-commit
+++ b/pre-commit
@@ -159,11 +159,7 @@
             (gather-all-filenames) 
             (gather-staged-filenames against))]
          [results-of-scan
-<<<<<<< Updated upstream
           (lmap (fn [check] (check-files filenames-to-scan check)) *checks*)]
-=======
-          (lmap (fn [check] (scan-files filenames-to-scan check)) *checks*)]
->>>>>>> Stashed changes
          [exit-code (derive-max-code results-of-scan)]
          [messages (flatten (derive-message-bodies results-of-scan))]]
      (do