diff --git a/lib/views/home/Captin/mapDriverWidgets/driver_end_ride_bar.dart b/lib/views/home/Captin/mapDriverWidgets/driver_end_ride_bar.dart
index e10b1ad..b4da247 100644
--- a/lib/views/home/Captin/mapDriverWidgets/driver_end_ride_bar.dart
+++ b/lib/views/home/Captin/mapDriverWidgets/driver_end_ride_bar.dart
@@ -15,9 +15,13 @@ GetBuilder<MapDriverController> driverEndRideBar() {
               right: 5,
               child: Container(
                 decoration: AppStyle.boxDecoration,
+<<<<<<< HEAD
                 height: mapDriverController.remainingTimeTimerRideBegin < 60
                     ? mapDriverController.driverEndPage = 160
                     : 100,
+=======
+                height: mapDriverController.remainingTimeTimerRideBegin >60?100:160,,
+>>>>>>> d948723751895f2cb5ff51597ece9bc2fe6c456f
                 width: 200,
                 child: Column(
                   children: [