chore: fix wrongfully pushed merge conflict

Author: jakubkalinski0

src/pages/iou/request/step/IOURequestStepDistanceOdometer.tsx

@@ -158,17 +158,10 @@ function IOURequestStepDistanceOdometer({
 
     const confirmationRoute = ROUTES.MONEY_REQUEST_STEP_CONFIRMATION.getRoute(action, iouType, transactionID, reportID, backToReport);
 
-<<<<<<< HEAD
-    useEffect(() => {
-        setShouldEnableDiscardConfirmation(!isEditingConfirmation && !isEditing);
-    }, [isEditing, isEditingConfirmation]);
-
     useRestartOnOdometerImagesFailure(transaction, reportID, iouType, backToReport, () => {
         backupHandledManually.current = true;
     });
 
-=======
->>>>>>> main
     // Get odometer images from transaction (only for display, not for initialization)
     const odometerStartImage = transaction?.comment?.odometerStartImage;
     const odometerEndImage = transaction?.comment?.odometerEndImage;