diff --git a/src/pnpm-lock.yaml b/src/pnpm-lock.yaml
index 0557a6a..aebce2d 100644
--- a/src/pnpm-lock.yaml
+++ b/src/pnpm-lock.yaml
@@ -225,7 +225,15 @@ importers:
         specifier: ^8.1.2
         version: 8.1.2(rollup@4.54.0)
 =======
+<<<<<<< HEAD
 >>>>>>> 4a4b418 (Adding blockage invitations to a Game)
+=======
+<<<<<<< HEAD
+>>>>>>> refs/remotes/origin/nigel/block_invitations
+=======
+>>>>>>> 4a4b418 (Adding blockage invitations to a Game)
+>>>>>>> ce3f8b6 (Adding blockage invitations to a Game)
+>>>>>>> ec79d26 (Adding blockage invitations to a Game)
       vite:
         specifier: ^7.3.0
         version: 7.3.0(@types/node@22.19.3)(yaml@2.8.2)