Resolve merge conflicts in departmentLanesRoute.php

services/nginx/app/routes/departmentLanesRoute.php

@@ -266,7 +266,6 @@ class departmentLanesRoute
             // Cache check
             $cacheKey = null;
             if (defined('redis')) {
-<<<<<<< HEAD
                 // Cache only the default image variant to avoid unbounded cache key growth
                 // from request-controlled parameters (buttons/current_step/etc.).
                 $isDefaultVariant = $buttons === null
@@ -288,23 +287,6 @@ class departmentLanesRoute
                         echo $cachedImage;
                         exit;
                     }
-=======
-                $cacheParams = [
-                    'dynamic_image_id' => $dynamic_image_id,
-                    'buttons' => $buttons,
-                    'current_step' => $current_step,
-                    'only_current_step' => (bool)$only_current_step,
-                    'vehicle_type' => $vehicle_type,
-                    'thumb_position' => $thumb_position,
-                ];
-                $cacheKey = 'dynamic_image_v2:' . md5(json_encode($cacheParams));
-                $cachedImage = redis->get($cacheKey);
-                if ($cachedImage) {
-                    header('Content-Type: image/png');
-                    header('Content-Length: ' . strlen($cachedImage));
-                    echo $cachedImage;
-                    exit;
->>>>>>> remotes/origin/master
                 }
             }
 
@@ -524,8 +506,6 @@ class departmentLanesRoute
             ]
         );
     }
-<<<<<<< HEAD
-=======
 
     private static function normalizeRelayRequestParameter(mixed $value): ?string
     {
@@ -547,5 +527,4 @@ class departmentLanesRoute
 
         $field->set($normalized);
     }
->>>>>>> remotes/origin/master
 }