diff --git a/bsp_q7s/core/ObjectFactory.cpp b/bsp_q7s/core/ObjectFactory.cpp
index 52e39cdd..85c0fd9f 100644
--- a/bsp_q7s/core/ObjectFactory.cpp
+++ b/bsp_q7s/core/ObjectFactory.cpp
@@ -572,7 +572,7 @@ void ObjectFactory::createSolarArrayDeploymentComponents(PowerSwitchIF& pwrSwitc
 }
 
 void ObjectFactory::createSyrlinksComponents(PowerSwitchIF* pwrSwitcher) {
-  SerialCookie* syrlinksUartCookie =
+  auto* syrlinksUartCookie =
       new SerialCookie(objects::SYRLINKS_HK_HANDLER, q7s::UART_SYRLINKS_DEV, uart::SYRLINKS_BAUD,
                      syrlinks::MAX_REPLY_SIZE, UartModes::NON_CANONICAL);
   syrlinksUartCookie->setParityEven();
@@ -905,7 +905,11 @@ void ObjectFactory::createTestComponents(LinuxLibgpioIF* gpioComIF) {
 }
 
 void ObjectFactory::createStrComponents(PowerSwitchIF* pwrSwitcher) {
+<<<<<<< HEAD
   SerialCookie* starTrackerCookie =
+=======
+  auto* starTrackerCookie =
+>>>>>>> origin/develop
       new SerialCookie(objects::STAR_TRACKER, q7s::UART_STAR_TRACKER_DEV, uart::STAR_TRACKER_BAUD,
                      startracker::MAX_FRAME_SIZE * 2 + 2, UartModes::NON_CANONICAL);
   starTrackerCookie->setNoFixedSizeReply();