diff --git a/LoRaWAN/App/lora_app.c b/LoRaWAN/App/lora_app.c
index e30352a..2d04230 100644
--- a/LoRaWAN/App/lora_app.c
+++ b/LoRaWAN/App/lora_app.c
@@ -493,13 +493,8 @@ void LoRaWAN_Init(void)
 
   LmHandlerJoin(ActivationType, ForceRejoin);
 
-<<<<<<< HEAD
-  UTIL_TIMER_Create(&YunhornSTSHeartBeatTimer, 1000*STS_HeartBeatTimerPeriod_sec, UTIL_TIMER_ONESHOT, OnYunhornSTSHeartBeatTimerEvent, NULL);
-  UTIL_TIMER_Start(&YunhornSTSHeartBeatTimer);
-=======
     UTIL_TIMER_Create(&YunhornSTSHeartBeatTimer, 1000*STS_HeartBeatTimerPeriod_sec, UTIL_TIMER_PERIODIC, OnYunhornSTSHeartBeatTimerEvent, NULL);
     UTIL_TIMER_Start(&YunhornSTSHeartBeatTimer);
->>>>>>> f8f6e7269c1966577403a035f83fec62bab884d9
 
   if (EventType == TX_ON_TIMER)
   {