fix conflicts

2 files changed, 6 insertions, 40 deletions

diff --git a/src/components/application_manager/src/application_state.cc b/src/components/application_manager/src/application_state.cc
index c40607c8a3..c444b2264c 100644
--- a/src/components/application_manager/src/application_state.cc
+++ b/src/components/application_manager/src/application_state.cc
@@ -171,19 +171,10 @@ void ApplicationState::AddHMIState(const WindowID window_id,
                                         hmi_states.end(),
                                         StateIDComparator(state->state_id()));
   if (hmi_states.end() != it) {
-<<<<<<< HEAD
-    LOG4CXX_WARN(logger_,
-                 "Hmi state with ID " << state->state_id()
-                                      << "has been already applied for window "
-                                      << window_id
-                                      << " of this application. Overwriting");
-    EraseHMIState(hmi_states, it);
-=======
     SDL_LOG_WARN("Hmi state with ID "
                  << state->state_id() << "has been already applied for window "
-                 << window_id << " of this application. Ignoring");
-    return;
->>>>>>> origin/develop
+                 << window_id << " of this application. Overwriting");
+    EraseHMIState(hmi_states, it);
   }
 
   if (!hmi_states.empty()) {
@@ -246,24 +237,9 @@ void ApplicationState::RemoveWindowHMIStates(const WindowID window_id) {
 void ApplicationState::RemovePostponedState(const WindowID window_id) {
   SDL_LOG_AUTO_TRACE();
   sync_primitives::AutoLock auto_lock(hmi_states_map_lock_);
-<<<<<<< HEAD
   size_t deleted_elements = postponed_states_map_.erase(window_id);
   if (0 == deleted_elements) {
-    LOG4CXX_ERROR(logger_,
-                  "No postponed state is set for window " << window_id);
-=======
-  HmiStates& hmi_states = hmi_states_map_[window_id];
-  DCHECK_OR_RETURN_VOID(!hmi_states.empty());
-
-  StateIDComparator finder(HmiState::StateID::STATE_ID_POSTPONED);
-
-  HmiStates::iterator postponed_state =
-      std::find_if(hmi_states.begin(), hmi_states.end(), finder);
-
-  if (hmi_states.end() == postponed_state) {
     SDL_LOG_ERROR("No postponed state is set for window " << window_id);
-    return;
->>>>>>> origin/develop
   }
 }
 
diff --git a/src/components/application_manager/src/state_controller_impl.cc b/src/components/application_manager/src/state_controller_impl.cc
index a9107a02e2..a34149ef34 100644
--- a/src/components/application_manager/src/state_controller_impl.cc
+++ b/src/components/application_manager/src/state_controller_impl.cc
@@ -549,28 +549,18 @@ bool StateControllerImpl::IsStateAvailable(ApplicationSharedPtr app,
     return IsStateAvailableForResumption(app, state);
   }
 
-<<<<<<< HEAD
   if (HMILevel::HMI_FULL == state->hmi_level()) {
     if (IsTempStateActive(HmiState::StateID::STATE_ID_AUDIO_SOURCE) &&
         app->is_media_application()) {
-      LOG4CXX_DEBUG(logger_,
-                    "Media app is not allowed to activate due"
-                        << " to AUDIO_SOURCE event is active");
+      SDL_LOG_DEBUG("Media app is not allowed to activate due"
+                    << " to AUDIO_SOURCE event is active");
       return false;
     }
 
     if (IsTempStateActive(HmiState::StateID::STATE_ID_EMBEDDED_NAVI) &&
         app->is_navi()) {
-      LOG4CXX_DEBUG(logger_,
-                    "Navi app is not allowed to activate due"
-                        << " to EMBEDDED_NAVI event is active");
-=======
-  if (IsTempStateActive(HmiState::StateID::STATE_ID_AUDIO_SOURCE) ||
-      IsTempStateActive(HmiState::StateID::STATE_ID_EMBEDDED_NAVI)) {
-    if (HMILevel::HMI_FULL == state->hmi_level()) {
-      SDL_LOG_DEBUG("AUDIO_SOURCE or EMBEDDED_NAVI is active."
-                    << " Requested state is not available");
->>>>>>> origin/develop
+      SDL_LOG_DEBUG("Navi app is not allowed to activate due"
+                    << " to EMBEDDED_NAVI event is active");
       return false;
     }
   }