diff --git a/manifest b/manifest
index 0a3934c849..728f40734e 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Remove\sa\sliteral\s0x0d\scharacter\sfrom\sa\ssessions\stest\sscript,\susing\nchar(0x0d)\sin\sits\splace,\sto\savoid\sfalse-positive\smixed-line-ending\nwarnings\sfrom\sFossil.
-D 2026-08-20T15:59:53.914
+C Fix\sa\sfaulty\sassert()\sin\slemon,\sas\sreported\sat\n[forum:/info/2026-08-20T14:18:08Z|Forum\spost\s2026-08-20T14:18:08Z].
+D 2026-08-20T16:47:20.662
 F .fossil-settings/binary-glob 61195414528fb3ea9693577e1980230d78a1f8b0a54c78cf1b9b24d0a409ed6a x
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
@@ -2149,7 +2149,7 @@ F tool/genfkey.README e550911fa984c8255ebed2ef97824125d83806eb5232582700de949edf
 F tool/genfkey.test b6afd7b825d797a1e1274f519ab5695373552ecad5cd373530c63533638a5a4f
 F tool/getlock.c f4c39b651370156cae979501a7b156bdba50e7ce
 F tool/index_usage.c f62a0c701b2c7ff2f3e21d206f093c123f222dbf07136a10ffd1ca15a5c706c5
-F tool/lemon.c 2a3943da517ab12e084b0245f786dc6504761f75e4044c458340e41bad2c119e
+F tool/lemon.c 1b41fa72da31d9f577af276ba65a5e2801910f81cbb0cc87416f28a93a3963cd
 F tool/lempar.c a8de510526f9cbfb45ff0aca9d16f1c828600246f198c1c7d49c8d5492142ffa
 F tool/libvers.c caafc3b689638a1d88d44bc5f526c2278760d9b9
 F tool/loadfts.c 63412f9790e5e8538fbde0b4f6db154aaaf80f7a10a01e3c94d14b773a8dd5a6
@@ -2219,8 +2219,8 @@ F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee
 F tool/warnings.sh a554d13f6e5cf3760f041b87939e3d616ec6961859c3245e8ef701d1eafc2ca2
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
 F tool/winmain.c 00c8fb88e365c9017db14c73d3c78af62194d9644feaf60e220ab0f411f3604c
-P 3bd5456e50ef321f2cafcf67261d556a760624ce0caab430ed9454cebec233e7
-R 2ecbe6878a444b5284c93041fc23c73e
+P d0e4714aff80e74d16ed2d5b3a2186890ae0f801e9cef0199bb9ebc8de3c81ac
+R f02f47d115959fb270f6e4eec38d10e2
 U drh
-Z 25d59f472dffecc28851ed3697ec5203
+Z 632382639d774baf3dbfad783fb5c2e1
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 1cd456099f..cc1c8e0ef8 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-d0e4714aff80e74d16ed2d5b3a2186890ae0f801e9cef0199bb9ebc8de3c81ac
+0672f6f07483b570eb9b3d27ca50a3f8564d2adad18fa7703240d45bbbd098b2
diff --git a/tool/lemon.c b/tool/lemon.c
index 0370017702..f3a6795b56 100644
--- a/tool/lemon.c
+++ b/tool/lemon.c
@@ -1360,6 +1360,7 @@ static int resolve_conflict(
     }
   }else{
     assert(
+      apx->type==ERROR ||
       apx->type==SH_RESOLVED ||
       apx->type==RD_RESOLVED ||
       apx->type==SSCONFLICT ||