diff --git a/crates/lavina-core/src/repo/room.rs b/crates/lavina-core/src/repo/room.rs
index 506e170..a6b8522 100644
--- a/crates/lavina-core/src/repo/room.rs
+++ b/crates/lavina-core/src/repo/room.rs
@@ -15,7 +15,10 @@ impl Storage {
                     memberships
                 where
                     user_id = ? and room_id = ?;
+<<<<<<< HEAD
 
+=======
+>>>>>>> 775f43a (Fix query)
                 ",
         )
         .bind(player_id)