diff --git a/src/app/orderConfirmationPickUp/page.tsx b/src/app/orderConfirmationPickUp/page.tsx
index 090e4bc..fd2d7c1 100644
--- a/src/app/orderConfirmationPickUp/page.tsx
+++ b/src/app/orderConfirmationPickUp/page.tsx
@@ -19,7 +19,6 @@ import {
   Body2Light,
 } from '@/styles/fonts';
 import { useSearchParams } from 'next/navigation';
-import { fetchCartItemsWithQuantity,fetchCartItemsWithQuantityByID } from '../../api/supabase/queries/cart_queries';
 
 import BackButton from '../../components/BackButton/BackButton';
 
@@ -47,7 +46,8 @@ import {
 } from './styles';
 
 import { Product, User, Pickup } from '../../schema/schema';
- 
+import { fetchCartItemsWithQuantityByID } from '../../api/supabase/queries/cart_queries';
+
 export default function OrderConfirmationPickUp() {
   const [Cart, setCart] = useState<Product[]>([]);
   const [user, setUser] = useState<User>();
diff --git a/src/app/orderConfirmationPickUp/styles.ts b/src/app/orderConfirmationPickUp/styles.ts
index 60860ab..5e99315 100644
--- a/src/app/orderConfirmationPickUp/styles.ts
+++ b/src/app/orderConfirmationPickUp/styles.ts
@@ -23,6 +23,10 @@ export const OutterFavoriteDiv = styled.div`
   border-radius: 10px;
   background: var(--White, #fff);
   box-shadow: 0px 1px 4px 1px rgba(0, 0, 0, 0.2);
+<<<<<<< HEAD
+=======
+  width: 700px;
+>>>>>>> b287da70273f0befb5c5c6b437883b203f43b605
   max-height: 100%;
   max-width: 750px;
   margin-top: 20px;
@@ -39,23 +43,6 @@ export const ScrollDiv = styled.div`
   max-width: 100%;
 `;
 
-export const ImageDiv = styled.div`
-  box-shadow: 1px 1px 4px 1px rgba(0, 0, 0, 0.08);
-  width: 150px;
-  height: 150px;
-  margin-left: 30px;
-  display: flex;
-  justify-content: center;
-  align-items: center;
-`;
-
-export const Wrapper = styled.div`
-  padding: 15px;
-  display: flex;
-  justify-content: center;
-  align-items: center;
-`;
-
 export const BackDiv = styled.button`
   display: flex;
   flex-direction: row;
@@ -112,18 +99,19 @@ export const Label = styled.p`
   margin-top: 20px;
 `;
 
-export const LabelBox1 = styled.div`
-  width: 250px;
-  height: 100%;
-  padding: 20px;
+
+export const ImageDiv = styled.p`
+  width: 150px;
+  height: 150px;
+  align-items: center;
+  justify-content: center;
+  display: flex;
+
 `;
 
 export const LabelBox = styled.div`
   width: 150px;
   height: 100%;
-  padding: 20px;
-  gap: 50px;
-  margin-right: 30px;
 `;
 
 export const HeaderText = styled.h3`
@@ -270,8 +258,12 @@ export const BottomColumnDiv = styled.div`
   align-items: space-evenly;
   justify-content: space-around;
   width: 100%;
+<<<<<<< HEAD
   margin-left: 20px;
   margin-right: 20px;
+=======
+  margin-left: 10px;
+>>>>>>> b287da70273f0befb5c5c6b437883b203f43b605
   margin-bottom: 30px;
   gap: 10px;
 `;
@@ -314,7 +306,11 @@ export const ShippingDetailsDiv = styled.div`
   padding: 36px 34px;
   gap: 33px;
   max-height: 100%;
+<<<<<<< HEAD
   margin-top: 75px;
+=======
+  margin-top: 93px;
+>>>>>>> b287da70273f0befb5c5c6b437883b203f43b605
   margin-bottom: 30px;
   margin-right: 40px;
 `;
diff --git a/src/app/orderHistory/page.tsx b/src/app/orderHistory/page.tsx
index 576acc9..6c57ea2 100644
--- a/src/app/orderHistory/page.tsx
+++ b/src/app/orderHistory/page.tsx
@@ -32,6 +32,7 @@ function OrderHistory() {
       <OutterBox>
         <BackButtonDiv>
         <BackButton destination="./profileScreen" />
+<<<<<<< HEAD
 <<<<<<< HEAD
         <div style={{ marginTop: '40px', marginBottom: '20px' }}>
           <Heading1>Order History</Heading1>
@@ -40,6 +41,10 @@ function OrderHistory() {
         </BackButtonDiv>
         <Heading2>Order History</Heading2>
 >>>>>>> b287da7 (temp)
+=======
+        </BackButtonDiv>
+        <Heading2>Order History</Heading2>
+>>>>>>> b287da70273f0befb5c5c6b437883b203f43b605
         <OrderHistoryContainer>
           {orderIds.length > 0 ? (
             orderIds.map((orderId: number) => (
diff --git a/src/app/profileScreen/styles.ts b/src/app/profileScreen/styles.ts
index c5e3934..016c144 100644
--- a/src/app/profileScreen/styles.ts
+++ b/src/app/profileScreen/styles.ts
@@ -92,16 +92,22 @@ export const LogOutButton = styled.button`
   font-weight: 600;
   line-height: normal;
   border: transparent;
+<<<<<<< HEAD
 <<<<<<< HEAD
   border-radius: 5px;
   width: 405px;
   height: 50px;
 =======
+=======
+>>>>>>> b287da70273f0befb5c5c6b437883b203f43b605
   border-radius: 10px;
   width: 500px;
   height: 55px;
   margin-top: 40px;
+<<<<<<< HEAD
 >>>>>>> b287da7 (temp)
+=======
+>>>>>>> b287da70273f0befb5c5c6b437883b203f43b605
 `;
 /* transform: translateY(200px); */
 
@@ -136,10 +142,13 @@ export const HeartIcon = styled(Heart)`
 `;
 
 export const BackButtonDiv = styled.div`
+<<<<<<< HEAD
 <<<<<<< HEAD
   margin-bottom: 30px;
   margin-top: 50px;
 =======
+=======
+>>>>>>> b287da70273f0befb5c5c6b437883b203f43b605
   margin-top: 50px;  
   margin-bottom: 40px;
 >>>>>>> b287da7 (temp)
diff --git a/src/components/BackButton/BackButton.tsx b/src/components/BackButton/BackButton.tsx
index 1ec0235..d10762d 100644
--- a/src/components/BackButton/BackButton.tsx
+++ b/src/components/BackButton/BackButton.tsx
@@ -1,8 +1,12 @@
 <<<<<<< HEAD
+<<<<<<< HEAD
 import { Body1Bold } from '@/styles/fonts';
 =======
 import { Body1, Body2Bold } from '@/styles/fonts';
 >>>>>>> b287da7 (temp)
+=======
+import { Body1, Body2Bold } from '@/styles/fonts';
+>>>>>>> b287da70273f0befb5c5c6b437883b203f43b605
 import { BackLink, ArrowLeftIcon } from './styles';
 
 export default function BackButton(props: { destination: string }) {
@@ -10,11 +14,15 @@ export default function BackButton(props: { destination: string }) {
   return (
     <BackLink href={destination}>
       <ArrowLeftIcon />
+<<<<<<< HEAD
 <<<<<<< HEAD
       <Body1Bold>Back</Body1Bold>
 =======
       <Body2Bold>Back</Body2Bold>
 >>>>>>> b287da7 (temp)
+=======
+      <Body2Bold>Back</Body2Bold>
+>>>>>>> b287da70273f0befb5c5c6b437883b203f43b605
     </BackLink>
   );
 }
diff --git a/src/components/BackButton/styles.ts b/src/components/BackButton/styles.ts
index f8bfe12..d20ac5b 100644
--- a/src/components/BackButton/styles.ts
+++ b/src/components/BackButton/styles.ts
@@ -9,18 +9,23 @@ export const BackLink = styled(Link)`
   align-items: center;
   justify-content: space-between;
   color: ${COLORS.black};
+<<<<<<< HEAD
 <<<<<<< HEAD
   width: 75px;
 
 =======
   width: 60px;
 >>>>>>> b287da7 (temp)
+=======
+  width: 60px;
+>>>>>>> b287da70273f0befb5c5c6b437883b203f43b605
   &:hover {
     text-decoration: underline;
   }
 `;
 
 export const ArrowLeftIcon = styled(ArrowLeft)`
+<<<<<<< HEAD
 <<<<<<< HEAD
   width: 20px;
   height: 20px;
@@ -28,4 +33,8 @@ export const ArrowLeftIcon = styled(ArrowLeft)`
   width: 18px;
   height: 18px;
 >>>>>>> b287da7 (temp)
+=======
+  width: 18px;
+  height: 18px;
+>>>>>>> b287da70273f0befb5c5c6b437883b203f43b605
 `;
diff --git a/src/components/OrderHistory/styles.ts b/src/components/OrderHistory/styles.ts
index 546d6c2..b82b034 100644
--- a/src/components/OrderHistory/styles.ts
+++ b/src/components/OrderHistory/styles.ts
@@ -172,7 +172,10 @@ export const RowDiv = styled.div`
   height: 400px;
   margin-bottom: 20px;
   margin-top: 20px;
+<<<<<<< HEAD
 >>>>>>> b287da7 (temp)
+=======
+>>>>>>> b287da70273f0befb5c5c6b437883b203f43b605
 `;
 
 export const OrderStatusDiv = styled.div`