From 2654fe96964c4f5985ac0e611497192802703ab5 Mon Sep 17 00:00:00 2001
From: Jason Wen <haibin.wen3@gmail.com>
Date: Tue, 25 Apr 2023 01:45:01 -0400
Subject: [PATCH] fix merge conflicts

---
 selfdrive/car/toyota/values.py | 2 --
 1 file changed, 2 deletions(-)

diff --git a/selfdrive/car/toyota/values.py b/selfdrive/car/toyota/values.py
index ac19d51813..2fe60e8fb6 100644
--- a/selfdrive/car/toyota/values.py
+++ b/selfdrive/car/toyota/values.py
@@ -35,8 +35,6 @@ class ToyotaFlags(IntFlag):
   HYBRID = 1
   SMART_DSU = 2
 
-  SMART_DSU = 2
-
 
 class CAR:
   # Toyota