diff --git a/middleware/MediaManager/src/MediaManagerImpl.cpp b/middleware/MediaManager/src/MediaManagerImpl.cpp
index e397df3..ce03be8 100644
--- a/middleware/MediaManager/src/MediaManagerImpl.cpp
+++ b/middleware/MediaManager/src/MediaManagerImpl.cpp
@@ -77,12 +77,6 @@ void MediaManagerImpl::InitMediaHandles(std::map<CameraType, std::shared_ptr<VCa
             continue;
         }
         MediaChannel channel = static_cast<MediaChannel>(i);
-<<<<<<< HEAD
-        std::shared_ptr<VMediaHandle> media = std::make_shared<MediaHandle>(channel, camera->second);
-        mAllMediaChannels[channel] = media;
-        LogInfo("InitMediaHandles. channel = %d \n", static_cast<MediaChannel>(i));
-    }
-=======
         std::shared_ptr<MediaHandle> media = std::make_shared<MediaHandle>(channel, camera->second);
         media->Init();
         mAllMediaChannels[channel] = media;
@@ -100,5 +94,4 @@ void MediaManagerImpl::UnInitMediaHandles(void)
         }
         mediaImpl->UnInit();
     }
->>>>>>> master
 }
\ No newline at end of file