Fix merge issues

app/[lang]/(live)/@bookingwidget/hotelreservation/[...path]/page.tsx

@@ -0,0 +1,21 @@
+import { env } from "@/env/server"
+
+import BookingWidget, { preload } from "@/components/BookingWidget"
+
+import { PageArgs } from "@/types/params"
+
+export default async function BookingWidgetHotelReservationPage({
+  searchParams,
+}: PageArgs<{}, URLSearchParams>) {
+  if (env.HIDE_BOOKINGWIDGET_HOTELRESERVATION_PATH) {
+    return null
+  }
+
+  preload()
+
+  return <BookingWidget searchParams={searchParams} />
+}
+
+// TODO: This should just:
+// export { default } from "../page"
+// when current web is no more

app/[lang]/(live)/@footer/[...path]/page.tsx

@@ -1,21 +1 @@
-import { env } from "@/env/server"
-
-import BookingWidget, { preload } from "@/components/BookingWidget"
-
-import { PageArgs } from "@/types/params"
-
-export default async function BookingWidgetHotelReservationPage({
-  searchParams,
-}: PageArgs<{}, URLSearchParams>) {
-  if (env.HIDE_BOOKINGWIDGET_HOTELRESERVATION_PATH) {
-    return null
-  }
-
-  preload()
-
-  return <BookingWidget searchParams={searchParams} />
-}
-
-// TODO: This should just:
-// export { default } from "../page"
-// when current web is no more
+export { default } from "../page"