diff --git a/Directory.Packages.props b/Directory.Packages.props
index f046dd6..2828a20 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -15,7 +15,12 @@
     <PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="10.0.5" />
     <PackageVersion Include="Moq" Version="4.20.72" />
     <PackageVersion Include="TUnit" Version="1.19.57" />
+<<<<<<< dependabot/nuget/TUnit.Assertions-1.21.6
+    <PackageVersion Include="TUnit.Assertions" Version="1.21.6" />
+    <PackageVersion Include="TUnit.Core" Version="1.19.16" />
+=======
     <PackageVersion Include="TUnit.Assertions" Version="1.19.16" />
     <PackageVersion Include="TUnit.Core" Version="1.21.6" />
+>>>>>>> core
   </ItemGroup>
 </Project>