Feat/merge conflict

components/(modal)/Merge/index.tsx

@@ -0,0 +1,12 @@
+import ResolverContainer from "@/components/Resolver";
+import * as styles from "../style.css";
+
+const Merge = ({ title, contents }: { title: string; contents: string }) => {
+  return (
+    <div className={styles.background}>
+      <ResolverContainer title={title} contents={contents} />
+    </div>
+  );
+};
+
+export default Merge;

components/Container/index.tsx

@@ -19,15 +19,15 @@ interface ContainerProps extends PropsWithChildren {
   docsType: string;
   title: string;
   lastModifiedAt?: Date;
-  docsDetail?: boolean;
+  isDocsDetail?: boolean;
   id?: number;
 }
 
 const Container = ({
   docsType,
   title,
   lastModifiedAt,
-  docsDetail,
+  isDocsDetail,
   id,
   children,
 }: ContainerProps) => {
@@ -68,11 +68,11 @@ const Container = ({
       <hgroup className={styles.hgroup}>
         <div className={styles.titleBox}>
           <h1 className={styles.title}>부마위키:{title}</h1>
-          {docsDetail && lastModifiedAt && (
+          {isDocsDetail && lastModifiedAt && (
             <span className={styles.lastModifiedAt}>최근 편집 · {dateText(lastModifiedAt)}</span>
           )}
         </div>
-        {docsDetail && (
+        {isDocsDetail && (
           <div className={styles.utilityBox}>
             <button onClick={handleDocsEditClick} className={styles.editButton}>
               문서 편집