resolve conflict and fix

handlers/bookings.go

@@ -1,8 +1,6 @@
 package handlers
 
 import (
-	"errors"
-
 	"git.coopgo.io/coopgo-platform/fleets/storage"
 	"github.com/google/uuid"
 )
@@ -26,9 +24,9 @@ func (h FleetsHandler) GetBooking(id string) (booking *storage.Booking, err erro
 		return nil, err
 	}
 
-	if booking.Deleted {
-		return nil, errors.New("booking was deleted")
-	}
+	// if booking.Deleted {
+	// 	return nil, errors.New("booking was deleted")
+	// }
 
 	vehicle, err := h.storage.GetVehicle(booking.Vehicleid)
 	if err != nil {