diff --git a/selfdrive/car/hyundai/carcontroller.py b/selfdrive/car/hyundai/carcontroller.py
index 2913413..6504cf6 100755
--- a/selfdrive/car/hyundai/carcontroller.py
+++ b/selfdrive/car/hyundai/carcontroller.py
@@ -133,23 +133,10 @@ class CarController(CarControllerBase):
         can_sends.extend(hyundaicanfd.create_spas_messages(self.packer, self.CAN, self.frame, CC.leftBlinker, CC.rightBlinker))
 
       # params_memory = Params("/dev/shm/params")
-<<<<<<< HEAD
       # if params_memory.get_bool("CPTLkasButtonAction"):
         # if self.frame % 10 == 0:
           #  for _ in range(20):
               # can_sends.append(hyundaicanfd.create_buttons_alt(self.packer, self.CP, self.CAN, CS.buttons_counter+1, Buttons.SET_DECEL))
-=======
-      params_memory = Params("/dev/shm/params")
-      if params_memory.get_bool("CPTLkasButtonAction"):
-        if self.frame % 2 == 0:
-          can_sends.append(hyundaicanfd.create_acc_control_alt(self.packer, self.CAN, CC.enabled, self.accel_last, accel, stopping, CC.cruiseControl.override,
-                                                           set_speed_in_units, hud_control))
-          self.accel_last = accel
-        # if self.frame % 10 == 0:
-          # for _ in range(20):
-            # can_sends.append(hyundaicanfd.create_buttons_alt(self.packer, self.CP, self.CAN, CS.buttons_counter+1, Buttons.SET_DECEL, CS.cruise_can_msg))
-        # print("Decel")
->>>>>>> 7f63e516586dc709ea1f6246e5a3c51dda5c7bab
         # can_sends.extend(hyundaicanfd.create_adrv_messages(self.packer, self.CAN, self.frame))
         # can_sends.append(hyundaicanfd.create_acc_set_speed(self.packer, self.CP, self.CAN, CS.cruise_info, 50))
         # can_sends.append(hyundaicanfd.create_acc_cancel(self.packer, self.CP, self.CAN, CS.cruise_info))
@@ -236,12 +223,9 @@ class CarController(CarControllerBase):
             # pass
             # can_sends.append(hyundaicanfd.create_acc_cancel(self.packer, self.CP, self.CAN, CS.cruise_info))
             # for _ in range(20):
-<<<<<<< HEAD
               # can_sends.append(hyundaicanfd.create_buttons_alt(self.packer, self.CP, self.CAN, CS.buttons_counter+1, Buttons.CANCEL))
-=======
               # if CS.cruise_can_msg:
                 # can_sends.append(hyundaicanfd.create_buttons_alt(self.packer, self.CP, self.CAN, CS.buttons_counter+1, Buttons.CANCEL, CS.cruise_can_msg))
->>>>>>> 7f63e516586dc709ea1f6246e5a3c51dda5c7bab
             # print("Try Cancel Button Alt")
             self.last_button_frame = self.frame
             CS.lkas_trigger_result = 1