Fix build

Author: asdacap

src/Nethermind/Nethermind.Runner/packages.lock.json

@@ -1729,19 +1729,12 @@
       "nethermind.state": {
         "type": "Project",
         "dependencies": {
-<<<<<<< HEAD
           "Nethermind.Core": "[1.37.0-unstable, )",
           "Nethermind.Db": "[1.37.0-unstable, )",
           "Nethermind.Evm": "[1.37.0-unstable, )",
           "Nethermind.Serialization.Rlp": "[1.37.0-unstable, )",
           "Nethermind.Trie": "[1.37.0-unstable, )",
-=======
-          "Nethermind.Core": "[1.36.0-unstable, )",
-          "Nethermind.Db": "[1.36.0-unstable, )",
-          "Nethermind.Evm": "[1.36.0-unstable, )",
-          "Nethermind.Serialization.Rlp": "[1.36.0-unstable, )",
-          "Nethermind.Trie": "[1.36.0-unstable, )",
->>>>>>> c7899efd24 (Slight optimization)
+          "ZstdSharp.Port": "[0.8.6, )",
           "prometheus-net": "[8.2.1, )"
         }
       },
@@ -2273,15 +2266,11 @@
         "type": "CentralTransitive",
         "requested": "[8.2.1, )",
         "resolved": "8.2.1",
-<<<<<<< HEAD
         "contentHash": "3wVgdEPOCBF752s2xps5T+VH+c9mJK8S8GKEDg49084P6JZMumTZI5Te6aJ9MQpX0sx7om6JOnBpIi7ZBmmiDQ==",
         "dependencies": {
           "Microsoft.Extensions.Http": "3.1.0",
           "Microsoft.Extensions.ObjectPool": "7.0.0"
         }
-=======
-        "contentHash": "3wVgdEPOCBF752s2xps5T+VH+c9mJK8S8GKEDg49084P6JZMumTZI5Te6aJ9MQpX0sx7om6JOnBpIi7ZBmmiDQ=="
->>>>>>> c7899efd24 (Slight optimization)
       },
       "prometheus-net.AspNetCore": {
         "type": "CentralTransitive",

src/Nethermind/Nethermind.State.Test/Nethermind.State.Test.csproj

@@ -1,13 +1,12 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <Import Project="../tests.props" />
-  
+
   <PropertyGroup>
     <RootNamespace>Nethermind.Store.Test</RootNamespace>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" />
     <PackageReference Include="NSubstitute" />
   </ItemGroup>
   <ItemGroup>

src/Nethermind/Nethermind.State.Test/StorageProviderTests.cs

@@ -760,6 +760,11 @@ public void Commit(long blockNumber)
             {
                 baseScope.Commit(blockNumber);
             }
+
+            public void HintSet(Address address)
+            {
+
+            }
         }
 
         private class WriteBatchDecorator(