diff --git a/.github/workflows/update-nightly.yml b/.github/workflows/update-nightly.yml
index b9c30f2a5..e9da2151f 100644
--- a/.github/workflows/update-nightly.yml
+++ b/.github/workflows/update-nightly.yml
@@ -27,7 +27,7 @@ jobs:
       - name: merge main
         run: |
           git fetch origin
-          git merge origin/main --strategy-option ours --no-commit --allow-unrelated-histories
+          git merge origin/main --strategy-option theirs --no-commit --allow-unrelated-histories
 
       - name: update lean-toolchain
         id: toolchain-tag
diff --git a/UnicodeBasic.lean b/UnicodeBasic.lean
index b55675191..e6d0d91e3 100644
--- a/UnicodeBasic.lean
+++ b/UnicodeBasic.lean
@@ -49,7 +49,7 @@ namespace Unicode
 /-- Get character name
 
   When the Unicode property `Name` is empty, a unique code label is returned
-  as recommended in Unicode Standard, section 4.8. These labels start with
+  as described in Unicode Standard, section 4.8. These labels start with
   `'<'` (U+003C) and end with `'>'` (U+003E) so they are distinguishable from
   actual name values.
 
diff --git a/lakefile.lean b/lakefile.lean
index 6b41b54a4..935eced41 100644
--- a/lakefile.lean
+++ b/lakefile.lean
@@ -19,7 +19,7 @@ target UnicodeCLib pkg : FilePath := do
     if file.path.extension == some "c" then
       let obj := pkg.buildDir / "UnicodeCLib" / ((file.fileName.dropSuffix ".c" |>.copy) ++ ".o")
       let src ← inputTextFile file.path
-      let weakArgs := #["-I", (← getLeanIncludeDir).toString, "-I", (pkg.dir / "UnicodeCLib").toString, "-O", "-fPIC"]
+      let weakArgs := #["-I", (← getLeanIncludeDir).toString, "-O", "-fPIC"]
       oFiles := oFiles.push <| ← buildO obj src weakArgs
   let name := nameToStaticLib "unicodeclib"
   buildStaticLib (pkg.sharedLibDir / name) oFiles
diff --git a/lean-toolchain b/lean-toolchain
index ccec351f4..14791d727 100644
--- a/lean-toolchain
+++ b/lean-toolchain
@@ -1 +1 @@
-leanprover/lean4:v4.29.0-rc8
+leanprover/lean4:v4.29.0