diff --git a/booking-app/app/api/bookings/route.ts b/booking-app/app/api/bookings/route.ts
index 4bed92c6..e1e75be5 100644
--- a/booking-app/app/api/bookings/route.ts
+++ b/booking-app/app/api/bookings/route.ts
@@ -259,8 +259,6 @@ export async function PUT(request: NextRequest) {
     updatedData,
   );
 
-<<<<<<< HEAD
-=======
   await serverDeleteFieldsByCalendarEventId(
     TableNames.BOOKING,
     newCalendarEventId,
@@ -272,7 +270,6 @@ export async function PUT(request: NextRequest) {
     ],
   );
 
->>>>>>> staging
   // handle auto-approval + send emails
   await handleBookingApprovalEmails(
     isAutoApproval,