diff --git a/PMCProjekt/PMCProjekt/obj/project.nuget.cache b/PMCProjekt/PMCProjekt/obj/project.nuget.cache
index 0c57253..34d8a46 100644
--- a/PMCProjekt/PMCProjekt/obj/project.nuget.cache
+++ b/PMCProjekt/PMCProjekt/obj/project.nuget.cache
@@ -1,8 +1,14 @@
 {
   "version": 2,
+<<<<<<< HEAD
   "dgSpecHash": "ItlwKJfGBL8aX97fM99vrHqw0LVjEpg++g7r51coCyOakv6D0zaCHR9EMxFndLxrHUU41diVC5KD/hJnr3cXVA==",
   "success": true,
   "projectFilePath": "C:\\Users\\bib\\Documents\\PMCProjekt\\PMCProjekt\\PMCProjekt\\PMCProjekt.csproj",
+=======
+  "dgSpecHash": "GuZxYKqyxPKXrLIHTLiW4dbsfQtATzQU40yfFQuTfNrD+HunMVP/cZM5+daazdtJBtftPKPqAU5vRUnfnCNvqA==",
+  "success": true,
+  "projectFilePath": "C:\\Schule\\PMC\\PMCProjekt\\PMCProjekt\\PMCProjekt\\PMCProjekt.csproj",
+>>>>>>> f09fa2c5f5f194e2a4e52d7bff13d999efbc7f7b
   "expectedPackageFiles": [
     "C:\\Users\\bib\\.nuget\\packages\\bouncycastle.cryptography\\2.2.1\\bouncycastle.cryptography.2.2.1.nupkg.sha512",
     "C:\\Users\\bib\\.nuget\\packages\\google.protobuf\\3.25.1\\google.protobuf.3.25.1.nupkg.sha512",