diff --git a/Modules/CommandPad/commandpad.cpp b/Modules/CommandPad/commandpad.cpp
index d9aba60aed9403da4169fbb92783264b9d26d73a..5b7fadd13b64522528524928f4f2ed3cce17567b 100644
--- a/Modules/CommandPad/commandpad.cpp
+++ b/Modules/CommandPad/commandpad.cpp
@@ -9,10 +9,7 @@ const QMap<QString, uint8_t> CommandPad::systemTMList {
     { "MAV_LOGGER_ID", 4 },
     { "MAV_MAVLINK_STATS", 5 },
     { "MAV_TASK_STATS_ID", 6 },
-    <<< <<< < HEAD
-    == == == =
     // { "MAV_DPL_ID", 7 },
-    >>>>>>> master
     { "MAV_ADA_ID", 8 },
     { "MAV_NAS_ID", 9 },
     { "MAV_CAN_ID", 10 },