diff --git a/apps/sn/app/map/components/popupComponent/Ssc.tsx b/apps/sn/app/map/components/popupComponent/Ssc.tsx
index 8b139de4e..06b975739 100644
--- a/apps/sn/app/map/components/popupComponent/Ssc.tsx
+++ b/apps/sn/app/map/components/popupComponent/Ssc.tsx
@@ -12,7 +12,7 @@ const headlist = [
   { id: 'startrain', title: '강우시작일시' }, { id: 'endrain', title: '강우종료일시' }, { id: '선행건기', title: '선행건기(h)' }, { id: '강우정보', title: '강우정보' }, { id: '누적강우량', title: '누적강우량(mm)' }, { id: '지속시간', title: '지속시간(h)' }, { id: '강우강도', title: '강우강도(mm/h)' },
 ]
 const headlist3 = [{ id: 'nm', title: '회차' }, { id: 'date', title: '측정일자' }, { id: 'measure', title: '수량(m)' }, { id: 'bod', title: 'BOD(mg/L)' }, { id: 'toc', title: 'TOC(mg/L)' }, { id: '오염부하량', title: '오염부하량(kg)' }]
-const Ssc = ({ featureData }: { featureData: any }) => {
+const Ssc = ({ featureData, chkMainSsc }: { featureData: any, chkMainSsc?: boolean}) => {
   const [isModalOpen, setIsModalOpen] = React.useState(false);
   const openModal = () => {
     setIsModalOpen(true);
@@ -23,7 +23,7 @@ const Ssc = ({ featureData }: { featureData: any }) => {
   return (
     <div><VerticalTable headName='자체 입력정보' tableData={[]} headlist={inputColumn} pageSize={0} total={0} children={undefined} cellClick={undefined} isEditable={true} onPageChange={function (page: number): void {
       throw new Error('Function not implemented.');
-    }} />
+    }} />{!chkMainSsc ? null :
       <div>
         <div className="card-header">
           <h3 className="text-2xl mx-3 font-medium text-label">중점우수토실 운영정보</h3>
@@ -33,32 +33,32 @@ const Ssc = ({ featureData }: { featureData: any }) => {
           <div className='grid grid-col-3'><UiTable headName='강우정보' tableData={[]} headlist={headlist} pageSize={0} total={0} children={undefined} cellClick={undefined} onPageChange={function (page: number): void {
             throw new Error('Function not implemented.');
           }}></UiTable>
-          <UiTable headName='측정정보' tableData={[]} headlist={[]} pageSize={0} total={0} cellClick={undefined} onPageChange={function (page: number): void {
-            throw new Error('Function not implemented.');
-          }}>  {/* 커스텀 헤더 */}
-          <TableRow>
-            <TableHead colSpan={5} className="text-center bg-blue-100 font-bold">
-              수량
-            </TableHead>
-            <TableHead colSpan={3} className="text-center bg-blue-100 font-bold">
-              수질
-            </TableHead>
-          </TableRow>
-          <TableRow>
-            <TableHead className="text-center">측정시작일시</TableHead>
-            <TableHead className="text-center">측정종료일시</TableHead>
-            <TableHead className="text-center">측정간격(분)</TableHead>
-            <TableHead className="text-center">측정기기설치위치</TableHead>
-            <TableHead className="text-center">유량계 종류 및 모델명</TableHead>
-            <TableHead className="text-center">채수시작일시</TableHead>
-            <TableHead className="text-center">채수종료일시</TableHead>
-            <TableHead className="text-center">채수횟수</TableHead>
-          </TableRow></UiTable>
-          <UiTable headName='수량/수질측정 정보' tableData={[]} headlist={headlist3} pageSize={0} total={0} children={undefined} cellClick={undefined} onPageChange={function (page: number): void {
-            throw new Error('Function not implemented.');
-          }}></UiTable></div>
+            <UiTable headName='측정정보' tableData={[]} headlist={[]} pageSize={0} total={0} cellClick={undefined} onPageChange={function (page: number): void {
+              throw new Error('Function not implemented.');
+            }}>  {/* 커스텀 헤더 */}
+              <TableRow>
+                <TableHead colSpan={5} className="text-center bg-blue-100 font-bold">
+                  수량
+                </TableHead>
+                <TableHead colSpan={3} className="text-center bg-blue-100 font-bold">
+                  수질
+                </TableHead>
+              </TableRow>
+              <TableRow>
+                <TableHead className="text-center">측정시작일시</TableHead>
+                <TableHead className="text-center">측정종료일시</TableHead>
+                <TableHead className="text-center">측정간격(분)</TableHead>
+                <TableHead className="text-center">측정기기설치위치</TableHead>
+                <TableHead className="text-center">유량계 종류 및 모델명</TableHead>
+                <TableHead className="text-center">채수시작일시</TableHead>
+                <TableHead className="text-center">채수종료일시</TableHead>
+                <TableHead className="text-center">채수횟수</TableHead>
+              </TableRow></UiTable>
+            <UiTable headName='수량/수질측정 정보' tableData={[]} headlist={headlist3} pageSize={0} total={0} children={undefined} cellClick={undefined} onPageChange={function (page: number): void {
+              throw new Error('Function not implemented.');
+            }}></UiTable></div>
         </Modal>
-      </div>
+      </div>}
     </div>
   )
 }
diff --git a/packages/common/components/src/ui/input/index.tsx b/packages/common/components/src/ui/input/index.tsx
index 0030bfed2..f3abe2d82 100644
--- a/packages/common/components/src/ui/input/index.tsx
+++ b/packages/common/components/src/ui/input/index.tsx
@@ -7,11 +7,7 @@ const Input = React.forwardRef<HTMLInputElement, React.ComponentProps<"input">>(
     return (
       <input
         className={cn(
-<<<<<<< HEAD
-          "flex h-[3.2rem] w-full rounded-md border border-input bg-form px-3 py-2 text-base text-foreground ring-offset-background file:border-0 file:bg-transparent file:text-sm file:font-medium file:text-foreground placeholder:text-placeholder focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:cursor-not-allowed disabled:opacity-50 md:text-sm",
-=======
           "flex h-[3.2rem] w-full rounded-md border border-input bg-form px-3 py-2 text-xl ring-offset-background file:border-0 file:bg-transparent file:text-sm file:font-medium file:text-foreground placeholder:text-placeholder focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:cursor-not-allowed disabled:opacity-50 md:text-xl",
->>>>>>> 9cdf6fb0477cbb7f43794fc9d46b9a60fd7828f7
           className,
         )}
         ref={ref}