diff --git a/frontend/app/(main)/screens/[screenId]/page.tsx b/frontend/app/(main)/screens/[screenId]/page.tsx
index a84be712..133a7256 100644
--- a/frontend/app/(main)/screens/[screenId]/page.tsx
+++ b/frontend/app/(main)/screens/[screenId]/page.tsx
@@ -23,11 +23,8 @@ import { TableSearchWidgetHeightProvider, useTableSearchWidgetHeight } from "@/c
 import { ScreenContextProvider } from "@/contexts/ScreenContext"; // 컴포넌트 간 통신
 import { SplitPanelProvider } from "@/lib/registry/components/split-panel-layout/SplitPanelContext"; // 분할 패널 리사이즈
 import { ActiveTabProvider } from "@/contexts/ActiveTabContext"; // 활성 탭 관리
-<<<<<<< HEAD
 import { evaluateConditional } from "@/lib/utils/conditionalEvaluator"; // 조건부 표시 평가
-=======
 import { ScreenMultiLangProvider } from "@/contexts/ScreenMultiLangContext"; // 화면 다국어
->>>>>>> 435eb90763a3f89b76d0d810d8b78c27c0bb6802
 
 function ScreenViewPage() {
   const params = useParams();
diff --git a/frontend/components/screen/InteractiveScreenViewer.tsx b/frontend/components/screen/InteractiveScreenViewer.tsx
index eaec2648..8d5a6562 100644
--- a/frontend/components/screen/InteractiveScreenViewer.tsx
+++ b/frontend/components/screen/InteractiveScreenViewer.tsx
@@ -568,7 +568,7 @@ export const InteractiveScreenViewer: React.FC<InteractiveScreenViewerProps> = (
       );
     }
 
-    const { widgetType, label, placeholder, required, readonly, columnName } = comp;
+    const { widgetType, label: originalLabel, placeholder, required, readonly, columnName } = comp;
     const fieldName = columnName || comp.id;
     const currentValue = formData[fieldName] || "";
 
@@ -580,7 +580,6 @@ export const InteractiveScreenViewer: React.FC<InteractiveScreenViewerProps> = (
     const compLangKey = (comp as any).langKey;
     const label = compLangKey && translations[compLangKey] ? translations[compLangKey] : originalLabel;
 
-=======
     const applyStyles = (element: React.ReactElement) => {
       if (!comp.style) return element;
 
@@ -1923,19 +1922,11 @@ export const InteractiveScreenViewer: React.FC<InteractiveScreenViewerProps> = (
         return applyStyles(
           <button
             onClick={handleButtonClick}
-<<<<<<< HEAD
             disabled={isReadonly}
-            className={`focus:ring-ring w-full rounded-md px-3 py-2 text-sm font-medium transition-colors focus:ring-2 focus:ring-offset-2 focus:outline-none disabled:pointer-events-none disabled:opacity-50 ${
+            className={`w-full rounded-md px-3 py-2 text-sm font-medium transition-colors focus:outline-none focus:ring-2 focus:ring-ring focus:ring-offset-2 disabled:pointer-events-none disabled:opacity-50 ${
               hasCustomColors
                 ? ""
-                : "bg-background border-foreground text-foreground hover:bg-muted/50 border shadow-xs"
-=======
-            disabled={readonly}
-            className={`w-full rounded-md px-3 py-2 text-sm font-medium transition-colors focus:outline-none focus:ring-2 focus:ring-ring focus:ring-offset-2 disabled:pointer-events-none disabled:opacity-50 ${
-              hasCustomColors 
-                ? '' 
-                : 'bg-background border border-foreground text-foreground shadow-xs hover:bg-muted/50'
->>>>>>> ac0f4618321df78939e833f90768ae5404646fec
+                : "bg-background border border-foreground text-foreground shadow-xs hover:bg-muted/50"
             }`}
             style={{
               height: "100%",
diff --git a/frontend/lib/registry/components/button-primary/ButtonPrimaryComponent.tsx b/frontend/lib/registry/components/button-primary/ButtonPrimaryComponent.tsx
index c862bc56..173a67ad 100644
--- a/frontend/lib/registry/components/button-primary/ButtonPrimaryComponent.tsx
+++ b/frontend/lib/registry/components/button-primary/ButtonPrimaryComponent.tsx
@@ -397,7 +397,7 @@ export const ButtonPrimaryComponent: React.FC<ButtonPrimaryComponentProps> = ({
       selectionCount,
       selectionSource,
       hasSplitPanelContext: !!splitPanelContext,
-      trackedSelectedLeftData: trackedSelectedLeftData,
+      selectedLeftData: splitPanelContext?.selectedLeftData,
       selectedRowsData: selectedRowsData?.length,
       selectedRows: selectedRows?.length,
       flowSelectedData: flowSelectedData?.length,