diff --git a/browser-domain/src/components/Home/Card/Card.tsx b/browser-domain/src/components/Home/Card/Card.tsx
index 6e91464..051ed9b 100644
--- a/browser-domain/src/components/Home/Card/Card.tsx
+++ b/browser-domain/src/components/Home/Card/Card.tsx
@@ -24,20 +24,13 @@ interface CardProps {
     subscribed: boolean;
     refresh: any;
     isAirline: boolean;
-<<<<<<< HEAD
     isAdmin: boolean;
-=======
->>>>>>> 8b9f006 (Add edit and delete flight in the frontend)
     refreshFlights: any;
 }
 
 const { Text } = Typography;
 
-<<<<<<< HEAD
 export const Card: React.FC<CardProps> = ({ flight, user, subscribed, refresh, refreshFlights, isAirline, isAdmin }) => {
-=======
-export const Card: React.FC<CardProps> = ({ flight, user, subscribed, refresh, refreshFlights, isAirline }) => {
->>>>>>> 8b9f006 (Add edit and delete flight in the frontend)
     const [modalVisible, setModalVisible] = useState<boolean>(false);
 
     const navigate = useNavigate(); 
@@ -165,11 +158,7 @@ export const Card: React.FC<CardProps> = ({ flight, user, subscribed, refresh, r
                     <Text>{flight.id}</Text>
                 </Space>
             </div>
-<<<<<<< HEAD
             {!isAirline && !isAdmin ?
-=======
-            {!isAirline ?
->>>>>>> 8b9f006 (Add edit and delete flight in the frontend)
             (
                 !(subscribed) ? 
                 <Button type="primary" onClick={handleSubscribe}>
@@ -182,11 +171,7 @@ export const Card: React.FC<CardProps> = ({ flight, user, subscribed, refresh, r
             )
              :
             (
-<<<<<<< HEAD
                 (user && flight.user_id == user.id) || isAdmin ? 
-=======
-                user && flight.user_id == user.id ? 
->>>>>>> 8b9f006 (Add edit and delete flight in the frontend)
                 <>
                 <Button type="primary" onClick={handleEdit}>
                     Edit