Fix merge conflictsbugfix/3173

10 files changed, 13 insertions, 190 deletions

diff --git a/src/components/application_manager/include/application_manager/hmi_capabilities_impl.h b/src/components/application_manager/include/application_manager/hmi_capabilities_impl.h
index 0f3efc49f2..0bc98827c8 100644
--- a/src/components/application_manager/include/application_manager/hmi_capabilities_impl.h
+++ b/src/components/application_manager/include/application_manager/hmi_capabilities_impl.h
@@ -90,14 +90,6 @@ class HMICapabilitiesImpl : public HMICapabilities {
   void set_active_ui_language(
       const hmi_apis::Common_Language::eType language) OVERRIDE;
 
-<<<<<<< HEAD
-  /*
-   * @brief Retrieves UI supported languages
-   *
-   * @return Currently supported UI languages
-   */
-=======
->>>>>>> release/7.0.0
   const smart_objects::SmartObjectSPtr ui_supported_languages() const OVERRIDE;
 
   void set_ui_supported_languages(
@@ -108,14 +100,6 @@ class HMICapabilitiesImpl : public HMICapabilities {
   void set_active_vr_language(
       const hmi_apis::Common_Language::eType language) OVERRIDE;
 
-<<<<<<< HEAD
-  /*
-   * @brief Retrieves VR supported languages
-   *
-   * @return Currently supported VR languages
-   */
-=======
->>>>>>> release/7.0.0
   const smart_objects::SmartObjectSPtr vr_supported_languages() const OVERRIDE;
 
   void set_vr_supported_languages(
@@ -126,14 +110,6 @@ class HMICapabilitiesImpl : public HMICapabilities {
   void set_active_tts_language(
       const hmi_apis::Common_Language::eType language) OVERRIDE;
 
-<<<<<<< HEAD
-  /*
-   * @brief Retrieves TTS  supported languages
-   *
-   * @return Currently supported TTS languages
-   */
-=======
->>>>>>> release/7.0.0
   const smart_objects::SmartObjectSPtr tts_supported_languages() const OVERRIDE;
 
   void set_tts_supported_languages(
@@ -245,41 +221,16 @@ class HMICapabilitiesImpl : public HMICapabilities {
   void set_navigation_capability(
       const smart_objects::SmartObject& navigation_capability) OVERRIDE;
 
-<<<<<<< HEAD
-  /*
-   * @brief Retrieves information regarding the navigation system capability
-   *
-   * @return NAVIGATION system capability
-   */
-=======
->>>>>>> release/7.0.0
   const smart_objects::SmartObjectSPtr navigation_capability() const OVERRIDE;
 
   void set_phone_capability(
       const smart_objects::SmartObject& phone_capability) OVERRIDE;
 
-<<<<<<< HEAD
-  /*
-   * @brief Retrieves information regarding the phone call system capability
-   *
-   * @return PHONE_CALL system capability
-   */
-
-=======
->>>>>>> release/7.0.0
   const smart_objects::SmartObjectSPtr phone_capability() const OVERRIDE;
 
   void set_video_streaming_capability(
       const smart_objects::SmartObject& video_streaming_capability) OVERRIDE;
 
-<<<<<<< HEAD
-  /*
-   * @brief Retrieves HMI's video streaming related capabilities
-   *
-   * @return HMI's video streaming related capability information
-   */
-=======
->>>>>>> release/7.0.0
   const smart_objects::SmartObjectSPtr video_streaming_capability()
       const OVERRIDE;
 
@@ -287,15 +238,12 @@ class HMICapabilitiesImpl : public HMICapabilities {
       const smart_objects::SmartObject& rc_capability) OVERRIDE;
 
   const smart_objects::SmartObjectSPtr rc_capability() const OVERRIDE;
-<<<<<<< HEAD
-=======
 
   void set_driver_distraction_capability(
       const smart_objects::SmartObject& driver_distraction_capability) OVERRIDE;
 
   const smart_objects::SmartObjectSPtr driver_distraction_capability()
       const OVERRIDE;
->>>>>>> release/7.0.0
 
   void set_seat_location_capability(
       const smart_objects::SmartObject& seat_location_capability) OVERRIDE;
@@ -532,20 +480,14 @@ class HMICapabilitiesImpl : public HMICapabilities {
   smart_objects::SmartObjectSPtr phone_capability_;
   smart_objects::SmartObjectSPtr video_streaming_capability_;
   smart_objects::SmartObjectSPtr rc_capability_;
-<<<<<<< HEAD
-=======
   smart_objects::SmartObjectSPtr driver_distraction_capability_;
->>>>>>> release/7.0.0
   smart_objects::SmartObjectSPtr seat_location_capability_;
 
   ApplicationManager& app_mngr_;
   HMILanguageHandler hmi_language_handler_;
 
-<<<<<<< HEAD
   mutable sync_primitives::RWLock hmi_capabilities_lock_;
-=======
   std::set<hmi_apis::FunctionID::eType> requests_required_for_capabilities_;
->>>>>>> release/7.0.0
 
   DISALLOW_COPY_AND_ASSIGN(HMICapabilitiesImpl);
 };
diff --git a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/commands/mobile/get_interior_vehicle_data_request.cc b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/commands/mobile/get_interior_vehicle_data_request.cc
index 61d9d32109..8d3a3d796e 100644
--- a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/commands/mobile/get_interior_vehicle_data_request.cc
+++ b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/commands/mobile/get_interior_vehicle_data_request.cc
@@ -53,13 +53,8 @@ GetInteriorVehicleDataRequest::GetInteriorVehicleDataRequest(
     , excessive_subscription_occured_(false) {}
 
 bool GetInteriorVehicleDataRequest::ProcessCapabilities() {
-<<<<<<< HEAD
-  LOG4CXX_AUTO_TRACE(logger_);
-  auto rc_capabilities = hmi_capabilities_.rc_capability();
-=======
   SDL_LOG_AUTO_TRACE();
   const auto rc_capability = hmi_capabilities_.rc_capability();
->>>>>>> release/7.0.0
 
   const std::string module_type = ModuleType();
   const std::string module_id = ModuleId();
diff --git a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/commands/mobile/release_interior_vehicle_data_module_request.cc b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/commands/mobile/release_interior_vehicle_data_module_request.cc
index 62d3724367..47430c2487 100644
--- a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/commands/mobile/release_interior_vehicle_data_module_request.cc
+++ b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/commands/mobile/release_interior_vehicle_data_module_request.cc
@@ -92,13 +92,8 @@ ReleaseInteriorVehicleDataModuleRequest::
     : RCCommandRequest(message, params) {}
 
 bool ReleaseInteriorVehicleDataModuleRequest::ProcessCapabilities() {
-<<<<<<< HEAD
-  LOG4CXX_AUTO_TRACE(logger_);
-  auto rc_capabilities = hmi_capabilities_.rc_capability();
-=======
   SDL_LOG_AUTO_TRACE();
   const auto rc_capability = hmi_capabilities_.rc_capability();
->>>>>>> release/7.0.0
 
   const std::string module_type = ModuleType();
   const std::string module_id = ModuleId();
diff --git a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/commands/button_press_request_test.cc b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/commands/button_press_request_test.cc
index 8ffc0b50a4..6c0962a557 100644
--- a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/commands/button_press_request_test.cc
+++ b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/commands/button_press_request_test.cc
@@ -79,12 +79,8 @@ class ButtonPressRequestTest
     : public CommandRequestTest<CommandsTestMocks::kIsNice> {
  public:
   ButtonPressRequestTest()
-<<<<<<< HEAD
-      : rc_capabilities_(CreateMessage(smart_objects::SmartType_Array))
-=======
       : rc_capabilities_(std::make_shared<smart_objects::SmartObject>(
             smart_objects::SmartType_Map))
->>>>>>> release/7.0.0
       , mock_app_(std::make_shared<NiceMock<MockApplication> >())
       , rc_app_extension_(std::make_shared<rc_rpc_plugin::RCAppExtension>(
             kModuleId, rc_plugin_, *mock_app_)) {}
diff --git a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/commands/get_interior_vehicle_data_request_test.cc b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/commands/get_interior_vehicle_data_request_test.cc
index 7d36943210..20f9c27912 100644
--- a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/commands/get_interior_vehicle_data_request_test.cc
+++ b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/commands/get_interior_vehicle_data_request_test.cc
@@ -100,12 +100,8 @@ class GetInteriorVehicleDataRequestTest
             kModuleId, rc_plugin_, *mock_app2_))
       , apps_lock_(std::make_shared<sync_primitives::Lock>())
       , apps_da_(apps_, apps_lock_)
-<<<<<<< HEAD
-      , rc_capabilities_(CreateMessage(smart_objects::SmartType_Array)) {
-=======
       , rc_capabilities_(std::make_shared<smart_objects::SmartObject>(
             smart_objects::SmartType::SmartType_Array)) {
->>>>>>> release/7.0.0
     ON_CALL(*mock_app_, app_id()).WillByDefault(Return(kAppId));
     ON_CALL(*mock_app2_, app_id()).WillByDefault(Return(kAppId2));
     ON_CALL(*mock_app_, is_remote_control_supported())
diff --git a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/commands/rc_get_interior_vehicle_data_consent_test.cc b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/commands/rc_get_interior_vehicle_data_consent_test.cc
index 2b5417e0ba..8fbaeda2f2 100644
--- a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/commands/rc_get_interior_vehicle_data_consent_test.cc
+++ b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/commands/rc_get_interior_vehicle_data_consent_test.cc
@@ -106,12 +106,8 @@ class RCGetInteriorVehicleDataConsentTest
   RCGetInteriorVehicleDataConsentTest()
       : mock_app_(std::make_shared<NiceMock<MockApplication> >())
       , command_holder(app_mngr_)
-<<<<<<< HEAD
-      , rc_capabilities_(CreateMessage(smart_objects::SmartType_Array))
-=======
       , rc_capabilities_(std::make_shared<smart_objects::SmartObject>(
             smart_objects::SmartType::SmartType_Array))
->>>>>>> release/7.0.0
       , request_controller(mock_request_controler)
       , rpc_protection_manager_(
             std::make_shared<application_manager::MockRPCProtectionManager>())
diff --git a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/commands/set_interior_vehicle_data_request_test.cc b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/commands/set_interior_vehicle_data_request_test.cc
index 2335fa170d..9b06ddb137 100644
--- a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/commands/set_interior_vehicle_data_request_test.cc
+++ b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/commands/set_interior_vehicle_data_request_test.cc
@@ -73,15 +73,10 @@ class SetInteriorVehicleDataRequestTest
  public:
   SetInteriorVehicleDataRequestTest()
       : mock_app_(std::make_shared<NiceMock<MockApplication> >())
-<<<<<<< HEAD
-      , rc_app_extention_(std::make_shared<RCAppExtension>(kModuleId))
-      , rc_capabilities_(CreateMessage(smart_objects::SmartType_Array)) {}
-=======
       , rc_app_extension_(
             std::make_shared<RCAppExtension>(kModuleId, rc_plugin_, *mock_app_))
       , rc_capabilities_(std::make_shared<smart_objects::SmartObject>(
             smart_objects::SmartType::SmartType_Array)) {}
->>>>>>> release/7.0.0
 
   void SetUp() OVERRIDE {
     smart_objects::SmartObject control_caps((smart_objects::SmartType_Array));
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/change_registration_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/change_registration_request.cc
index 4d305d6197..13a57cf9a8 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/change_registration_request.cc
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/change_registration_request.cc
@@ -461,11 +461,7 @@ bool ChangeRegistrationRequest::PrepareResponseParameters(
 bool ChangeRegistrationRequest::IsLanguageSupportedByUI(
     const int32_t& hmi_display_lang) {
   const HMICapabilities& hmi_capabilities = hmi_capabilities_;
-<<<<<<< HEAD
-  auto ui_languages = hmi_capabilities.ui_supported_languages();
-=======
   const auto ui_languages = hmi_capabilities.ui_supported_languages();
->>>>>>> release/7.0.0
 
   if (!ui_languages) {
     SDL_LOG_ERROR("NULL pointer");
@@ -486,11 +482,7 @@ bool ChangeRegistrationRequest::IsLanguageSupportedByUI(
 bool ChangeRegistrationRequest::IsLanguageSupportedByVR(
     const int32_t& hmi_display_lang) {
   const HMICapabilities& hmi_capabilities = hmi_capabilities_;
-<<<<<<< HEAD
-  auto vr_languages = hmi_capabilities.vr_supported_languages();
-=======
   const auto vr_languages = hmi_capabilities.vr_supported_languages();
->>>>>>> release/7.0.0
 
   if (!vr_languages) {
     SDL_LOG_ERROR("NULL pointer");
@@ -511,11 +503,7 @@ bool ChangeRegistrationRequest::IsLanguageSupportedByVR(
 bool ChangeRegistrationRequest::IsLanguageSupportedByTTS(
     const int32_t& hmi_display_lang) {
   const HMICapabilities& hmi_capabilities = hmi_capabilities_;
-<<<<<<< HEAD
-  auto tts_languages = hmi_capabilities.tts_supported_languages();
-=======
   const auto tts_languages = hmi_capabilities.tts_supported_languages();
->>>>>>> release/7.0.0
 
   if (!tts_languages) {
     SDL_LOG_ERROR("NULL pointer");
diff --git a/src/components/application_manager/src/hmi_capabilities_impl.cc b/src/components/application_manager/src/hmi_capabilities_impl.cc
index 5549534bd8..1390a3ae2c 100644
--- a/src/components/application_manager/src/hmi_capabilities_impl.cc
+++ b/src/components/application_manager/src/hmi_capabilities_impl.cc
@@ -225,40 +225,25 @@ HMICapabilitiesImpl::active_tts_language() const {
 
 void HMICapabilitiesImpl::set_ui_supported_languages(
     const smart_objects::SmartObject& supported_languages) {
-<<<<<<< HEAD
-  smart_objects::SmartObjectSPtr new_value =
-      std::make_shared<smart_objects::SmartObject>(supported_languages);
-  sync_primitives::AutoWriteLock lock(hmi_capabilities_lock_);
-=======
   auto new_value =
       std::make_shared<smart_objects::SmartObject>(supported_languages);
->>>>>>> release/7.0.0
+  sync_primitives::AutoWriteLock lock(hmi_capabilities_lock_);
   ui_supported_languages_.swap(new_value);
 }
 
 void HMICapabilitiesImpl::set_tts_supported_languages(
     const smart_objects::SmartObject& supported_languages) {
-<<<<<<< HEAD
-  smart_objects::SmartObjectSPtr new_value =
-      std::make_shared<smart_objects::SmartObject>(supported_languages);
-  sync_primitives::AutoWriteLock lock(hmi_capabilities_lock_);
-=======
   auto new_value =
       std::make_shared<smart_objects::SmartObject>(supported_languages);
->>>>>>> release/7.0.0
+  sync_primitives::AutoWriteLock lock(hmi_capabilities_lock_);
   tts_supported_languages_.swap(new_value);
 }
 
 void HMICapabilitiesImpl::set_vr_supported_languages(
     const smart_objects::SmartObject& supported_languages) {
-<<<<<<< HEAD
-  smart_objects::SmartObjectSPtr new_value =
-      std::make_shared<smart_objects::SmartObject>(supported_languages);
-  sync_primitives::AutoWriteLock lock(hmi_capabilities_lock_);
-=======
   auto new_value =
       std::make_shared<smart_objects::SmartObject>(supported_languages);
->>>>>>> release/7.0.0
+  sync_primitives::AutoWriteLock lock(hmi_capabilities_lock_);
   vr_supported_languages_.swap(new_value);
 }
 
@@ -323,15 +308,9 @@ void HMICapabilitiesImpl::set_speech_capabilities(
 
 void HMICapabilitiesImpl::set_audio_pass_thru_capabilities(
     const smart_objects::SmartObject& audio_pass_thru_capabilities) {
-<<<<<<< HEAD
-  smart_objects::SmartObjectSPtr new_value =
-      std::make_shared<smart_objects::SmartObject>(
-          audio_pass_thru_capabilities);
-  sync_primitives::AutoWriteLock lock(hmi_capabilities_lock_);
-=======
   auto new_value = std::make_shared<smart_objects::SmartObject>(
       audio_pass_thru_capabilities);
->>>>>>> release/7.0.0
+  sync_primitives::AutoWriteLock lock(hmi_capabilities_lock_);
   audio_pass_thru_capabilities_.swap(new_value);
 }
 
@@ -353,13 +332,8 @@ void HMICapabilitiesImpl::set_preset_bank_capabilities(
 
 void HMICapabilitiesImpl::set_vehicle_type(
     const smart_objects::SmartObject& vehicle_type) {
-<<<<<<< HEAD
-  smart_objects::SmartObjectSPtr new_value =
-      std::make_shared<smart_objects::SmartObject>(vehicle_type);
-  sync_primitives::AutoWriteLock lock(hmi_capabilities_lock_);
-=======
   auto new_value = std::make_shared<smart_objects::SmartObject>(vehicle_type);
->>>>>>> release/7.0.0
+  sync_primitives::AutoWriteLock lock(hmi_capabilities_lock_);
   vehicle_type_.swap(new_value);
 }
 
@@ -393,52 +367,32 @@ void HMICapabilitiesImpl::set_driver_distraction_supported(
 
 void HMICapabilitiesImpl::set_navigation_capability(
     const smart_objects::SmartObject& navigation_capability) {
-<<<<<<< HEAD
-  smart_objects::SmartObjectSPtr new_value =
-      std::make_shared<smart_objects::SmartObject>(navigation_capability);
-  sync_primitives::AutoWriteLock lock(hmi_capabilities_lock_);
-=======
   auto new_value =
       std::make_shared<smart_objects::SmartObject>(navigation_capability);
->>>>>>> release/7.0.0
+  sync_primitives::AutoWriteLock lock(hmi_capabilities_lock_);
   navigation_capability_.swap(new_value);
 }
 
 void HMICapabilitiesImpl::set_phone_capability(
     const smart_objects::SmartObject& phone_capability) {
-<<<<<<< HEAD
-  smart_objects::SmartObjectSPtr new_value =
-      std::make_shared<smart_objects::SmartObject>(phone_capability);
-  sync_primitives::AutoWriteLock lock(hmi_capabilities_lock_);
-=======
   auto new_value =
       std::make_shared<smart_objects::SmartObject>(phone_capability);
->>>>>>> release/7.0.0
+  sync_primitives::AutoWriteLock lock(hmi_capabilities_lock_);
   phone_capability_.swap(new_value);
 }
 
 void HMICapabilitiesImpl::set_video_streaming_capability(
     const smart_objects::SmartObject& video_streaming_capability) {
-<<<<<<< HEAD
-  smart_objects::SmartObjectSPtr new_value =
-      std::make_shared<smart_objects::SmartObject>(video_streaming_capability);
-  sync_primitives::AutoWriteLock lock(hmi_capabilities_lock_);
-=======
   auto new_value =
       std::make_shared<smart_objects::SmartObject>(video_streaming_capability);
->>>>>>> release/7.0.0
+  sync_primitives::AutoWriteLock lock(hmi_capabilities_lock_);
   video_streaming_capability_.swap(new_value);
 }
 
 void HMICapabilitiesImpl::set_rc_capability(
     const smart_objects::SmartObject& rc_capability) {
-<<<<<<< HEAD
-  smart_objects::SmartObjectSPtr new_value =
-      std::make_shared<smart_objects::SmartObject>(rc_capability);
-  sync_primitives::AutoWriteLock lock(hmi_capabilities_lock_);
-  rc_capability_.swap(new_value);
-=======
   auto new_value = std::make_shared<smart_objects::SmartObject>(rc_capability);
+  sync_primitives::AutoWriteLock lock(hmi_capabilities_lock_);
   rc_capability_.swap(new_value);
 }
 
@@ -446,20 +400,15 @@ void HMICapabilitiesImpl::set_driver_distraction_capability(
     const smart_objects::SmartObject& driver_distraction_capability) {
   auto new_value = std::make_shared<smart_objects::SmartObject>(
       driver_distraction_capability);
+  sync_primitives::AutoWriteLock lock(hmi_capabilities_lock_);
   driver_distraction_capability_.swap(new_value);
->>>>>>> release/7.0.0
 }
 
 void HMICapabilitiesImpl::set_seat_location_capability(
     const smart_objects::SmartObject& seat_location_capability) {
-<<<<<<< HEAD
-  smart_objects::SmartObjectSPtr new_value =
-      std::make_shared<smart_objects::SmartObject>(seat_location_capability);
-  sync_primitives::AutoWriteLock lock(hmi_capabilities_lock_);
-=======
   auto new_value =
       std::make_shared<smart_objects::SmartObject>(seat_location_capability);
->>>>>>> release/7.0.0
+  sync_primitives::AutoWriteLock lock(hmi_capabilities_lock_);
   seat_location_capability_.swap(new_value);
 }
 
@@ -503,28 +452,19 @@ bool HMICapabilitiesImpl::is_rc_cooperating() const {
 
 const smart_objects::SmartObjectSPtr
 HMICapabilitiesImpl::ui_supported_languages() const {
-<<<<<<< HEAD
   sync_primitives::AutoReadLock lock(hmi_capabilities_lock_);
-=======
->>>>>>> release/7.0.0
   return ui_supported_languages_;
 }
 
 const smart_objects::SmartObjectSPtr
 HMICapabilitiesImpl::vr_supported_languages() const {
-<<<<<<< HEAD
   sync_primitives::AutoReadLock lock(hmi_capabilities_lock_);
-=======
->>>>>>> release/7.0.0
   return vr_supported_languages_;
 }
 
 const smart_objects::SmartObjectSPtr
 HMICapabilitiesImpl::tts_supported_languages() const {
-<<<<<<< HEAD
   sync_primitives::AutoReadLock lock(hmi_capabilities_lock_);
-=======
->>>>>>> release/7.0.0
   return tts_supported_languages_;
 }
 
@@ -620,18 +560,13 @@ bool HMICapabilitiesImpl::rc_supported() const {
   return is_rc_supported_;
 }
 
-<<<<<<< HEAD
-const smart_objects::SmartObjectSPtr
-HMICapabilitiesImpl::navigation_capability() const {
-  sync_primitives::AutoReadLock lock(hmi_capabilities_lock_);
-=======
 bool HMICapabilitiesImpl::driver_distraction_supported() const {
   return is_driver_distraction_supported_;
 }
 
 const smart_objects::SmartObjectSPtr
 HMICapabilitiesImpl::navigation_capability() const {
->>>>>>> release/7.0.0
+  sync_primitives::AutoReadLock lock(hmi_capabilities_lock_);
   return navigation_capability_;
 }
 
@@ -649,22 +584,17 @@ HMICapabilitiesImpl::video_streaming_capability() const {
 
 const smart_objects::SmartObjectSPtr HMICapabilitiesImpl::rc_capability()
     const {
-<<<<<<< HEAD
   sync_primitives::AutoReadLock lock(hmi_capabilities_lock_);
-=======
->>>>>>> release/7.0.0
   return rc_capability_;
 }
 
 const smart_objects::SmartObjectSPtr
-<<<<<<< HEAD
-=======
 HMICapabilitiesImpl::driver_distraction_capability() const {
+  sync_primitives::AutoReadLock lock(hmi_capabilities_lock_);
   return driver_distraction_capability_;
 }
 
 const smart_objects::SmartObjectSPtr
->>>>>>> release/7.0.0
 HMICapabilitiesImpl::seat_location_capability() const {
   sync_primitives::AutoReadLock lock(hmi_capabilities_lock_);
   return seat_location_capability_;
diff --git a/src/components/include/application_manager/hmi_capabilities.h b/src/components/include/application_manager/hmi_capabilities.h
index 91355c6c13..56ac807d63 100644
--- a/src/components/include/application_manager/hmi_capabilities.h
+++ b/src/components/include/application_manager/hmi_capabilities.h
@@ -433,14 +433,8 @@ class HMICapabilities {
   virtual void set_navigation_capability(
       const smart_objects::SmartObject& navigation_capability) = 0;
 
-<<<<<<< HEAD
-  /*
-   * @brief Retrieves information regarding the navigation system capabilityp
-   *
-=======
   /**
    * @brief Retrieves information regarding the navigation system capability
->>>>>>> release/7.0.0
    * @return NAVIGATION system capability
    */
   virtual const smart_objects::SmartObjectSPtr navigation_capability()
@@ -482,9 +476,6 @@ class HMICapabilities {
   virtual void set_rc_capability(
       const smart_objects::SmartObject& rc_capability) = 0;
 
-<<<<<<< HEAD
-  virtual const smart_objects::SmartObjectSPtr rc_capability() const = 0;
-=======
   /**
    * @brief Retrieves information regarding the remote control capabilities
    * @return RC capabilities
@@ -496,7 +487,6 @@ class HMICapabilities {
 
   virtual const smart_objects::SmartObjectSPtr driver_distraction_capability()
       const = 0;
->>>>>>> release/7.0.0
 
   /**
    * @brief Sets available SeatLocation capabilities for further usage by