diff --git a/com.twin.app.shoptime/src/views/HomePanel/HomeBanner/RandomUnit.jsx b/com.twin.app.shoptime/src/views/HomePanel/HomeBanner/RandomUnit.jsx
index 002a2de5..5a6396a2 100644
--- a/com.twin.app.shoptime/src/views/HomePanel/HomeBanner/RandomUnit.jsx
+++ b/com.twin.app.shoptime/src/views/HomePanel/HomeBanner/RandomUnit.jsx
@@ -575,8 +575,8 @@ export default function RandomUnit({
 
   // 비디오 클릭
   const videoClick = useCallback(() => {
+    const lastFocusedTargetId = getContainerId(Spotlight.getCurrent());
     const currentSpot = Spotlight.getCurrent();
-// <<<<<<< HEAD
     if (lastFocusedTargetId) {
       dispatch(
         updateHomeInfo({
@@ -589,20 +589,6 @@ export default function RandomUnit({
         })
       );
     }
-// =======
-//     const currentSpotlightId = currentSpot?.getAttribute("data-spotlight-id") || spotlightId;
-
-//     dispatch(
-//       updateHomeInfo({
-//         name: panel_names.HOME_PANEL,
-//         panelInfo: {
-//           lastFocusedTargetId: currentSpotlightId,
-//           focusedContainerId: TEMPLATE_CODE_CONF.TOP,
-//           currentSpot: currentSpotlightId,
-//         },
-//       })
-//     );
-// >>>>>>> gitlab/develop
 
     // ✅ modal=true → modal=false로 전환 (또는 초기 로드 시 modal=false)
     // playActions의 shouldSkipVideoPlayback이 modal 상태를 확인하므로
@@ -645,13 +631,9 @@ export default function RandomUnit({
     randomDataRef,
     sendBannerLog,
     onBlur,
-// <<<<<<< HEAD
     playerPanelInfo?.modal,
     dispatch,
     handleStartVideo,
-// =======
-//     dispatch,
-// >>>>>>> gitlab/develop
   ]);
 
   // 투데이즈 딜 가격 정보
diff --git a/com.twin.app.shoptime/src/views/PlayerPanel/PlayerPanel.jsx b/com.twin.app.shoptime/src/views/PlayerPanel/PlayerPanel.jsx
index 05d765f8..534cc4f7 100644
--- a/com.twin.app.shoptime/src/views/PlayerPanel/PlayerPanel.jsx
+++ b/com.twin.app.shoptime/src/views/PlayerPanel/PlayerPanel.jsx
@@ -28,16 +28,9 @@ import {
   getMainCategoryShowDetail,
   getMainLiveShow,
   getMainLiveShowNowProduct,
-// <<<<<<< HEAD
 } from '../../actions/mainActions';
 import * as PanelActions from '../../actions/panelActions';
 import { updatePanel } from '../../actions/panelActions';
-// =======
-// } from "../../actions/mainActions";
-// import { getBrandLiveChannelInfo } from "../../actions/brandActions";
-// import * as PanelActions from "../../actions/panelActions";
-// import { updatePanel } from "../../actions/panelActions";
-// >>>>>>> gitlab/develop
 import {
   CLEAR_PLAYER_INFO,
   getChatLog,