merge: Resolved merge conflicts

Co-Authored-By: Tadios Temesgen <tt2022@ic.ac.uk>

src/routes/space/[id]/+page.server.ts

@@ -5,7 +5,7 @@ export const load: PageServerLoad = async ({ depends, params, locals: { supabase
     depends("db:study_spaces");
     const { data: space, error: err } = await supabase
         .from("study_spaces")
-        .select("*, study_space_images(*)")
+        .select("*, study_space_images(*), study_space_hours(*)")
         .eq("id", params.id)
         .single();
     if (err) error(500, "Failed to load study space");