diff --git a/app/constant.ts b/app/constant.ts
index fb1c97840..05f048dd8 100644
--- a/app/constant.ts
+++ b/app/constant.ts
@@ -399,6 +399,30 @@ export const DEFAULT_MODELS = [
       sorted: 1, // 这里是固定的，确保顺序与之前内置的版本一致
     },
   },
+  {
+    name: "gpt-4o-2024-08-06",
+    describe: "GPT-4o,最新版,省着点用",
+    available: true,
+    sorted: seq++,
+    provider: {
+      id: "openai",
+      providerName: "OpenAI",
+      providerType: "openai",
+      sorted: 2,
+    },
+  },
+  {
+    name: "gpt-4o-all",
+    describe: "GPT-4o,全能版,最贵",
+    available: true,
+    sorted: seq++,
+    provider: {
+      id: "openai",
+      providerName: "OpenAI",
+      providerType: "openai",
+      sorted: 2,
+    },
+  },
   {
     name: "claude-3-5-sonnet-20240620",
     describe: "claude第三代模型最强版",
@@ -423,18 +447,6 @@ export const DEFAULT_MODELS = [
       sorted: 3,
     },
   },
-  {
-    name: "gpt-4o-all",
-    describe: "GPT-4,最新版,省着点用",
-    available: true,
-    sorted: seq++,
-    provider: {
-      id: "openai",
-      providerName: "OpenAI",
-      providerType: "openai",
-      sorted: 1,
-    },
-  },
   {
     name: "midjourney",
     describe: "绘图用,不用选",
@@ -444,7 +456,7 @@ export const DEFAULT_MODELS = [
       id: "openai",
       providerName: "OpenAI",
       providerType: "openai",
-      sorted: 1,
+      sorted: 2,
     },
   },
 ] as const;
diff --git a/app/utils/store.ts b/app/utils/store.ts
index 13bef6d5d..95bbf4032 100644
--- a/app/utils/store.ts
+++ b/app/utils/store.ts
@@ -32,7 +32,8 @@ export function createPersistStore<T extends object, M>(
   ) => M,
   persistOptions: SecondParam<typeof persist<T & M & MakeUpdater<T>>>,
 ) {
-  persistOptions.storage = createJSONStorage(() => indexedDBStorage);
+  // merge 报错，很离谱，后续再排查
+  // persistOptions.storage = createJSONStorage(() => indexedDBStorage);
   return create(
     persist(
       combine(