feat(SW-914): merge changes

components/ContentType/HotelPage/SidePeeks/index.ts

@@ -1,7 +1,10 @@
 export { default as AboutTheHotelSidePeek } from "./AboutTheHotel"
 <<<<<<< HEAD
+<<<<<<< HEAD
 export { default as RoomSidePeek } from "./Room"
 =======
 export { default as AmenitiesSidePeek } from "./Amenities"
 >>>>>>> de3b70ce (feat(SW-914): add correct import)
+=======
+>>>>>>> d2b749c0 (feat(SW-914): merge changes)
 export { default as WellnessAndExerciseSidePeek } from "./WellnessAndExercise"

components/ContentType/HotelPage/index.tsx

@@ -28,6 +28,7 @@ import Facilities from "./Facilities"
 import IntroSection from "./IntroSection"
 import PreviewImages from "./PreviewImages"
 import { Rooms } from "./Rooms"
+<<<<<<< HEAD
 import {
   AboutTheHotelSidePeek,
 <<<<<<< HEAD
@@ -37,6 +38,9 @@ import {
 >>>>>>> de3b70ce (feat(SW-914): add correct import)
   WellnessAndExerciseSidePeek,
 } from "./SidePeeks"
+=======
+import { AboutTheHotelSidePeek, WellnessAndExerciseSidePeek } from "./SidePeeks"
+>>>>>>> d2b749c0 (feat(SW-914): merge changes)
 import TabNavigation from "./TabNavigation"
 
 import styles from "./hotelPage.module.css"
@@ -79,7 +83,6 @@ export default async function HotelPage({ hotelId }: HotelPageProps) {
     hotelFacts,
     location,
     ratings,
-    parking,
   } = hotelData.data.attributes
   const roomCategories =
     hotelData.included?.filter((item) => item.type === "roomcategories") || []
@@ -192,8 +195,11 @@ export default async function HotelPage({ hotelId }: HotelPageProps) {
         </SidePeek>
 =======
         {/* eslint-disable import/no-named-as-default-member */}
+<<<<<<< HEAD
         <AmenitiesSidePeek amenitiesList={hotelDetailedFacilities} />
 >>>>>>> de3b70ce (feat(SW-914): add correct import)
+=======
+>>>>>>> d2b749c0 (feat(SW-914): merge changes)
         <AboutTheHotelSidePeek
           hotelAddress={address}
           coordinates={location}