Resolve conflict

src/nix/hash.cc

@@ -184,14 +184,9 @@ struct CmdToBase : Command
 
     void run() override
     {
-<<<<<<< HEAD
-        warn("The old format conversion sub commands of `nix hash` were deprecated in favor of `nix hash convert`.");
-        for (auto s : args)
-=======
         if (!legacyCli)
             warn("The old format conversion subcommands of `nix hash` were deprecated in favor of `nix hash convert`.");
         for (const auto & s : args)
->>>>>>> 408c2faf9 (nix hash: Don't print 'nix hash' deprecation message)
             logger->cout(Hash::parseAny(s, hashAlgo).to_string(hashFormat, hashFormat == HashFormat::SRI));
     }
 };