From 6452242f2f25485c240f344c37d908986fde8671 Mon Sep 17 00:00:00 2001
From: Robin Mueller <muellerr@irs.uni-stuttgart.de>
Date: Fri, 10 Mar 2023 15:06:05 +0100
Subject: [PATCH] fix merge conflict properly

---
 mission/system/objects/EiveSystem.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mission/system/objects/EiveSystem.cpp b/mission/system/objects/EiveSystem.cpp
index 17cd85d0..ee1db4c2 100644
--- a/mission/system/objects/EiveSystem.cpp
+++ b/mission/system/objects/EiveSystem.cpp
@@ -89,7 +89,7 @@ void EiveSystem::handleEventMessages() {
       case EventMessage::EVENT_MESSAGE:
         if (event.getEvent() == acs::SAFE_RATE_VIOLATION) {
           CommandMessage msg;
-          ModeMessage::setCmdModeMessage(msg, acs::AcsMode::DETUMBLE, 0);
+          ModeMessage::setCmdModeMessage(msg, acs::AcsMode::SAFE, acs::SafeSubmode::DETUMBLE);
           status = commandQueue->sendMessage(commandQueue->getId(), &msg);
           if (result != returnvalue::OK) {
             sif::error << "AcsSubsystem: sending DETUMBLE mode cmd to self has failed" << std::endl;
@@ -97,7 +97,7 @@ void EiveSystem::handleEventMessages() {
         }
         if (event.getEvent() == acs::SAFE_RATE_RECOVERY) {
           CommandMessage msg;
-          ModeMessage::setCmdModeMessage(msg, acs::AcsMode::SAFE, 0);
+          ModeMessage::setCmdModeMessage(msg, acs::AcsMode::SAFE, acs::SafeSubmode::DEFAULT);
           status = commandQueue->sendMessage(commandQueue->getId(), &msg);
           if (status != returnvalue::OK) {
             sif::error << "AcsSubsystem: sending SAFE mode cmd to self has failed" << std::endl;