fixed merge conflicts

bsp_q7s/core/ObjectFactory.cpp

@@ -1,3 +1,4 @@
+#include <bsp_q7s/boardtest/Q7STestTask.h>
 #include "ObjectFactory.h"
 #include "OBSWConfig.h"
 #include "tmtc/apid.h"
@@ -643,6 +644,11 @@ void ObjectFactory::produce(void* args){
     new UdpTmTcBridge(objects::UDP_BRIDGE, objects::CCSDS_PACKET_DISTRIBUTOR);
     new UdpTcPollingTask(objects::UDP_POLLING_TASK, objects::UDP_BRIDGE);
 
+    /* Test Task */
+#if OBSW_ADD_TEST_CODE == 1
+    new Q7STestTask(objects::TEST_TASK);
+#endif
+
 #if TE0720 == 1 && TEST_LIBGPIOD == 1
     /* Configure MIO0 as input */
     GpiodRegular gpioConfigMio0(std::string("gpiochip0"), 0,
@@ -728,4 +734,5 @@ void ObjectFactory::produce(void* args){
 #if Q7S_ADD_SPI_TEST == 1
     new SpiTestClass(objects::SPI_TEST, gpioComIF);
 #endif
+
 }