diff --git a/devicehandlers/FixedSlotSequence.cpp b/devicehandlers/FixedSlotSequence.cpp
index 860a643b6..6db7ee435 100644
--- a/devicehandlers/FixedSlotSequence.cpp
+++ b/devicehandlers/FixedSlotSequence.cpp
@@ -89,11 +89,17 @@ uint32_t FixedSlotSequence::getLengthMs() const {
 
 ReturnValue_t FixedSlotSequence::checkSequence() const {
 	if(slotList.empty()) {
+<<<<<<< HEAD
 	    sif::error << "Fixed Slot Sequence: Slot list is empty!" << std::endl;
 	    return HasReturnvaluesIF::RETURN_FAILED;
 	}
     // Iterate through slotList and check successful creation.
 	// Checks if timing is ok (must be ascending) and if all handlers were found.
+=======
+		error << "Fixed Slot Sequence: Slot list is empty!" << std::endl;
+		return HasReturnvaluesIF::RETURN_FAILED;
+	}
+>>>>>>> master
 	auto slotIt = slotList.begin();
 	uint32_t count = 0;
 	uint32_t time = 0;
diff --git a/devicehandlers/FixedSlotSequence.h b/devicehandlers/FixedSlotSequence.h
index 1d872c84f..65ad34515 100644
--- a/devicehandlers/FixedSlotSequence.h
+++ b/devicehandlers/FixedSlotSequence.h
@@ -13,6 +13,7 @@ using SlotListIter = std::multiset<FixedSequenceSlot>::iterator;
 /**
  * @brief	This class is the representation of a Polling Sequence Table in software.
  *
+<<<<<<< HEAD
  * @details	The FixedSlotSequence object maintains the dynamic execution of device handler objects.
  * 			The main idea is to create a list of device handlers, to announce all handlers to the
  * 			polling sequence and to maintain a list of polling slot objects. This slot list represents the
@@ -20,6 +21,21 @@ using SlotListIter = std::multiset<FixedSequenceSlot>::iterator;
  * 			which device handler shall be executed within a given polling period.
  * 			The sequence is then executed by iterating through this slot list.
  * 			Handlers are invoking by calling a certain function stored in the handler list.
+=======
+ * @details
+ * The FixedSlotSequence object maintains the dynamic execution of
+ * device handler objects.
+ *
+ * The main idea is to create a list of device handlers, to announce all
+ * handlers to thepolling sequence and to maintain a list of
+ * polling slot objects. This slot list represents the Polling Sequence Table
+ * in software.
+ *
+ * Each polling slot contains information to indicate when and
+ * which device handler shall be executed within a given polling period.
+ * The sequence is then executed by iterating through this slot list.
+ * Handlers are invoking by calling a certain function stored in the handler list.
+>>>>>>> master
  */
 class FixedSlotSequence {
 public:
@@ -112,7 +128,16 @@ public:
 	 */
 	SlotListIter current;
 
+<<<<<<< HEAD
 	virtual ReturnValue_t checkSequence() const;
+=======
+	/**
+	 * Iterate through slotList and check successful creation.
+	 * Checks if timing is ok (must be ascending) and if all handlers were found.
+	 * @return
+	 */
+	ReturnValue_t checkSequence() const;
+>>>>>>> master
 protected:
 
 	/**
diff --git a/osal/FreeRTOS/FixedTimeslotTask.cpp b/osal/FreeRTOS/FixedTimeslotTask.cpp
index 3ec15a437..d1c3fe3a9 100644
--- a/osal/FreeRTOS/FixedTimeslotTask.cpp
+++ b/osal/FreeRTOS/FixedTimeslotTask.cpp
@@ -59,8 +59,8 @@ ReturnValue_t FixedTimeslotTask::addSlot(object_id_t componentId,
 		uint32_t slotTimeMs, int8_t executionStep) {
 	if (objectManager->get<ExecutableObjectIF>(componentId) != nullptr) {
 		if(slotTimeMs == 0) {
-			// TODO: FreeRTOS throws errors for zero values.
-			// maybe there is a better solution than this.
+			// FreeRTOS throws a sanity error for zero values, so we set
+			// the time to one millisecond.
 			slotTimeMs = 1;
 		}
 		pst.addSlot(componentId, slotTimeMs, executionStep, this);