diff --git a/src/app/components/BiddingTable.tsx b/src/app/components/BiddingTable.tsx
index 4ba6fca..8a08968 100644
--- a/src/app/components/BiddingTable.tsx
+++ b/src/app/components/BiddingTable.tsx
@@ -299,7 +299,7 @@ const BiddingTable: React.FC<BiddingList> = ({user, userBids, refetchUserBids, b
             <DialogTitle>Biddings for Number {selectedNumber}</DialogTitle>
           </DialogHeader>
           <h1> Your Points : {userBids.info.points}</h1>
-          {selectedNumber && biddings && biddings[selectedNumber] && (
+          { biddings && biddings[selectedNumber] && (
             <div className="flex flex-row justify-between">
               <div>Quota M: {biddings[selectedNumber].quota.male}</div>
               <div>Quota F: {biddings[selectedNumber].quota.female}</div>
@@ -314,7 +314,7 @@ const BiddingTable: React.FC<BiddingList> = ({user, userBids, refetchUserBids, b
                 </TableRow>
               </TableHeader>
               <TableBody>
-                {selectedNumber &&
+                {
                   biddings[selectedNumber] &&
                   biddings[selectedNumber].male.map((bid, index) => (
                     <TableRow key={index}>
@@ -322,7 +322,7 @@ const BiddingTable: React.FC<BiddingList> = ({user, userBids, refetchUserBids, b
                       <TableCell>${bid.amount.toFixed(2)}</TableCell>
                     </TableRow>
                   ))}
-                {selectedNumber &&
+                {
                   biddings[selectedNumber] &&
                   biddings[selectedNumber].female.map((bid, index) => {
                     return (
diff --git a/src/app/dashboard/jersey/types.ts b/src/app/dashboard/jersey/types.ts
index 21a69f1..7009bcb 100644
--- a/src/app/dashboard/jersey/types.ts
+++ b/src/app/dashboard/jersey/types.ts
@@ -3,11 +3,7 @@ export interface UserInfo {
   points: number;
   isAllocated: boolean;
   jersey?: JerseyType; // Only present if isAllocated is true
-<<<<<<< HEAD
-  teams: Team[];
-=======
   teams: TeamContainer[];
->>>>>>> 81df05bbaae3cbaa3ef923043f4dd1a0af505bbf
 }
 
 export interface JerseyType {
@@ -15,13 +11,10 @@ export interface JerseyType {
   quota: Quota;
 }
 
-<<<<<<< HEAD
-=======
 export interface EligibleBids {
   jerseys: number[];
 }
 
->>>>>>> 81df05bbaae3cbaa3ef923043f4dd1a0af505bbf
 export interface Quota {
   male: number;
   female: number;
@@ -29,14 +22,11 @@ export interface Quota {
 
 interface Team {
   name: string;
-<<<<<<< HEAD
-=======
   shareable: boolean;
 }
 
 interface TeamContainer {
   team: Team;
->>>>>>> 81df05bbaae3cbaa3ef923043f4dd1a0af505bbf
 }
 
 interface Bid {