fix conflitcs

src/common/3gpp_29.508.h

@@ -31,11 +31,8 @@ typedef enum smf_event_e {
   SMF_EVENT_PLMN_CH     = 4,
   SMF_EVENT_UE_IP_CH    = 5,
   SMF_EVENT_DDDS        = 6,
-<<<<<<< HEAD
   SMF_EVENT_PDUSESEST   = 7,
-=======
-  SMF_EVENT_QOS_MON     = 7,
->>>>>>> origin/qos_monitoring_event
+  SMF_EVENT_QOS_MON     = 8,
   SMF_EVENT_FLEXCN      = 99
 } smf_event_t;
 
@@ -60,11 +57,8 @@ static const std::vector<std::string> smf_event_e2str = {
     "PLMN Change",
     "UE IP address change",
     "Downlink data delivery status",
-<<<<<<< HEAD
     "PDU Session Establishment",
-=======
     "QoS Monitoring",
->>>>>>> origin/qos_monitoring_event
     "FlexCN"};
 
 enum class notification_method_e {

src/common/utils/3gpp_conversions.cpp

@@ -538,13 +538,10 @@ void xgpp_conv::smf_event_exposure_notification_from_openapi(
       event_subscription.smf_event = smf_event_e::SMF_EVENT_UE_IP_CH;
     } else if (event_id.compare("DDDS") == 0) {
       event_subscription.smf_event = smf_event_e::SMF_EVENT_DDDS;
-<<<<<<< HEAD
     } else if (event_id.compare("PDU_SES_EST") == 0) {
       event_subscription.smf_event = smf_event_e::SMF_EVENT_PDUSESEST;
-=======
     } else if (event_id.compare("QOS_MON") == 0) {
       event_subscription.smf_event = smf_event_e::SMF_EVENT_QOS_MON;
->>>>>>> origin/qos_monitoring_event
     } else if (event_id.compare("FLEXCN") == 0) {
       event_subscription.smf_event = smf_event_e::SMF_EVENT_FLEXCN;
     } else {

src/smf_app/smf_context.hpp

@@ -1263,13 +1263,11 @@ class smf_context : public std::enable_shared_from_this<smf_context> {
   void trigger_ddds(scid_t scid, uint8_t http_version);
   void handle_ddds(scid_t scid, uint8_t http_version);
 
-<<<<<<< HEAD
   void trigger_pdusesest(scid_t scid, uint8_t http_version);
   void handle_pdusesest(scid_t scid, uint8_t http_version);
-=======
+
   void trigger_qos_monitoring(seid_t seid, oai::smf_server::model::EventNotification ev_notif_model, uint8_t http_version);
   void handle_qos_monitoring(seid_t seid, oai::smf_server::model::EventNotification ev_notif_model, uint8_t http_version);
->>>>>>> origin/qos_monitoring_event
 
   void trigger_flexcn_event(scid_t scid, uint8_t http_version);
   void handle_flexcn_event(scid_t scid, uint8_t http_version);
@@ -1403,11 +1401,8 @@ class smf_context : public std::enable_shared_from_this<smf_context> {
   bs2::connection ee_ue_ip_change_connection;
   bs2::connection ee_plmn_change_connection;
   bs2::connection ee_ddds_connection;
-<<<<<<< HEAD
   bs2::connection ee_pdusesest;
-=======
   bs2::connection ee_qos_monitoring_connection;
->>>>>>> origin/qos_monitoring_event
   bs2::connection ee_flexcn;
 };
 }  // namespace smf

src/smf_app/smf_event.hpp

@@ -82,13 +82,10 @@ class smf_event {
   // download link data status
   bs2::connection subscribe_ee_ddds(const ee_ddds_sig_t::slot_type& sig);
 
-<<<<<<< HEAD
 bs2::connection subscribe_ee_pdusesest(
       const ee_pdusesest_sig_t::slot_type& sig);
-=======
   bs2::connection subscribe_ee_qos_monitoring(
       const ee_qos_monitoring_sig_t::slot_type& sig);
->>>>>>> origin/qos_monitoring_event
 
   bs2::connection subscribe_ee_flexcn_event(
       const ee_flexcn_sig_t::slot_type& sig);
@@ -101,11 +98,8 @@ bs2::connection subscribe_ee_pdusesest(
   ee_ue_ip_change_sig_t ee_ue_ip_change;  // Signal for UE IP Addr change
   ee_plmn_change_sig_t ee_plmn_change;    // Signal for UE IP Addr change
   ee_ddds_sig_t ee_ddds;
-<<<<<<< HEAD
   ee_pdusesest_sig_t ee_pdusesest;  // Signal for  pdu session establishment
-=======
   ee_qos_monitoring_sig_t ee_qos_monitoring;  // Signal for QoS Monitoring
->>>>>>> origin/qos_monitoring_event
   ee_flexcn_sig_t ee_flexcn;  // Signal for FlexCN Event
 };
 }  // namespace smf

src/smf_app/smf_event_sig.hpp

@@ -71,13 +71,11 @@ typedef bs2::signal_type<
     void(scid_t, uint8_t), bs2::keywords::mutex_type<bs2::dummy_mutex>>::type
     ee_ddds_sig_t;
 
-<<<<<<< HEAD
 // Signal for PDU SESSION ESTABLISHMENT 
 // SCID, HTTP version
 typedef bs2::signal_type<
     void(scid_t, uint8_t), bs2::keywords::mutex_type<bs2::dummy_mutex>>::type
     ee_pdusesest_sig_t;
-=======
 // Signal for QoS Monitoring Event exposure (Usage Report)
 // SEID, Event Notification Model , HTTP version
 // TODO: use SCID and access PDU Session ID (need binding SCIDs - PDUSessID)
@@ -86,7 +84,6 @@ typedef bs2::signal_type<
     bs2::keywords::mutex_type<bs2::dummy_mutex>>::type
     ee_qos_monitoring_sig_t;
 
->>>>>>> origin/qos_monitoring_event
 // Signal for FlexCN event (for Event Exposure)
 // SCID, HTTP version
 typedef bs2::signal_type<