diff --git a/src/pnpm-lock.yaml b/src/pnpm-lock.yaml
index d13511c..0557a6a 100644
--- a/src/pnpm-lock.yaml
+++ b/src/pnpm-lock.yaml
@@ -177,6 +177,7 @@ importers:
       rollup-plugin-node-externals:
         specifier: ^8.1.2
         version: 8.1.2(rollup@4.54.0)
+<<<<<<< HEAD
       vite:
         specifier: ^7.3.0
         version: 7.3.0(@types/node@22.19.3)(yaml@2.8.2)
@@ -223,6 +224,8 @@ importers:
       rollup-plugin-node-externals:
         specifier: ^8.1.2
         version: 8.1.2(rollup@4.54.0)
+=======
+>>>>>>> 4a4b418 (Adding blockage invitations to a Game)
       vite:
         specifier: ^7.3.0
         version: 7.3.0(@types/node@22.19.3)(yaml@2.8.2)