diff --git a/src/fsfw/action/ActionHelper.cpp b/src/fsfw/action/ActionHelper.cpp
index 4f5c7d1b..2d1bd817 100644
--- a/src/fsfw/action/ActionHelper.cpp
+++ b/src/fsfw/action/ActionHelper.cpp
@@ -83,7 +83,7 @@ void ActionHelper::prepareExecution(MessageQueueId_t commandedBy, ActionId_t act
   }
   Action* action = actionIter->second;
   result = action->deSerialize(&dataPtr, &size, SerializeIF::Endianness::NETWORK);
-  if ((result != HasReturnvaluesIF::RETURN_OK) || (size != 0)){ //TODO write unittest for second condition
+  if ((result != HasReturnvaluesIF::RETURN_OK)){
     CommandMessage reply;
     ActionMessage::setStepReply(&reply, actionId, 0, HasActionsIF::INVALID_PARAMETERS);
     queueToUse->sendMessage(commandedBy, &reply);
diff --git a/src/fsfw/controller/ControllerBase.cpp b/src/fsfw/controller/ControllerBase.cpp
index 18f35fb2..b46e5a8f 100644
--- a/src/fsfw/controller/ControllerBase.cpp
+++ b/src/fsfw/controller/ControllerBase.cpp
@@ -107,8 +107,6 @@ const ModeHelper * ControllerBase::getModeHelper() const {
   return &modeHelper;
 }
 
-void ControllerBase::modeChanged(Mode_t mode, Submode_t submode) { return; }
-
 ReturnValue_t ControllerBase::setHealth(HealthState health) {
   switch (health) {
     case HEALTHY:
diff --git a/src/fsfw/introspection/Types.h b/src/fsfw/introspection/Types.h
index 0fa9640d..165e2092 100644
--- a/src/fsfw/introspection/Types.h
+++ b/src/fsfw/introspection/Types.h
@@ -4,5 +4,5 @@
 // Note: some DBs (Postgress, Mongo) only support signed 64bit integers. To have a common denominator, all integers are int64_t.
 // As such, ther is no unsigned Type, as there can not be a uint64_t and uint32_t completely fits into int64_t
 namespace Types {
-enum ParameterType { SIGNED, FLOATING, ENUM, UNSUPPORTED };
+enum ParameterType { SIGNED, FLOATING, ENUM, STRING, BYTEARRAY, UNSUPPORTED };
 }  // namespace Types
\ No newline at end of file
diff --git a/src/fsfw/modes/HasModesIF.h b/src/fsfw/modes/HasModesIF.h
index 79ee3c12..47beb408 100644
--- a/src/fsfw/modes/HasModesIF.h
+++ b/src/fsfw/modes/HasModesIF.h
@@ -36,7 +36,6 @@ class HasModesIF {
   //! A mode command was rejected by the called object. Par1: called object id, Par2: return code.
   static const Event MODE_CMD_REJECTED = MAKE_EVENT(7, severity::LOW);
 
-<<<<<<< HEAD
   //! The device is powered and ready to perform operations. In this mode, no commands are
   //! sent by the device handler itself, but direct commands can be commanded and will be
   //! interpreted