diff --git a/src/libfetchers/path.cc b/src/libfetchers/path.cc
index 340e7f4fa..5063cf62a 100644
--- a/src/libfetchers/path.cc
+++ b/src/libfetchers/path.cc
@@ -128,6 +128,7 @@ struct PathInputScheme : InputScheme
             if (!input.parent)
                 throw Error("cannot fetch input '%s' because it uses a relative path", input.to_string());
 
+<<<<<<< HEAD
             auto parent = canonPath(*input.parent);
 
             // the path isn't relative, prefix it
@@ -143,6 +144,9 @@ struct PathInputScheme : InputScheme
             absPath = path;
 
         Activity act(*logger, lvlTalkative, actUnknown, fmt("copying '%s'", absPath));
+=======
+        Activity act(*logger, lvlTalkative, actUnknown, fmt("copying %s to the store", absPath));
+>>>>>>> 314e9fbed (libfetchers: fix double quote in path printed in logger)
 
         // FIXME: check whether access to 'path' is allowed.
         auto storePath = store->maybeParseStorePath(absPath);