no message

src/app/(main)/user/page.tsx

@@ -12,7 +12,7 @@ export const metadata: Metadata = {
 };
 
 const TaskTemplates: React.FC = async () => {
-  const { t } = await getServerI18n("user");
+  const { t } = await getServerI18n("common");
 
   return (
     <>

src/app/api/settings/item/actions.ts

@@ -37,7 +37,6 @@ export type CreateItemInputs = {
 };
 
 export const saveItem = async (data: CreateItemInputs) => {
-<<<<<<< HEAD
     // try {
       const item = await serverFetchJson<CreateItemResponse<CreateItemInputs>>(`${BASE_API_URL}/items/new`, {
         method: "POST",
@@ -47,17 +46,3 @@ export const saveItem = async (data: CreateItemInputs) => {
       revalidateTag("items");
       return item
     };
-=======
-  // try {
-  const item = await serverFetchJson<CreateItemResponse<CreateItemInputs>>(
-    `${BASE_API_URL}/items/new`,
-    {
-      method: "POST",
-      body: JSON.stringify(data),
-      headers: { "Content-Type": "application/json" },
-    },
-  );
-  revalidateTag("items");
-  return item;
-};
->>>>>>> 5c6e25f78f79bd44c563ec67c6ec9d59f2a7baed