From b5f68017a9c2f1a562f9b30cf0739e4439ae2db9 Mon Sep 17 00:00:00 2001
From: Laurenz <laurmaedje@gmail.com>
Date: Wed, 5 Nov 2025 16:54:57 +0100
Subject: [PATCH 01/54] Add missing Typst 0.14 changelog entry (#7285)

---
 docs/changelog/0.14.0.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/docs/changelog/0.14.0.md b/docs/changelog/0.14.0.md
index 6db75e3bf9..a6e060ad94 100644
--- a/docs/changelog/0.14.0.md
+++ b/docs/changelog/0.14.0.md
@@ -285,6 +285,9 @@ _Thanks to [@mkorje](https://github.com/mkorje) for his work on math!_
 - The `--make-deps` CLI flag in favor of `--deps` with `--deps-format make` [#7022]
 - Various symbols, see the [deprecation section in the dedicated changelog](https://github.com/typst/codex/blob/v0.2.0/CHANGELOG.md#deprecated) for a full listing
 
+## Removals
+- Removed compatibility behavior of type/str comparisons (e.g. `{int == "integer"}`), which was temporarily introduced in Typst 0.8 and deprecated in Typst 0.13 **(Breaking change)**
+
 ## Development
 - The `Default` impl for `Library` had to be removed for crate splitting and trait coherence reasons, but you can get a drop-in replacement via `use typst::LibraryExt` [#6576]
 - The `PdfOptions` struct has a new `tagged` field, which defaults to `{true}` [#6619] [#7046]

From 29e742904d71608103e4a29e741d0b8b8d5a5152 Mon Sep 17 00:00:00 2001
From: Tobias Schmitz <tobiasschmitz2001@gmail.com>
Date: Mon, 27 Oct 2025 10:32:37 +0100
Subject: [PATCH 02/54] Fix panic in PDF backend due to ambiguous logical
 parent (#7216)

---
 crates/typst-pdf/src/tags/tree/mod.rs         | 10 ++++-
 .../query-tags-ambiguous-parent-footnote.yml  | 37 +++++++++++++++++++
 .../query-tags-ambiguous-parent-place.yml     |  4 ++
 tests/suite/pdftags/query.typ                 | 14 ++++++-
 4 files changed, 61 insertions(+), 4 deletions(-)
 create mode 100644 tests/ref/pdftags/query-tags-ambiguous-parent-footnote.yml
 create mode 100644 tests/ref/pdftags/query-tags-ambiguous-parent-place.yml

diff --git a/crates/typst-pdf/src/tags/tree/mod.rs b/crates/typst-pdf/src/tags/tree/mod.rs
index c4d72df209..0919f766c2 100644
--- a/crates/typst-pdf/src/tags/tree/mod.rs
+++ b/crates/typst-pdf/src/tags/tree/mod.rs
@@ -385,10 +385,16 @@ fn close_group(tree: &mut Tree, surface: &mut Surface, id: GroupId) -> GroupId {
         GroupKind::LogicalParent(elem) => {
             let loc = elem.location().unwrap();
             // Insert logical children when closing the logical parent, so they
-            // are at the end of the group.
-            if let Some(children) = tree.logical_children.get(&loc) {
+            // are at the end of the group. In some cases there might be
+            // multiple parent groups with the same location, only insert the
+            // children for the first parent group.
+            if let Some(located) = tree.groups.by_loc(&loc)
+                && located.id == id
+                && let Some(children) = tree.logical_children.get(&loc)
+            {
                 tree.groups.push_groups(id, children);
             }
+
             tree.groups.push_group(direct_parent, id);
         }
         GroupKind::LogicalChild(inherit, logical_parent) => {
diff --git a/tests/ref/pdftags/query-tags-ambiguous-parent-footnote.yml b/tests/ref/pdftags/query-tags-ambiguous-parent-footnote.yml
new file mode 100644
index 0000000000..dd769b0b2f
--- /dev/null
+++ b/tests/ref/pdftags/query-tags-ambiguous-parent-footnote.yml
@@ -0,0 +1,37 @@
+- Tag: P
+  /K:
+    - Tag: Lbl
+      /K:
+        - Tag: Link
+          /K:
+            - Annotation: page=0 index=0
+            - Tag: Span
+              /BaselineShift:   3.500
+              /LineHeight:   6.000
+              /K:
+                - Content: page=0 mcid=0
+    - Tag: Note
+      /K:
+        - Tag: Lbl
+          /K:
+            - Tag: Link
+              /K:
+                - Annotation: page=0 index=2
+                - Tag: Span
+                  /BaselineShift:   2.975
+                  /LineHeight:   5.100
+                  /K:
+                    - Content: page=0 mcid=2
+        - Content: page=0 mcid=3
+- Tag: P
+  /K:
+    - Tag: Lbl
+      /K:
+        - Tag: Link
+          /K:
+            - Annotation: page=0 index=1
+            - Tag: Span
+              /BaselineShift:   3.500
+              /LineHeight:   6.000
+              /K:
+                - Content: page=0 mcid=1
diff --git a/tests/ref/pdftags/query-tags-ambiguous-parent-place.yml b/tests/ref/pdftags/query-tags-ambiguous-parent-place.yml
new file mode 100644
index 0000000000..937505c3f0
--- /dev/null
+++ b/tests/ref/pdftags/query-tags-ambiguous-parent-place.yml
@@ -0,0 +1,4 @@
+- Tag: Span
+  /Placement: Block
+  /K:
+    - Content: page=0 mcid=0
diff --git a/tests/suite/pdftags/query.typ b/tests/suite/pdftags/query.typ
index d4ca292b02..5e9cdd6d3c 100644
--- a/tests/suite/pdftags/query.typ
+++ b/tests/suite/pdftags/query.typ
@@ -10,16 +10,26 @@
 
 #context query(<figure>).at(0)
 
---- query-tags-ambiguous-parent-place pdftags ---
+--- query-tags-ambiguous-parent-place-error pdftags ---
 // Error: 2-43 PDF/UA-1 error: ambiguous logical parent
 // Hint: 2-43 please report this as a bug
 #place(float: true, top + left)[something] <placed>
 
 #context query(<placed>).join()
 
---- query-tags-ambiguous-parent-footnote pdftags ---
+--- query-tags-ambiguous-parent-place pdftags nopdfua ---
+#place(float: true, top + left)[something] <placed>
+
+#context query(<placed>).join()
+
+--- query-tags-ambiguous-parent-footnote-error pdftags ---
 // Error: 1:2-1:21 PDF/UA-1 error: ambiguous logical parent
 // Hint: 1:2-1:21 please report this as a bug
 #footnote[something] <note>
 
 #context query(<note>).join()
+
+--- query-tags-ambiguous-parent-footnote pdftags nopdfua ---
+#footnote[something] <note>
+
+#context query(<note>).join()

From dfc7e08378033a4b6af571d584feeaab68bcddd1 Mon Sep 17 00:00:00 2001
From: "Y.D.X." <73375426+YDX-2147483647@users.noreply.github.com>
Date: Mon, 27 Oct 2025 22:22:09 +0800
Subject: [PATCH 03/54] Specify the signature of `layout.func` in documentation
 (#7199)

---
 crates/typst-library/src/layout/layout.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crates/typst-library/src/layout/layout.rs b/crates/typst-library/src/layout/layout.rs
index 8855813c13..25a2660f31 100644
--- a/crates/typst-library/src/layout/layout.rs
+++ b/crates/typst-library/src/layout/layout.rs
@@ -69,7 +69,7 @@ pub fn layout(
     /// displayed in the document.
     ///
     /// The container's size is given as a [dictionary] with the keys `width`
-    /// and `height`.
+    /// and `height`, both of type [`length`].
     ///
     /// This function is called once for each time the content returned by
     /// `layout` appears in the document. This makes it possible to generate

From 00dbfab0e61ecdc40599e546d113b8861a48ac3a Mon Sep 17 00:00:00 2001
From: Malo <57839069+MDLC01@users.noreply.github.com>
Date: Mon, 27 Oct 2025 14:38:21 +0000
Subject: [PATCH 04/54] Properly document the default value of `array.join`'s
 `default` parameter (#7218)

Co-authored-by: Laurenz <laurmaedje@gmail.com>
---
 crates/typst-library/src/foundations/array.rs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/crates/typst-library/src/foundations/array.rs b/crates/typst-library/src/foundations/array.rs
index 16105f96c9..e4e8bbb487 100644
--- a/crates/typst-library/src/foundations/array.rs
+++ b/crates/typst-library/src/foundations/array.rs
@@ -720,6 +720,7 @@ impl Array {
         last: Option<Value>,
         /// What to return if the array is empty.
         #[named]
+        #[default]
         default: Option<Value>,
     ) -> StrResult<Value> {
         let len = self.0.len();

From a7644652b99a2884ff65b42229d6d146f6fa9f0b Mon Sep 17 00:00:00 2001
From: "Y.D.X." <73375426+YDX-2147483647@users.noreply.github.com>
Date: Mon, 27 Oct 2025 22:47:02 +0800
Subject: [PATCH 05/54] Document the OpenType contextual alternates (`calt`)
 feature (#7169)

---
 crates/typst-library/src/text/mod.rs | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/crates/typst-library/src/text/mod.rs b/crates/typst-library/src/text/mod.rs
index 833564b703..33c9fe070f 100644
--- a/crates/typst-library/src/text/mod.rs
+++ b/crates/typst-library/src/text/mod.rs
@@ -643,6 +643,11 @@ pub struct TextElem {
     /// #set text(ligatures: false)
     /// A fine ligature.
     /// ```
+    ///
+    /// Note that some programming fonts use other OpenType font features to
+    /// implement "ligatures," including the contextual alternates (`calt`)
+    /// feature, which is also enabled by default. Use the general
+    /// [`features`]($text.features) parameter to control such features.
     #[default(true)]
     #[ghost]
     pub ligatures: bool,
@@ -721,11 +726,19 @@ pub struct TextElem {
     /// - If given a dictionary mapping to numbers, sets the features
     ///   identified by the keys to the values.
     ///
-    /// ```example
+    /// ```example:"Give an array of strings"
     /// // Enable the `frac` feature manually.
     /// #set text(features: ("frac",))
     /// 1/2
     /// ```
+    ///
+    /// ```example:"Give a dictionary mapping to numbers"
+    /// #set text(font: "Cascadia Code")
+    /// =>
+    /// // Disable the contextual alternates (`calt`) feature.
+    /// #set text(features: (calt: 0))
+    /// =>
+    /// ```
     #[fold]
     #[ghost]
     pub features: FontFeatures,

From 68a41d7114b85a101655d217aa436141d05167d6 Mon Sep 17 00:00:00 2001
From: "Y.D.X." <73375426+YDX-2147483647@users.noreply.github.com>
Date: Mon, 27 Oct 2025 23:02:02 +0800
Subject: [PATCH 06/54] Improve the docs for relative lengths (#6897)

---
 crates/typst-library/src/layout/container.rs | 12 +++++++-----
 crates/typst-library/src/layout/rel.rs       |  4 ++--
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/crates/typst-library/src/layout/container.rs b/crates/typst-library/src/layout/container.rs
index bebc20ee10..f50384b13c 100644
--- a/crates/typst-library/src/layout/container.rs
+++ b/crates/typst-library/src/layout/container.rs
@@ -77,8 +77,10 @@ pub struct BoxElem {
     /// other dictionary entries). All keys are optional; omitted keys will use
     /// their previously set value, or the default value if never set.
     ///
-    /// [Relative lengths]($relative) are relative to the box size without
-    /// outset.
+    /// [Relative lengths]($relative) for this parameter are relative to the box
+    /// size excluding [outset]($box.outset). Note that relative insets and
+    /// outsets are different from relative [widths]($box.width) and
+    /// [heights]($box.height), which are relative to the container.
     ///
     /// _Note:_ When the box contains text, its exact size depends on the
     /// current [text edges]($text.top-edge).
@@ -92,9 +94,9 @@ pub struct BoxElem {
     /// How much to expand the box's size without affecting the layout.
     ///
     /// This can be a single length for all sides or a dictionary of lengths for
-    /// individual sides. [Relative lengths]($relative) are relative to the box
-    /// size without outset. See the documentation for [inset]($box.inset) above
-    /// for further details.
+    /// individual sides. [Relative lengths]($relative) for this parameter are
+    /// relative to the box size excluding outset. See the documentation for
+    /// [inset]($box.inset) above for further details.
     ///
     /// This is useful to prevent padding from affecting line layout. For a
     /// generalized version of the example below, see the documentation for the
diff --git a/crates/typst-library/src/layout/rel.rs b/crates/typst-library/src/layout/rel.rs
index d77ef0d1db..9e41e0d4c0 100644
--- a/crates/typst-library/src/layout/rel.rs
+++ b/crates/typst-library/src/layout/rel.rs
@@ -59,8 +59,8 @@ use crate::layout::{Abs, Em, Length, Ratio};
 /// [floats]($float).
 ///
 /// A relative length has the following fields:
-/// - `length`: Its length component.
-/// - `ratio`: Its ratio component.
+/// - `length`: Its [length] component.
+/// - `ratio`: Its [ratio] component.
 ///
 /// ```example
 /// #(100% - 50pt).length \

From fa23f930df9d52f40731d9313b2dd84d071b7ba8 Mon Sep 17 00:00:00 2001
From: Toon Verstraelen <Toon.Verstraelen@UGent.be>
Date: Tue, 28 Oct 2025 16:29:35 +0100
Subject: [PATCH 07/54] Do not create empty Make deps file when writing to
 standard output (#7246)

---
 crates/typst-cli/src/deps.rs | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/crates/typst-cli/src/deps.rs b/crates/typst-cli/src/deps.rs
index 921400a88d..bdd97f8c48 100644
--- a/crates/typst-cli/src/deps.rs
+++ b/crates/typst-cli/src/deps.rs
@@ -64,7 +64,7 @@ fn write_deps_make(
     dest: &Output,
     outputs: &[Output],
 ) -> io::Result<()> {
-    let mut dest = dest.open()?;
+    let mut buffer = Vec::new();
     for (i, output) in outputs.iter().enumerate() {
         let path = match output {
             Output::Path(path) => path.as_os_str(),
@@ -82,10 +82,14 @@ fn write_deps_make(
         // processed.
         let Some(string) = path.to_str() else { continue };
         if i != 0 {
-            dest.write_all(b" ")?;
+            buffer.write_all(b" ")?;
         }
-        dest.write_all(munge(string).as_bytes())?;
+        buffer.write_all(munge(string).as_bytes())?;
     }
+
+    // Only create the deps file in case of valid output paths.
+    let mut dest = dest.open()?;
+    dest.write_all(&buffer)?;
     dest.write_all(b":")?;
 
     for dep in relative_dependencies(world)? {

From 0166c2f9d4c660ade5c8cf851342932bce6ad0bd Mon Sep 17 00:00:00 2001
From: Andrew Voynov <37143421+Andrew15-5@users.noreply.github.com>
Date: Thu, 30 Oct 2025 12:00:02 +0300
Subject: [PATCH 08/54] Document version type comparison (#7152)

Co-authored-by: Malo <57839069+MDLC01@users.noreply.github.com>
Co-authored-by: Laurenz <laurmaedje@gmail.com>
---
 crates/typst-library/src/foundations/version.rs | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/crates/typst-library/src/foundations/version.rs b/crates/typst-library/src/foundations/version.rs
index 71b0b71535..39f3cdf9f8 100644
--- a/crates/typst-library/src/foundations/version.rs
+++ b/crates/typst-library/src/foundations/version.rs
@@ -65,13 +65,22 @@ impl Version {
     ///
     /// It can have any number of components (even zero).
     ///
-    /// ```example
+    /// ```example:"Constructing versions"
     /// #version() \
     /// #version(1) \
     /// #version(1, 2, 3, 4) \
     /// #version((1, 2, 3, 4)) \
     /// #version((1, 2), 3)
     /// ```
+    ///
+    /// As a practical use case, this allows comparing the current version
+    /// ([`{sys.version}`]($version)) to a specific one.
+    ///
+    /// ```example:"Comparing with the current version"
+    /// Current version: #sys.version \
+    /// #(sys.version >= version(0, 14, 0)) \
+    /// #(version(3, 2, 0) > version(4, 1, 0))
+    /// ```
     #[func(constructor)]
     pub fn construct(
         /// The components of the version (array arguments are flattened)

From f7fbc8ab6ebe1134b289769d12570b51681b1cfe Mon Sep 17 00:00:00 2001
From: Malo <57839069+MDLC01@users.noreply.github.com>
Date: Thu, 30 Oct 2025 11:26:21 +0000
Subject: [PATCH 09/54] Minor fixes to documentation groups (#7242)

---
 docs/guides/tables.md     |  8 ++++----
 docs/reference/groups.yml | 12 ++++++------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/docs/guides/tables.md b/docs/guides/tables.md
index c726dbf5eb..77df47d813 100644
--- a/docs/guides/tables.md
+++ b/docs/guides/tables.md
@@ -800,9 +800,9 @@ calendar.
 >>>
 >>> #show table.cell.where(y: 0): strong
 #set table(stroke: (x, y) => (
-  left: if x == 0 or y > 0 { 1pt } else { 0pt },
+  left: if x == 0 or y > 0 { 1pt } else { 0pt },
   right: 1pt,
-  top: if y <= 1 { 1pt } else { 0pt },
+  top: if y <= 1 { 1pt } else { 0pt },
   bottom: 1pt,
 ))
 
@@ -1037,7 +1037,7 @@ on the right of the table.
     inset: (x: 0.6em,),
     stroke: (_, y) => (
       x: 1pt,
-      top: if y <= 1 { 1pt } else { 0pt },
+      top: if y <= 1 { 1pt } else { 0pt },
       bottom: 1pt,
     ),
     align: (left, right, right, right, right, left),
@@ -1090,7 +1090,7 @@ upright:
     inset: (x: 0.6em,),
     stroke: (_, y) => (
       x: 1pt,
-      top: if y <= 1 { 1pt } else { 0pt },
+      top: if y <= 1 { 1pt } else { 0pt },
       bottom: 1pt,
     ),
     align: (left, right, right, right, right, left),
diff --git a/docs/reference/groups.yml b/docs/reference/groups.yml
index 9acaab2bec..f76c9c29a1 100644
--- a/docs/reference/groups.yml
+++ b/docs/reference/groups.yml
@@ -138,7 +138,7 @@
     the constants `pi`, `tau`, `e`, and `inf`.
 
 - name: std
-  title: Standard library
+  title: Standard Library
   category: foundations
   path: ["std"]
   details: |
@@ -251,11 +251,11 @@
     # Example
     ```typ
     #html.video(
-      controls: true,
-      width: 1280,
-      height: 720,
-      src: "sunrise.mp4",
+      controls: true,
+      width: 1280,
+      height: 720,
+      src: "sunrise.mp4",
     )[
-      Your browser does not support the video tag.
+      Your browser does not support the video tag.
     ]
     ```

From 0b71b5c645f3ef1fcd58e30c96a58b82007c109c Mon Sep 17 00:00:00 2001
From: Ian <ian@isuffix.com>
Date: Fri, 31 Oct 2025 10:04:58 -0400
Subject: [PATCH 10/54] Always treat `TextElem` fragments as spaced in math
 (#7276)

---
 crates/typst-layout/src/math/text.rs   |   4 +---
 tests/ref/math-spacing-kept-spaces.png | Bin 884 -> 1176 bytes
 tests/suite/math/spacing.typ           |   3 ++-
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/crates/typst-layout/src/math/text.rs b/crates/typst-layout/src/math/text.rs
index f15936d6b4..66a718c4ca 100644
--- a/crates/typst-layout/src/math/text.rs
+++ b/crates/typst-layout/src/math/text.rs
@@ -97,8 +97,6 @@ fn layout_inline_text(
             .chars()
             .flat_map(|c| to_style(c, MathStyle::select(c, variant, bold, italic)))
             .collect();
-
-        let spaced = styled_text.graphemes(true).nth(1).is_some();
         let elem = TextElem::packed(styled_text).spanned(span);
 
         // There isn't a natural width for a paragraph in a math environment;
@@ -118,7 +116,7 @@ fn layout_inline_text(
         Ok(FrameFragment::new(styles, frame)
             .with_class(MathClass::Alphabetic)
             .with_text_like(true)
-            .with_spaced(spaced))
+            .with_spaced(true))
     }
 }
 
diff --git a/tests/ref/math-spacing-kept-spaces.png b/tests/ref/math-spacing-kept-spaces.png
index bb433d4fc5e46ac6ee1f17263cfb9870adaac05b..0f638c21092408099055358d002ae757d832c2a2 100644
GIT binary patch
delta 1169
zcmV;C1aABE2ABzu7k@(t00000a<ZOa000DENkl<Zc-rmOSxgjn9Kdnk`&?hDX&>6e
zO46iPqJ3ygMdJxQmDEbAU~3P-ltTq6wuq&%a<oN`<&;YnfdX=D5wXZ2$h9E1pu5~q
zC@dfgyF1_3nXqgc+86)CX!iT|-`^ykWHa-dS;J#$jUBebc7OP3gLP(TG$B`uHR;~+
z`OjX&!*L!l3>KnP)5=mFpLC(op>)Y89(FWZ_<^N@L1}K!0-OV-=}6&lo<ljNqhQV~
zD$NJq3FH>f?CPK{7KSg^WLJTkaJbzAdV}H0;=cM2NUTIDG8f{iA&rgt1aOx`!|4g2
zjRJ`+0Kb)>bbq7|!aG3fcLne?iiUj~V8j<%?z>P8;f;&{;0R<Cv(S|kJ>3Sbh=!dP
z0Z(vG3P>IT9}{jj0kab@@DqB^sB`fa@DvQ|?tBf9Folxo7Z~e@s<H%tP*7^q2!?NX
z-jls#l+*^e1w;f|0D8-jGbgRq%A7JGH;y&i^R&tSl7Dz)xTq7kF#!6nAUB+425cw5
zoO((i9B4pJ#jINc^Zv*cUBg<ea$OoyidG;T$`Z`JN$atw>)-H?rBEgqwrGtq?AUFx
zg(tdfVdt(X(eMMecIPHkv~AIUVFQ;2m%g_QTO8Uw9teg*64|wgil}T}Gh1Qvt0t}2
zGF*QW_kY`h;l29#JwvECet+a`tZ?7^gcl51;nXZ%pA`&WXpA|mMnz_YS2Llo-S`le
zj&|-=^;+T1*q_x1hUqZ&NT{IOARkK&4`JpzjXJC_gTsi1l~mTFX2r(|1j9jfw%@f~
z-XH-@-<tv331INk*<TV*ENlV5oY=O)?@HQ)ReymU^#J%(0Jiz$fzs?dqG8*18~Ly5
zPKkzdl0t6W-85cblA64@p)>-y`1HV5VCDnOWJ=+80OwC$suc=%xZq#Kr(<EkgRPZ*
zd^8SF_6@FjfXKp|huc~J-kt0@A`}kDWaq*^@I?Afbwmjc3jl|z*(xdUtmZ%fzz#A_
z3x9<ps=Bx5aB%p9!E`pcz9@)%J$UOY59Y|z{J44o0gmzEuuyoepyqOW_l2DD63wKs
zAQy^rVIsdNsSo%o;$l;YrVpSs^X@7ykOBQ;+FbqiUHw$TI*=p@B~zPmVZnBUGF@)8
z4}%c6WivB@&nHHG-T}tbVHIbcW<lw?6Mq27&&0%eUPZ3qm^$}cKOu1FdeFZGu^%IC
zyA38sP%`<yiQIZ<eF1=~y=M3|O9Y%Z^sEfe?awCiOMo&^N*i6b1Y3em0Z1FVftGOr
z@Jt#T$I!og_2OqeY|~)Va2{(V1ujTC^anumE5dHB=$Lqi7WuEP-NcInKm{nBkAI6_
zH>$ue|J)Ri>jF?A0B$aa0~#5=^%8Es!&EekT7c_X*s5KE4QmI1!OcL1?$P1OU6r)&
z_Z|=08W(n=gUPSLQ`JCl3KZ{XrQYd`1SGu?743Bmfc)bL$#+&`fk*(DoB#I;;jpy^
jvwc_FVLNPxSL|;R{Z)TCnv$Xb015yANkvXXu0mjf(^oPQ

delta 874
zcmV-w1C{)k3G@b#7k@Pf00000ugP${0009!Nkl<Zc-rmO=}!}B0LO9voXzrTci-%*
zjoBq;J$CVqiAq#3(L||H!IR*HVmzxslwv6!C{;lr)Hao1ltZzC6$=yv?I4tZAXJc{
zGo7!<z|eTS@*zgk@4MejlTXrQo|zeZr)I?97#xFtHaMU{y?+7#4>8hSPVF~sh==o1
z&e2(pUTq_jrL6Gd3ZQpE77xeE5e^wElZl4sjl#jnHJB|Nz7<!AvJTWDhr1Ng`T!uj
zXHGM9xe&Zsd!rhXgu_iK(3T0;!%IC`kY9yfb_wLwz-4}wtdOjUh6}CW%>j*>05_fJ
zt!;;s&7gH80)Lof(Qw*h=uU&Dua;3WX4TUTKs<2eHlu#q*+Cy9A{tHz113ner5AKT
zszTCzK>Z(heH6)*bMSlwOoHLSvkd^&0rZs9(9;3c6;^=bOyqM3hVPnQj(Y{@*+cLE
zFlR&n+A0A+wN2NNIiLVQFGkUOP>H=Hz8QA306-4_9e>yL6}+Yb(RYAh`+z_=BLn~z
zhLRpLvP)l%I~e8azq^cf(JK%>&Lqszeq%cPpTdXTP$3wOc;#_8zEz2a`~1;xf`33X
z{648Ep#clNnbP_w*q!NKFa<~Ano`~ihO_dS6UIW$4SrV*Sp7}$Zkd8T+ev;T82(Qh
znb(DdO@FVt|H6RV7jm+!%YZLk<BuW1@Ui-HYwTDky0_)Y*kqRc5!TkV%(b)`a7*qf
zJAz@F<>wj}Xbp`|cjzO`NQ)f6fawe(8rHKI)Ahy22?WFY>!QDF{aZl;8uqC`^c^6y
zGZ1@8{IGBY05#wD+4af1)@gy`B>+<IeR4hZ7Jm~B{XLz3^<0^+RkuSlTx`p_`{K`D
zkMmMN_!qYs0L~X?Gy?Ayx%w}b?*%xr{lY_`aPu;DRkNz+L}q7W)lQc50#s}!Q3A*=
zzrV)!6kvY;^R+_Z^de@Dj=_C}v+ZUlaiajMYxqag;UU-Zbbx=kvRf!@u5O)G%*x=l
zkYjS7z~k6YsRUc4s+Gk6=F&V582}qu925!<m(^ZvYCTq5>2&qWWhHRC1o}!FZ0*2X
z^O**xs~w=R=*2W2Ag`tGbaHjX&gvK(gMSG40~bgbur*__T>t<807*qoM6N<$g8I6p
AoB#j-

diff --git a/tests/suite/math/spacing.typ b/tests/suite/math/spacing.typ
index db8b905c63..481c421f26 100644
--- a/tests/suite/math/spacing.typ
+++ b/tests/suite/math/spacing.typ
@@ -19,7 +19,8 @@ $f(x) sin(y)$
 // Test ignored vs non-ignored spaces.
 $f (x), f(x)$ \
 $[a|b], [a | b]$ \
-$a"is"b, a "is" b$
+$a"is"b, a "is" b$ \
+$A"B"C, A "B" C$
 
 --- math-spacing-predefined ---
 // Test predefined spacings.

From e8dc6d3655c8308808d6eca29bf4cb021c646afb Mon Sep 17 00:00:00 2001
From: Brian Wilson <15809934+bountonw@users.noreply.github.com>
Date: Wed, 5 Nov 2025 22:55:29 +0700
Subject: [PATCH 11/54] Update link on selector page to point to element
 functions (#7289)

---
 crates/typst-library/src/foundations/selector.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crates/typst-library/src/foundations/selector.rs b/crates/typst-library/src/foundations/selector.rs
index 4fa9238968..abc5898e09 100644
--- a/crates/typst-library/src/foundations/selector.rs
+++ b/crates/typst-library/src/foundations/selector.rs
@@ -38,7 +38,7 @@ pub use crate::__select_where as select_where;
 /// A filter for selecting elements within the document.
 ///
 /// To construct a selector you can:
-/// - use an element [function]
+/// - use an [element function]($function/#element-functions)
 /// - filter for an element function with [specific fields]($function.where)
 /// - use a [string]($str) or [regular expression]($regex)
 /// - use a [`{<label>}`]($label)

From 47e5b2b1f1c7692ff1ac9ec92f95ce61b01f5c0a Mon Sep 17 00:00:00 2001
From: Max <max@mkor.je>
Date: Wed, 5 Nov 2025 16:00:23 +0000
Subject: [PATCH 12/54] Fix spacing around mat/vec/cases (#7309)

---
 crates/typst-layout/src/math/mat.rs  |   3 +++
 tests/ref/math-cases-delim-class.png | Bin 0 -> 321 bytes
 tests/ref/math-mat-delim-class.png   | Bin 0 -> 281 bytes
 tests/ref/math-mat-spread-2d.png     | Bin 3391 -> 3387 bytes
 tests/ref/math-vec-delim-class.png   | Bin 0 -> 281 bytes
 tests/suite/math/cases.typ           |   5 +++++
 tests/suite/math/mat.typ             |   5 +++++
 tests/suite/math/vec.typ             |   5 +++++
 8 files changed, 18 insertions(+)
 create mode 100644 tests/ref/math-cases-delim-class.png
 create mode 100644 tests/ref/math-mat-delim-class.png
 create mode 100644 tests/ref/math-vec-delim-class.png

diff --git a/crates/typst-layout/src/math/mat.rs b/crates/typst-layout/src/math/mat.rs
index 743c8b1791..92e7316288 100644
--- a/crates/typst-layout/src/math/mat.rs
+++ b/crates/typst-layout/src/math/mat.rs
@@ -7,6 +7,7 @@ use typst_library::math::{Augment, AugmentOffsets, CasesElem, MatElem, VecElem};
 use typst_library::text::TextElem;
 use typst_library::visualize::{FillRule, FixedStroke, Geometry, LineCap, Shape};
 use typst_syntax::Span;
+use unicode_math_class::MathClass;
 
 use super::{
     AlignmentResult, DELIM_SHORT_FALL, FrameFragment, GlyphFragment, LeftRightAlternator,
@@ -348,6 +349,7 @@ fn layout_delimiters(
             ctx.layout_into_fragment(&SymbolElem::packed(left_c).spanned(span), styles)?;
         left.stretch_vertical(ctx, target, short_fall);
         left.center_on_axis();
+        left.set_class(MathClass::Opening);
         ctx.push(left);
     }
 
@@ -358,6 +360,7 @@ fn layout_delimiters(
             ctx.layout_into_fragment(&SymbolElem::packed(right_c).spanned(span), styles)?;
         right.stretch_vertical(ctx, target, short_fall);
         right.center_on_axis();
+        right.set_class(MathClass::Closing);
         ctx.push(right);
     }
 
diff --git a/tests/ref/math-cases-delim-class.png b/tests/ref/math-cases-delim-class.png
new file mode 100644
index 0000000000000000000000000000000000000000..543706a95735c2ce5a77e29cfdc113e41b0a175b
GIT binary patch
literal 321
zcmeAS@N?(olHy`uVBq!ia0vp^6+mpl0VEhwrY@FbU|{6%ba4!+xb^m$y|+`LNPFS^
zh-5*J3)iM4R68q}e4DM;*yybL{Luy8y-yZAvCi;_63SU|)RFbScGrsTQ;$o`pBJ;A
zpLy=v&3!hUNxNDOvPtJ`(Ap#E63=map46R_PbYIT2pqflpk@t={j;5#ZX4#SeqO_J
zetAq?5Z4~5Lq#6D7O@<@uG=e8ZqM;ywi|bz{l)V&1>0N`p1l3#_2JDfk&r#V;y3kd
z@Y*ZR<yCOj@_KB@{`>y~U!B{z>|cXN%xTeEVL%Ikw$>~#a%M<c;lt>#-$*%PzY%NE
z(chg_sY*Ze=j2_{7JitrW8a1KJ}ugD@~2)+?Yywc>`!A|su$dV<81F4kFxN{8fd-{
P2ZfENtDnm{r-UW|TxN^<

literal 0
HcmV?d00001

diff --git a/tests/ref/math-mat-delim-class.png b/tests/ref/math-mat-delim-class.png
new file mode 100644
index 0000000000000000000000000000000000000000..415dc199b7f938ac5e2eebd51c386e19493eb1fb
GIT binary patch
literal 281
zcmeAS@N?(olHy`uVBq!ia0vp^6+mpl0VEhwrY@EQQV%>`978H@y}h=#&yi7pH9>#l
z`3+~yZs)DMr%}l!G}Z5^+rkBkEUi&7E)`5&7gv}FPx4l;b5<3scXukRKALeZ#Q5rU
zA3r|^`B@B!hgvwJ5B*j)_!PI>oatJ+^p3Y~n+0lRwN{uO))oGdU;b;?&ks-8FUJd4
zw4F6~*?1zvE1;46r+H)J4hNBg&Bqon-BB)<-eGs=o{PF-$X)e0->0b+nBVkpC=uPy
z#-1!HQq((zGp1yYk;}#Rp6puRw>;ia#`vgyYhlq(#zSk=d}bIV9?F>sgDsrGYJa}j
ZFnnrdS-dFi@LG_cJzf1=);T3K0RY{(akT&d

literal 0
HcmV?d00001

diff --git a/tests/ref/math-mat-spread-2d.png b/tests/ref/math-mat-spread-2d.png
index 85cb4a6ad060498c9549f1c72957a8df96c90ca4..aac0cbcc9b74db394171b2a8b1b78ced402f3bf4 100644
GIT binary patch
delta 3384
zcmV-84af4o8oL^hB!2=)L_t(|+U=e9Q&d?N$NdN9=lyM}<_BvW$5?BXq1Ih<SaV);
z&Uwu_>zK2SIp>_$P@tj$0)l{|Ac!I=h)5D7=-bcCsk!y4!{c=~GB$I+MNzjem+t1<
z@11+@Ip1@rWN4HNDrpKd(VA!tO|&Lj6Rn|%)<kP)qALv1hkp(oGCaq_hYue;dZdZ=
z0PEJRGd#z=d-uY^!Zgv|5dHGy%k$^YpFMl_%a<?C%kuN{`B7qGq9)o`qK6J0%J=*C
z?{D3@)p=Q9U?2-FU%sq~_KE1^<m7(+`Z3^gZqlTQ%a!xy&C^8tO7!j9w}%ZICNov4
zRMA9#Euw>igMY<zfa=w&Yofmv(XU^>?%K60gY4|=_U+r-CptGbH!UsA@N+zS_N@Fi
z!_})-$Hc^}Sh0eu+j&_)KtS{6&4&*k9vvNRCi=;fCqY3$YT2hxpA4T-R8(ZW!1q^S
zD=IE7Ru6aV*io*2^otiSxT0MyD=8`Y{0H0-ot2d}YJb!y8K>+HjO@8ScJ!_<C9JnX
zPE>M4=he}Jf0c(kf8V}+E!OiUXU?1{<G4xtga0u%_fd*b8WQH8i0HEVVgJo}aj$ro
zmzT$$RPIE32zNv;UAi<RB!t1|{KAmN3m80Gd^+uXxM7Ks+ycHr{xx6CtX#R0&Dq`h
zF=NKSwSSBY-{m|Wzc(u^vGlv-eJ<ZK?>vEPnVB?cQha>8UlQHAb!#qs201Y=V@K@B
zxE`H$E)1?qzmbbe%tZ5q3l=PJx42oeX6A=Bi58?D3QAgiQO3uP9fM!LB)U<fMl#5b
ze2&pb-uS<_r$XcB9ru*z=g*%H95~S3VqV2NqJQ(Aq+&gIEqQqN?%i3lX89%2ty;B`
zE4nB%FRbly1}}cS{%Zd%2C~v7(Rc3LnLmHN7gsd)Js}~%aD{@G84;aU73buund8Tg
zZ{NQCParxoGxPA_!(z6a@!-LO4I4J#ncxz*BYN@T#i600GJZU9U+k!z_ggN({>m=@
z-G6uAxx3J!dTqGzw_(u(x5~__RjY2^ylJ?>=+UDI%g8u>&aqonCWf_MmT@D7hd7!)
z{P2U}3hWv8TP=<1voZ0PvobSz@?_q8c@r&X7JLTfDJ#exJ#E@F1{*hS<o&rL`oo70
zu%Ldc_(Pr=M@B}DA3xsWislRdL_U%}eSi8G?tx*MJ$tr{`4#zHevOBhE?ru_e7WHa
z^UBY^t^D}$<B%ak{xq*c9Z3`vgJZ{z6}#55WlMKN%O4;E=Z~tOpunbwYq8S$Rq!vZ
zeQ>k4T3A^4%@M6IWy+MJM~^C^<s|v$%^Snd!R7J|5slqsv5s|oU7{a9eth!eNq+{{
zu3gha`$Y8Bt5>nVL^Ig9%nKxP^y7~|R;^m~r=NbpSZktn&QKGriPl7y6Vdzj?K3<F
z2StL{nrID8v?f|Z6RnBXL~CfGHPITHXic;xT0;~4S0tL6A5Viy85tSt*RR(^+a+35
z5M8=-5y=b4$;q*)@FWF8`GqFhE`P{crKYAT&C0D?x5ycC!8)%zapDB}AalLjk|j&f
z1Zkp6M_gPS;!h>R9ye|r1E`!jb*jttg9i^5Wwg2*MvNGti7p+8l2k3*#fulwx(R)4
z+qShPTA^FFZiqTG(N;it)VOhD^>F|G{R<Z^WRRYo-k?DPn?xhj+q7wuCV$!rXU?2i
zv}lofc;(6!1gs*a@6n@&O`_kwe~*Gz6K#cM%a)l-z_9>Ql11h0&Ye3ASLolrKY2oj
z$;y>0J9s9iPMtFR8OZ)95H2&KVa=g-fvXiM=79qTT&{;cJ{#QUr%#{Cj4G5fo9SJ<
zcA1rf2M->UL2=ecRMI&QlYdKBI2M(B2ua8Yh*g3|43y2L0Vtp;<0#6=F-k*zQd-Kc
zfUNt^lw^`yT>Uicca#m$_3G85RMzkr?3|P|%NUBq94S4*nl)==j3_<*(u430EAyVd
zHY}0-ASq$dseAQishN=@N3wG;aCZe9IdVkC2@6h!Hd{oMicuO~Y=6F*emU~dxII)5
z$qeO5W(g~@;Ibk5`|rO;<z@Jc0Rsk{J9kdTH*VZuQ&m42G-!}G>4j-oNbMQCJsXy|
z;=C=<Nd4L7{lh|e(ym=Q^GWK-)Pq8_9Z;TyE?vgEckiYE!2ISp$9<zjBQZALaZ*q&
zg+npJwo?lC=443R<bMO65}lNkB#LpD5Z}o=q969#oE?#*iaF-YnWKKhtw~XVpAn7e
zjQr1fr1t4oA~6e|5{<L}HHdyX`{?VVcg=NRbLY-2C!#S@7AkyfI;A-FO$Y3}di6@i
z6aqna^q{S5bTUKngiC4u=Yk^c=%89t`7Sfah%I7RR8y<x$$w8yrz$k{U=XEBQeEq=
zFq8^7N^E$Ef*0>(249OXL)n{-x^?SP3E~jV;2MmLjdfm3DK8b4?8_}$v>@8&U?RDS
zU2cX{4e?tt{uuu{Zpy(oCxTV<s%Fiau4|7|GuhMROJ+FezkB!2;y{4cp=x#I7e55Y
z^N>(X)22-gSAW3ekd-NW0%fLm@7{bcWxpBHngjX1^^rt@VpzE}aQ>vMSD{v|TCnEM
zy>sW8;UjYS+pK4y?9zITlzKRWPdYq2+^~dl?>In|y?ZBhYJ{O}5{<>c2uM{vzi627
z^Upu)1B(?XlAs3ICeZ@!-_D&oiyc=16YfoY1h)b^A%9gA_KC)R5p|-3O<ZFYisDG3
ziME2AxKx-_osJ?RB3v3u7Gr<0(G+y5`R?7j>o95Qh>D6bTMumO+O=ypZ{F+>&5-6a
zOaA~Hqskmkm@q*H{%wKA7gz(sE5I^&8BMe;ynXvtjzeB_*`xqpCucnXyPuqh>;w0M
zkg1j%Xnz5XCR!7%p^4T+Yoav;-w@FpwI#gizaY$OC(4ST(C`G%BB~0XiB^52{2XNY
z_UzdsV~c)b5+?Hq#3A6?SEA`4Pgh;Oo7FSY4%HWk2Gs(YnVDQ)W&0{bxGZ=ixJYhW
z-NA(R5hl2N4<wt2^GF*`0nJ|sSo%aXflb0m4u4`AA(}RQ;q8|5mHYUWVF_BBp&+<j
z^}og0`7%RSR>_UI1GyrVa0>qCJUhAr<O$*JS3KypmM(=#m`M=aoRQ#Z-Kn`%N*Bry
zD9cT-ZQC}NYJ3(WL^02ldit$oZL<j8I~Z%#Gm*clFg^QY!kehRo9sx6!rJ_zI@@tM
zNPovWm$-1@g6f(0xv&@^5=m&o5|XHu0WAboXFhb<<~4NVbIx;$NQ&f!`Wp#>$-PUG
z({KfBsSvHeN<K(0i6&$1(0>nY3YuLR-)k@@D?E`F!3+!=P(%wXvMp$?%~sDQ(E<|H
z5gk{m{BN5!Z447)Vq%CvnrD>QK_!DoO@E2#n;DYAHi<@=&-LLY(In@U5=^y?B!j8c
z6vzS4yLd;mg|f6)uU-VTy&$?I?-N3@f|Lx4SE*mWJ|BQXq)d82s-|50nUYs(*s!5Z
zqS1A9?AXyuqDfji%xu}RMd|y({=E!E1nLM>MXD+QZLT%Z?s~HdRQ8^Xfjgoxh=0x^
z6EQN8J=SrDnbXxBI&^SY#@?>1hq4=7kLJA&{fQJdAeyyFwER;EZ-~azfN1B;Kg}6s
zoEa1ccQjO`DY49S>eT7__3MT!poY0wc|4uW(TK_|JY&WT!wqm|$)L;l?dj0a=8NzA
zefqN{r<KUW<$r@p-f-n^of&Y=7k{Kn%RO^0P4(M8efqS+=PE)v1xlOP37L1fW8;vJ
zLFIYW+fZ6ri^NDJi`<pVvI%x%cdb5Y>TlC0n>cYInonybiStv5-IRA_2V9TNaw<{~
z%0p1sxVnMNUaY77CHsMeLtV*2Vjy0QeTXmlRly%G7S?NE`jjW9EM!VbihtoVpvxjF
zQpqC!BpY-E16~uii+P5QlV#GE7P=r!6RnB<OB1bZS%m|8k3(r`ojP@tccEGZqZ*V+
zXW-0ma6^dhuqQzmhaHcJ#&<z?Yg9O_{T=3+o;`cwP&#<Ad>GE2GC;p6jwvea>C>mn
zr25|wd_o=*&E`&1Vxz(V&wtXP=QYtALU(qKB%+?+bR*t0Cs@OT8Z~MVobr%prLwJX
zz-y+?#XLhe6iK{Iq7^u`bEq-T)UI9I%Og0O2B&JHVgWiFP9nr}s8hF3v}op)Iac8+
zE^x1iR<%bJ2$ZEtakT@82W4et*(4fTq`cM4HBZZ=mqbed&!|9vK7V#ImjPi_Yc2Md
zgFeAh=b#FagKE{PNmqRdb}NhIQ-*~iwZOnY!~Y@aF>+20lNSH0&pvSY_U_&56VaG6
z{BWu5@^`R(SyTfC1O!+V8d-NhqQwJ5`9!pYw5gNeiTvGtmfVm9h>m*NA0Jvcr$ABJ
z=sGAxk<h6Bf-{JB%Q370Es&#?N?H=8iPq3WYoawY(VA#Yw1y_yukn9Y-3-S6`huDO
O0000<MNUMnLSTX(E1=c@

delta 3388
zcmV-C4a4%g8owHlB!31;L_t(|+U=d!b5utb#{Dns!@l~#Wy%;Q?8R$f%dCwF-X&wA
z4VVH9H~<EdgUQL{Y{2B4bH-#4LJ1H;fIujLkPt!=3MkS0E4ud7t<jx3cV;BnBllNR
zs-D)JaKGEP`}8^AIrEA#s203pC@@4Dq74kuhG;{yfg#!uZGT{ht^q{H#>QU1eqH&G
zO`A3uqWvH`JUsmJ<;%){%%4Bs5FH57rKP3&_wV1ibLXQ+k5mP`c<~}GE^gnxeTL{@
ziJmoUR(yOsg!bvvM^(VBTemiB*zon&UmK!>CAv|gM!KhS=gzi+`sU4>hUiKl`i(c<
z&^@q8ry;tkh<|?Tt+#Z~S6_XF9b$;CDxyF8?6abxA{s4Qw#>`R3xMdmckimu2WL^W
zL|?jeY3<szQBhGp|NOJ6fW*YaF=NJj@WBTd9^QyvxpJklproWk1qTcv7H8!h{Fh@?
za40S=_Be|wx1$RR3hv#zr|eK(US3vK#$Qg%4bj`SZGXd9RB%yR7Ta${OqT@@HlA0$
zkh1(_c;iXw+rwz<YrlB$V&xt4=FN+YjHFSRlo{P=USykDzAs*0VO0A$92`G%1K*9F
zUAuPe-o3lJi1r`OM7L?vMi0jH9bt*HU|fYY8ed-QWAv3|<vrMNE_ul@>1o@xEmzmu
zc>m&yFMo8qys)^e;Q6HnW0fzwC@Cw;e@-KA!0ODyF?tN~DIrPplP6EQbm^kocgAhw
ze6oIzz1DMS!JUW77Z~_fqJQ||2TXWx&VwOChA0b!Xg7%NFt;!<L$|qLxw*NaM>G@t
zPe1*n+qXt;&e#``yzKb(KFgooO!JrM88c=aJ%4&s+2O!}19Rrg35@8Z#YdAC9+9U5
z2M)y03O%B;va)1Er>y)vb<JrSSDH^Pdsal_*|TR49z1YK^nd{a*sm%(K#jwQe){xj
zMn;DHM{K^peWu$oqH}U`s)=Y8-z!(H?AWnG*@5q|eEIT;6DMN*xS69{w{EQ)r8xyx
zntx5b(SPNw5u0=m?vx%qdMG=jtvwU=uW=XuIhs{b=4cjSWe2PpnWKv{bFX$=bn@?g
z_^U7H!i5V*jvT2f;Q52><A3YLVLYCkiPLkmeB0_E8U~?2EM*T28#b)4u<+r-hp)Z%
znj4}wZ{B?H;6Zs>`ZQnKoImD-cYCdjhkq)6p}*UL1q+mS%$_|vIyzdnd6j<92EBUq
zvbTt>N4{LH_w3oj@Tw-FZMP&=U_>V;C)0TK)mO8#v)$OyTo`4C%*;&X4$q%I7n8%A
z(aAAEeu{k0Kb~koL_|dU_U*lmXfY2$8l1%+Of&}2_uqe?pPz4h9aTs)D-X=FV1F_v
zVkR4+11CBmAz{?0Q6GNzAxomFfPVe@)v8siPMtchzy7)z(I#eSh&DtUqN|DMYcHYv
z$GUav4ADlZWQaCI8yKPu(S~S4fg#!uZD5EtL>r<F4AFmGqH!wu>mfq9L44W}?FZ4Q
zOi)LNcEV1uYcCLuiHTXZY?&e2Eq{nnp&JsJ#M!fF$B!S+fK?TM_@POYCZr5W&(x_?
z34j@*eFL@Cv}w~sfQ<x=22>6oK3v(MckkW^v8;DP|Ni|A(Z2EBci)L18e!3d2@^DZ
zi2mIW4LWx0hz!9H?F3|ipMLtOJYBzj{iI2gw8p1l!-g)2M*4+T+z{;qG=FE4Cr_5A
zM~)mp_eBHg7a4FaiALk`$tRx}qMa~(`gChPH#5LD-+V)Zl!)Jc`%T#ad5wq)1?W9I
zEEAFyR49X_sl9vmRvOW;cJACc55@7JLx;$aRd#?rt_|k%?c2AN1@FA`j&+(|wQ7|$
z{bu9FjiTR8TYon1T9TXWhkvJ+6S7X-5QQldl*<YLMJZVs`y)xwP`-fNKXuiqoGW)F
ze}`M#sxkzXLv;Q6^^=m4RM24ML|82uPS)uNdG6e~b9FnS<;=`O(d6^w-+rhZksF<u
zFnQOd`eUT$+i$;hP=_)Cwrts=+X)kQhBuj<eZjX-5xF}#A8`ZMB!5iUp?kV_@6K43
z1ICUWTRB7{z(stof=17tJtZgZ<jIpPsx(BTtc~>IjGU-;vuQlq8*%TK{mK_azAx*C
zgN&qAt5(*X)UDwgg=nA1k55C9uG_0uuin0WyY<VnkNcAnjkwr)$2D%;SU2)wQ)2tB
zi0Qf@edlHJ&io~sEPqE`3cwa(I|V@WwH`}yqY`!d!i5Xt#*LGIaciceq=XpJOr4|}
zBC^js62r9MFVPtLRYCOav0EQ*y(mx5pFdABYc&zgB;}B%%AAhK-u=`8J85ZYx_$ZI
z6QKKguVpNBx~E&WZnoLA<wYgj(dX+9=dbQLeE6_~4~q;Gd4C@=JFoZtm5ig3?0lUw
zz|5=ckT~by&B5#Vh@#}jx(8beH$&x59Up!4(f#}PJ-iu=!5cSj*k(^s(1UfkS+iy$
zA(JVRQEa;yBJAT;x=oT{{IHGWcZ&Dwz4zXuVVlpxnx-GRhmHQ@$B!L01Y&ihu0E|_
z_%!T})*_SRu7B)+$)S%VX-ujOaA7KcF(ftW%$YOJTM_|6NIf(#{`&Uqt1PHnw=S%C
zGw-}vX4r@ff8_$)NhCZgM{M1?)tiJ<=P>&O<{cY|DlzY-Oqqfk+9lD<7<v*Qhmsd6
z3#dO~HY`p+*-ze}8=?i=za$IsJ**BB?oG1=cLFP6^MB^e-4o6Hh1ZE>AxvYdD~c_N
zA=(GnafzE$c1L7#+fI}m%>2t7y=c)Q>F?C3lW~*!#?`A=t+NMnD-|%7ELkGn3;{W_
z)BX<@Mu{B$_~Vbp@$U-MX^_-Ge*w$HWem}-K;<>ILxGjdB(dEDXZ--HpX`WS0`mix
zsgWBP0e_7l+7NAEh&DtUq74OqBBI%9i+eLfft%NjmlZ*w@(0j@sv=mTMGHD;&>$7!
zAj-F9%^Kwhs^$dnBL?^(;5t~MDc97YLkIp^)ic3YQ`H(&2T=8j@m0B>f``k2N1Thq
zw&f1SwU02t_B#-4!q0<B%UW^|hh<Pi<JiQV<bNTi(M0D&+>2~AlZVf$i!aK`Q4pM~
zGo&=PQ1^@;Jz8R8wjfp{0Vhh8y3rjVPl#;&OLWJ1$-kZuVJ1#+Yea&#^`_>QkS>%V
zP}VmA1^jH)_#BK7#oEK}H*li4o>J*cF16N?0?vwJeFX{WSGzBEBPoh#F+*zFF&wy0
zX@7XDaJgc|3f-m}EJ7rL(8?DG)au6B+Jki?EG!INwz6Qvh!M7NPDD}!H{={~f$4jf
zAg8hebEyz5;ZQDQfJ76qo;h=-M~M?D26(CAxSYs)&*D;PC>Ic-H5{TXXs)fZo)GN@
z1gfLj&XV|Vixw?Bs=?xeR050GL4rYqrhl~Pn;wF~E{R5&&-e(CXoB+|O0c0rhZ4aQ
zH3f12^e%xB?Vv3E^2;xAY6n0xRfrLi6{Ti5d`g1`4Y&Xvo-*VN^7PoTW1OarD}DU&
z$1aIR*FnwB0Es4O?a{Mz=~B`6Mf`U<iU`yZsEQ;j0Bx>IqRG8bUO@Doh=DhvnST&%
z)jUixF`egghgrkb6sPt$jI~{651BU@kJhyg{fSO&Ks4);Xi&R$?Ldge(tzlSk$*~$
z>UQ?|c({xB&-C1w`?{xHyLKl|oKSW^4RfZ}APS755!JUa1>KYvV9ZJt;zzr~!<$aI
z@Q;yqr|uS!iDbuELGj^>^+v%p4}VCf=lJpC5=#?MMOmtv%XQU4IsvIotc3L2uGknP
zL{NDj`5K~?B{1SQ(HI-HX%no-j1*;urcIl=w8;h!9*pMGSxI91R?M67t$c#<SW!+z
z2tq6b8RK#TS*=)q?Mv1JmKMK>W)+50<qyP`tU7S=GQ$Q2rarOcWQI&lO@CEE1G<Qc
z_)RqNCt09t60n*)YEn~lGCe(A1r6weG()r@`Y%ni%w;tWtUVs7rS<C76YD~138Na6
zP7h$ruyI3(?y)987n>cwiN<z8cdKd~=DmcnpljEz;vE$$mWyFq^&b7EHcU}rd;BuM
z=bwMh74n;C7WX&bd{fmpV1HR6R#z6_y}@<ob4w!X33fNynq~*9EO__bcX3YnNwlbJ
zYaFne$#YQ_;0{F+?~-T%yLL7;%7XXbe?P!2IEx0mYE`oU9UeOo{5j;Q`$aUGd6|yI
zUBv(oh-k?@szD$vRVP<_0DllaALEi}Xwm7dR<3zlIs+kE9C)e*0e|{f&1@aQl54H!
zUpD$UODj56@EpAT_S;y5EMPdhtus<k5f+lvPM<!lY6J+65p(kPD=m_e6#y{!_<_fu
zh-Ny&4wu}nkOs?_LpI>4Q>PpfjhrhWQQ`rj0w-Er+T=;_Mxky#>)4P3@QzA;l}qT~
z?1rMs(RGlDBCgR81vPt+N<2&eEs$fBN=6c9h&C`p8=?&i(S~S4w1FWyr13xJ(hQpS
Se;Z@~0000<MNUMnLSTZ;WRqV2

diff --git a/tests/ref/math-vec-delim-class.png b/tests/ref/math-vec-delim-class.png
new file mode 100644
index 0000000000000000000000000000000000000000..415dc199b7f938ac5e2eebd51c386e19493eb1fb
GIT binary patch
literal 281
zcmeAS@N?(olHy`uVBq!ia0vp^6+mpl0VEhwrY@EQQV%>`978H@y}h=#&yi7pH9>#l
z`3+~yZs)DMr%}l!G}Z5^+rkBkEUi&7E)`5&7gv}FPx4l;b5<3scXukRKALeZ#Q5rU
zA3r|^`B@B!hgvwJ5B*j)_!PI>oatJ+^p3Y~n+0lRwN{uO))oGdU;b;?&ks-8FUJd4
zw4F6~*?1zvE1;46r+H)J4hNBg&Bqon-BB)<-eGs=o{PF-$X)e0->0b+nBVkpC=uPy
z#-1!HQq((zGp1yYk;}#Rp6puRw>;ia#`vgyYhlq(#zSk=d}bIV9?F>sgDsrGYJa}j
ZFnnrdS-dFi@LG_cJzf1=);T3K0RY{(akT&d

literal 0
HcmV?d00001

diff --git a/tests/suite/math/cases.typ b/tests/suite/math/cases.typ
index c8c6a1071c..832bae3c94 100644
--- a/tests/suite/math/cases.typ
+++ b/tests/suite/math/cases.typ
@@ -20,3 +20,8 @@ $ cases(a, b, c) $
 // Warning: 40-49 linebreaks are ignored in branches
 // Hint: 40-49 use commas instead to separate each line
 $ cases(a, b, c) cases(reverse: #true, a \ b \ c) $
+
+--- math-cases-delim-class ---
+// Test that delimiters have opening and closing math class.
+$ 2cases(a, reverse: #true, delim: bar.v) 2 $
+$ 2 cases(a, delim: bar.v)2 $
diff --git a/tests/suite/math/mat.typ b/tests/suite/math/mat.typ
index 9613e54e79..464deba003 100644
--- a/tests/suite/math/mat.typ
+++ b/tests/suite/math/mat.typ
@@ -284,3 +284,8 @@ $ mat(
     dots.v, dots.v, dots.v, dots.v, dots.down;
   )
   mat(p_0; p_1; p_2; dots.v) $
+
+--- math-mat-delim-class ---
+// Test that delimiters have opening and closing math class.
+$ 2mat(a, delim: bar.v) 2 $
+$ 2 mat(a, delim: bar.v)2 $
diff --git a/tests/suite/math/vec.typ b/tests/suite/math/vec.typ
index e5ee409ecb..682897277f 100644
--- a/tests/suite/math/vec.typ
+++ b/tests/suite/math/vec.typ
@@ -54,3 +54,8 @@ $ vec(1, 2) $
 // Warning: 20-29 linebreaks are ignored in elements
 // Hint: 20-29 use commas instead to separate each line
 $ vec(a, b, c) vec(a \ b \ c) $
+
+--- math-vec-delim-class ---
+// Test that delimiters have opening and closing math class.
+$ 2vec(a, delim: bar.v) 2 $
+$ 2 vec(a, delim: bar.v)2 $

From 6efb31f76ab7d62dfdbcfdb615fd41f32b7c032c Mon Sep 17 00:00:00 2001
From: Pavel Zwerschke <pavelzw@gmail.com>
Date: Thu, 6 Nov 2025 01:09:50 +0900
Subject: [PATCH 13/54] Mention `SOURCE_DATE_EPOCH` in docs for `today` (#7311)

Co-authored-by: Laurenz <laurmaedje@gmail.com>
---
 crates/typst-library/src/foundations/datetime.rs | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/crates/typst-library/src/foundations/datetime.rs b/crates/typst-library/src/foundations/datetime.rs
index 71ed0e6dd7..ef18703725 100644
--- a/crates/typst-library/src/foundations/datetime.rs
+++ b/crates/typst-library/src/foundations/datetime.rs
@@ -311,6 +311,12 @@ impl Datetime {
 
     /// Returns the current date.
     ///
+    /// In the CLI, this can be overridden with the `--creation-timestamp`
+    /// argument or by setting the
+    /// [`SOURCE_DATE_EPOCH`](https://reproducible-builds.org/specs/source-date-epoch/)
+    /// environment variable. In both cases, the value should be given as a UNIX
+    /// timestamp.
+    ///
     /// ```example
     /// Today's date is
     /// #datetime.today().display().

From 809dc4eed0b3509b2a61277db772cdc3ef67ae02 Mon Sep 17 00:00:00 2001
From: "Y.D.X." <73375426+YDX-2147483647@users.noreply.github.com>
Date: Fri, 7 Nov 2025 17:25:36 +0800
Subject: [PATCH 14/54] =?UTF-8?q?Let=20examples=20distinguish=20=C2=B1dx?=
 =?UTF-8?q?=20and=20=C2=B1dy=20in=20the=20docs=20for=20`place`=20and=20`mo?=
 =?UTF-8?q?ve`=20(#7290)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 crates/typst-library/src/layout/place.rs     | 11 ++++++++---
 crates/typst-library/src/layout/transform.rs |  4 ++--
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/crates/typst-library/src/layout/place.rs b/crates/typst-library/src/layout/place.rs
index 595119534b..d04c7d202f 100644
--- a/crates/typst-library/src/layout/place.rs
+++ b/crates/typst-library/src/layout/place.rs
@@ -145,9 +145,14 @@ pub struct PlaceElem {
     ///
     /// ```example
     /// #set page(height: 100pt)
-    /// #for i in range(16) {
-    ///   let amount = i * 4pt
-    ///   place(center, dx: amount - 32pt, dy: amount)[A]
+    /// #for x in range(-8, 8) {
+    ///   place(center + horizon,
+    ///     dx: x * 8pt, dy: x * 4pt,
+    ///     text(
+    ///       size: calc.root(x + 10, 3) * 6pt,
+    ///       fill: color.mix((green, 8 - x), (blue, 8 + x)),
+    ///     )[T]
+    ///   )
     /// }
     /// ```
     ///
diff --git a/crates/typst-library/src/layout/transform.rs b/crates/typst-library/src/layout/transform.rs
index f87d1fa334..2e11544d09 100644
--- a/crates/typst-library/src/layout/transform.rs
+++ b/crates/typst-library/src/layout/transform.rs
@@ -9,8 +9,8 @@ use crate::layout::{Abs, Alignment, Angle, HAlignment, Length, Ratio, Rel, VAlig
 ///
 /// # Example
 /// ```example
-/// #rect(inset: 0pt, move(
-///   dx: 6pt, dy: 6pt,
+/// #rect(inset: 0pt, fill: gray, move(
+///   dx: 4pt, dy: 6pt,
 ///   rect(
 ///     inset: 8pt,
 ///     fill: white,

From 525d977661d8dd2d5a8b90af0d20ed55e77a7852 Mon Sep 17 00:00:00 2001
From: Andrew Voynov <37143421+Andrew15-5@users.noreply.github.com>
Date: Sat, 8 Nov 2025 13:43:09 +0300
Subject: [PATCH 15/54] Improve documentation for hide (#7201)

Co-authored-by: Laurenz <laurmaedje@gmail.com>
---
 crates/typst-library/src/layout/hide.rs | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/crates/typst-library/src/layout/hide.rs b/crates/typst-library/src/layout/hide.rs
index 7acabe686b..e438925b50 100644
--- a/crates/typst-library/src/layout/hide.rs
+++ b/crates/typst-library/src/layout/hide.rs
@@ -3,16 +3,25 @@ use crate::introspection::Tagged;
 
 /// Hides content without affecting layout.
 ///
-/// The `hide` function allows you to hide content while the layout still 'sees'
-/// it. This is useful to create whitespace that is exactly as large as some
-/// content. It may also be useful to redact content because its arguments are
-/// not included in the output.
+/// The `hide` function allows you to hide content while the layout still "sees"
+/// it. This is useful for creating blank space that is exactly as large as some
+/// content.
 ///
 /// # Example
 /// ```example
 /// Hello Jane \
 /// #hide[Hello] Joe
 /// ```
+///
+/// # Redaction
+/// This function may also be useful for redacting content as its arguments are
+/// neither present visually nor accessible to Assistive Technology. That said,
+/// there can be _some_ traces of the hidden content (such as a bookmarked
+/// heading in the PDF's Document Outline).
+///
+/// Note that, depending on the circumstances, it may be possible for content to
+/// be reverse engineered based on its size in the layout. We thus do not
+/// recommend using this function to hide highly sensitive information.
 #[elem(Tagged)]
 pub struct HideElem {
     /// The content to hide.

From 4cb20af34731c0d3dae27cf57e46ad30bc997a26 Mon Sep 17 00:00:00 2001
From: Max <max@mkor.je>
Date: Sat, 8 Nov 2025 11:27:10 +0000
Subject: [PATCH 16/54] Fix height for horizontal glyph assemblies (#7327)

---
 crates/typst-layout/src/math/fragment.rs      |  11 ++++++++++-
 tests/ref/math-delim-show-rule-3.png          | Bin 858 -> 868 bytes
 tests/ref/math-stretch-horizontal-attach.png  | Bin 2245 -> 2251 bytes
 tests/ref/math-stretch-horizontal.png         | Bin 591 -> 580 bytes
 .../math-stretch-min-overlap-exceeds-max.png  | Bin 585 -> 586 bytes
 tests/ref/math-underover-brace.png            | Bin 751 -> 735 bytes
 tests/ref/math-underover-parens.png           | Bin 726 -> 736 bytes
 tests/ref/math-underover-shells.png           | Bin 551 -> 547 bytes
 8 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/crates/typst-layout/src/math/fragment.rs b/crates/typst-layout/src/math/fragment.rs
index 1b1072d2a8..43be9ca82a 100644
--- a/crates/typst-layout/src/math/fragment.rs
+++ b/crates/typst-layout/src/math/fragment.rs
@@ -839,7 +839,16 @@ fn assemble(
     }
 
     match axis {
-        Axis::X => base.size.x = full,
+        Axis::X => {
+            base.size.x = full;
+            let (ascent, descent) = glyphs
+                .iter()
+                .filter_map(|glyph| ascent_descent(&base.item.font, GlyphId(glyph.id)))
+                .reduce(|(ma, md), (a, d)| (ma.max(a), md.max(d)))
+                .unwrap_or((Em::zero(), Em::zero()));
+            base.baseline = Some(ascent.at(base.item.size));
+            base.size.y = (ascent + descent).at(base.item.size);
+        }
         Axis::Y => {
             base.baseline = None;
             base.size.y = full;
diff --git a/tests/ref/math-delim-show-rule-3.png b/tests/ref/math-delim-show-rule-3.png
index c875f3b277bb95a67625150f1b46f4ebe5da5ace..70851bc52472c125bf5da83010e5ee60e6305fa9 100644
GIT binary patch
delta 858
zcmV-g1Eu`h2IK~i7k?@U0{{R3PyBBj0004@P)t-s|NsB-A;R)3#rcxqyu7^mnB)4a
z==!tj_>AE4Da7?%()WDZ`Jd(f=lS+`+WDL0{owcT@bIFdqUY!5y1Kggk>R$sw#muK
zY;0_*s;Zx#pM`~m>+9?H_xJhv`SbJh`uh6a-QD%|^}fEo=6~kq-rnAvoSeeK!j_hn
zh=_>2y}iT3!_Lmm#KgpNb8~lhcYl9>rlzL$cG>ur;`*!T`m*Zyi{J7n#A|D7WMpK3
zfPiUfY1r7<^z`)d^75ddpuxexc6N4<kdU69o}HbY^GD3{Ld)|%%JN3bf`Wp9fq{{c
zky=_>SXfv{NPkE)G&C|YGGSq1nwpyS_V)Yx`|j@UnVFf4jEr1dT$`Jl?Ck9C@9*j9
z>8-7;%F4?A{{D`Rj^E$ktgNie%*^fW?Ww7$)6>(}*VnhVw{C83w6wIfwY8|IsIs!M
z(b3WP`1s@F<Bg4t{r&w<Pfu!UYNe&6mzS5u#>S72kAK_S+nAV`<mBX0QBhr8U0+{c
zV`F1pUS8bX+~DBg`JCkb>-zbf<o)6I_H)_(?E3t^?f8S;1<!?i0004gNkl<Zc-rmM
zS5HDQ90l;>-g_^&hzrHN^(yYY74@QsDB>2b2!eYc!%r<GM8=a36cW?l!#}5eIZ4wN
z48t)0mw)47IFKapD=1t+1l8h_3{m&^6bRdUfv}2jvS(Dh&@5Jm7wZTTI6019X%%xC
z&5lE32q{iJBnm;?TJ*Gvc|q8<3j!A`R_lo(5F%fTs54t4k9rNn@exr>qHuj<L$rN}
zch<1t&5iYKDMG22mY1!dhu>nK3r)^15B|XO>3>9&x!kiea|u3)Wb|idW#<4n*;$zx
zznjxDvu+nC@OZy{O33Kz?dk5y%gaqkO-m>1Br?1n#72HTyMk0*UBmAZL4y*|Rs`dT
z0S4*l2oKajv$rqhWVMQ#YKegZMLV)dW5;ntrAoyQL#%ITY|?6Nb#jIDO+T*&J!TQ-
z##2s|>&C}0R9%I0bJKzLzP(u?c^8$SX-a-}+E7}C2|YJxu9RPx6pIUXWy`<~+7K5e
kWh>(2K*!!Y!!WV(12|??y44ae=l}o!07*qoM6N<$g46lzEC2ui

delta 848
zcmV-W1F!t#2HFOY7k?=T0{{R3$!Hz20004%P)t-s|NsB_qUP`zzxnz3o12^d{{HOj
z?CtICzP`S!tgPSP-;R!syu7@!va*GRh4=UO%F4>PxVYx#=8TMt+uPf%t*yt$$6Q=o
zn3$Nly1M7*=cA*eqN1X7baeRm_~PQ?mX?-#dwYn8h)76Czkk2KnwpyS_V)U!=>6LD
z!NI}I%*@Tr&1q?A^78W1($eto@Q;s=)z#JM>FHfvU7(<#@gTzbt?6N5VKOo@@gBir
zV`J;<>vwl|fPjE?b#?MK$kx`@)YR1SFUImX$oG5O{^<Gml;Zy4_x|Jf@;AuwF2(XS
z$M7D(o}Ql9*MHZFii+Xk;a^{0s;a8`uIce0!KbIEhlhvg=;&%{YQ@FH@9*!Xrl!-=
z)A8}~&d$#IsOS5??)Gli`IqDU-}d)_-2eFf{KfC{LCgI7{ELf=udlDs(a~5~SeKWV
zrKP3N(9n^Qky=_><KyE`Pft-%QRL+0`}_NFaB%bU^M8$vjrfw`{_Ohx>-zou{q^<r
z&(F`@-QD2e;MmyMnVFgH?(Q@+H2V7bM|hKt0004iNkl<Zc-rmOMN>ji90l;BJSi1X
z#16#n?(XhZYz66(?vT$dmtlr*<KjJ-k@s7iIses}xvL8ni^clCs_O=lje~^YrgmhR
zFqwm(oqz2sSt57I@{LTvah#npIULO#E+I&X@gbOFYB<K_N~*cMwBfQ+q6vi0Dr9On
zOi{HX6ctMiM}<TK2v^t-+F7jGPdx*oPe9a@N|kH%pj*gwW5^ip>YR=^kuGZ1=?q{_
z*p5Qr_25rDUeL__{`9OYikl+Q-SdHjkDhLFpMR53K0m#?LA$rt7gcfGB#DFlz1@w?
z&5iZ7<ymrHkWjt6z99#;x3+dr2z;OTg@YWp7a*Y=DYc9*`;AZ>9w8tMhRRS8z)Gv}
znim+84~nCK2QbHX<#Z{IPxSST()k65{OVO%htw1j%UhaT>ngyUDhV8l`w|D5d$Gt9
z!AW70)kyo*8abz`Z4^wB@@s;Zm0>hC#Fi`?{;gd`Nje|3Z9@<tFIp<a$d3^F9cHmu
aIr9UZO-Sa^E?i^)0000<MNUMnLSTZabM==1

diff --git a/tests/ref/math-stretch-horizontal-attach.png b/tests/ref/math-stretch-horizontal-attach.png
index 179281a5afbdb2f3843c024fd101c1908c68003e..7d45f0167bca86f8260785e881b2f67a60ec645a 100644
GIT binary patch
delta 2239
zcmV;w2tfD65z7&fB!7}gL_t(|+U?irPaO9hfbsqXecKmNR4Izo7p+pYQlh>}6h*C?
zR&C;>j#D2>Bb>u^t|r(V=2*ZUz+f<7W6Z)DFo!W`Vlc~^%Yb148+MnQaNoBv#~$qQ
zbY`@uLV%s!Y>-{;=c^fJ=eM(Zv=XD)pYbgCnYYqg`Ak*b-GAE4%$wZBWzK8rLG}oH
zqlYUOumg)=11sN7v4F(R)(*QJ96Z+I)`vL2O0s+i*Z}Mf9AE*v`<1pM8*f)DEC)$w
zzN=~|_#%Jx!}$X%-{=Zc!SZh9$(nFSV$@PxYF0aYoBGetTb1eKpUtOctjA;-{@FI{
z|G-CgC0myR<9~0}o=|5PN+UMkc@SlGvl0b<1fY22)6sGQk|)*`T&o<6RF|2-k5dF}
zW<=eus$M@0Jn2L7)2pjf;mj%uPSxSlp#e@yA2ODIoB#@I+^n=78-1_u(1L=vuAX?^
z{hF-dqf15~dNQ?}Y#!=4*n6n?d~#@2;*DnZHg|OFy?^e*HpNoBeomnuzF0AN)KQa0
zUQ-*)z1MrN>&T^=f2&Wohnw82#AGvD%)0Yn0wZiV%yw*GwF4%LxMnlj?RPY09>XSm
zh^gy5SipqCY&C%mOn|r|uCa>4&-f$nL^?f>Rb9iARZsFbn|TBO$M?(4d>yW^0t}?!
zNjArmDu0tlaK*|6z!+i2lP0e2Uip2DYy;v<xFn$gmQwJn$OljOE|=p4K{z7_f%5*$
z*0H}JoDu}TvqDg)5EdW^zTyi(2oZ$vU(7+JculAvi031M1R+=u!o&qZPzZwbGF)B>
zmCuH4y)i6AUR20$43jSkIxCzDl-GlwTYc<z>3_1beRy8bsAvDjms9Y((OmYd>}+`k
z?nL&lVxNJ^Tm7Ft{goqerEfm<m6I2-y=r^fE4y2nsT=eDI`dX~E4`J^PNlh-Emn3K
zn8wM*4v#w6b=C8g_G37u)}*sTh6ZHqMR5zToyiAeo5>YLKWXKPf0Gu;bR@^w!FMXh
zf`8<5T9mMzKBZcZq%oi4KWSyz`-5GE;^N}+);Nx`!=E#|&BdaT_tC||b_t)24>pU7
zwKqyR^5ZHU%Ea`HQD8gu&BRFnzn17BxpFm-uaQ(HTvhdhY}xmV0h3%Av{HQ=C-dc$
zyN$q!+XX{%W#1+FT3c?0DBJEvCEtF;>VNCwY_s}_9^)Hpz%8<!YYpmNB$gL!^M^{1
z4R^OzAzP>{Vawq~PE`Z9teFeQ?v%~|<weG0#jBs=PUY!5_+tgz_*4NW3)xNmVfd(o
zy-oiWG)8tRgBKs6ajWu`?wPc&02(xsKA`Wn0B`5Rnx<G&peYomKvSYw1c(UKCVxi&
zCh=sh=7uJ>;$~r4t|m`>QKVS|9KU%jb`xaH8c8Qkqb~#QRIa{or)C<-fI%_?q<;qR
z{1{jaErw=!nhdRm4S+Wqx(>_$Ht}SGG`c2jyL@2K8ss`-@oOrO4H_g<IA!{}Sy}M`
zPB)a2CLkvW6E{x+OUgLqd1Z_;R)5^$m6O2ci*Qf_tcwe0m4fnIa%4=>S>-u#VwKCl
zcc2ahS+P=5htr3*+^jr#6{qzTi3M1AtGqhlQ!BvA^2(w(OX4iAH~{rQ_{04c<fR39
z7MC8%f5a0&-`^d^<5M8pSdo}PX8h%XdzJUHGEM9-9-n>EQVX&*Fk5jTn}5vA97dZr
z&6YKJbHEmT-^KU|oYrBDt=0aF>lrJay{kX}$_&VI;HH&(?9R}Ir4ao(yUKxV?Ao8~
zX`^cvr^eKq=`{DThsXlO`ob-CS91M&iKB9MKc3uj?@m6vp2r@_R&(h5h~1fri_OD{
zE&EYfcn!YnU=P;7UIrrv*?(P5E_~d#AC>E!P(H+7nqa=f!tN#}p?K2!tnRJ!R(dO4
zudISQ(1`1oH5#ekugctkf$OZ|s>0rZ4A$-YRXK6x+Q3L$IWAg@{jPpFC2hYd$;koV
zSzMKq3+H-0UD@9|z+CSrJ2X~<?>%6<`QC1r?OkLKJp~Y0%kCWAJ%39py<N7oo^jVI
z^MBRP@PTfAsHtCPK;?%sxWn#$U}^q$i7Xv9xK^2Q8qB%;a7W4@)q#78KEe8u8iO9!
zD*sguwIhJ#d~jqylz((!bWn6~bcj5`;_;bi|Hy!|!J%OxLIOZg63u#m@1w(`713eN
z34g*wL>qv*e^B~y4u9FWSoz{Aq$8P|nw{7-<NrIJnVO!Snq34)`+8G_#5y}E&eYca
ziDLmeUtg>WPtwf0SULN9a3ld(t|g_#r^l-<suEO*;v`9X@i<;3p1qoM`N}0_HbC_|
zSw<wIsw=9?&PjHTc(h~WbK-mZf$5iSaM`a27b{J#LS{b_Lw}o2tJmtA_1bOIES+g@
zz5k%CqX%I4xf*0^`Zj&*wrP{LJ@*d*%g?*Wd)ex0B_$V>9Z0O|lG_CpH`N8|LU}6^
zH)#r_DJw4huJm>lfb|=Y&8bV(CC(|8r)2LDS0?}>q4my>yQ@2Ji(@~ZHr9g6RLMaD
zY!iH8^v%(h7=K{7sWhKmSVPLPqA%66O@iOd-@5yP0m~h2f+s8e?_<r%)sDjm1G8%b
zGpoSFm;B}X2Sz4rvvY&l>>}Y7q}P=V!3ZO>YrTuh!1^(K>W8M8u`Et*#CWpuPevg3
zTKGozvMNHQJK7ll@a|AaR0C-viJez=ul!&LsEfQbCV#A4NsDj&<eneE(dqIp8z^l{
zSP1oOWq=Oqayu{1AL-~)jS)aV?^Oe_(HywPr|r%2dsHS?Ky95SU-v<Wu0l(QHDK&&
zGdW-JZau!u4JbTYxu#H8K8z|k)mVJ5GrZjBqdPtWj9esW9c{U`QK61v7uK-y+6h%^
zO!4iyjyRNS_7kngM}XB3E{xM#(Aa;n{cG><9&e?$(p%}R^j1E-{tIeIVikydn=JqU
N002ovPDHLkV1nfUZ3O@T

delta 2233
zcmV;q2uAnI5ycUZB!7%aL_t(|+U?i*Z<F^O!14YE`)xl=+E#5-wI8OfnkH@2e&{r5
z)vBs$3!}8qmUW?}bUl_*LISx74>2L(asuRlkk}z1V3I%%2b`nMVaR1dE*dAcli(a2
zNlfA^w%>dFEGP=tP`fTFtzREK*4NM1&!e{@<&pgiPlIP7m4A`Sr>e4<l~-`MXeKx-
zmwyS8c|0v)uDpc@xD9StqVguU0Pt}C1&;^3Jkss^H}S#}Inokv19-f6!3mzwE8QCx
zU(+Nz*Kw%5`GmIo(=zLOGq2BW)1S=+=UVlD8dAN7)9+;E7IhQY&FGO=)dgc8&*T;^
zWEAzj)iD~|6@R5as?aN8?A6Atb%nhZyIpI#(j6gIlFSa`NS=@Cxv~{<#ut(~sW$Ab
zyXb%&Y$wiDnBI9=vk(J3?j~gg8ci<jvXad9CZc-kff(OS%w?O2<7`8Sl}qoK-WXbc
zE19gmfdl%^hN988@7SUkIHhypT0gLEaDDr}oTST#OMlx5Z2E2U8~q#H$#)K1n@+wq
zda!olZEr(9r`tMU`i;SLeH-NsAJxTlr`kiT#O`)D9r}G>2OBJU9Uk1U<N@qXanEh@
zcrMjDATYP@CicF4-~>Bf$C4e~U<bq<aStor9ky@yB+_5wku(iFo@Rnaah?9^d;Glg
zRO$(a2Y+BJpK$U%w({5@!I(V+I1-(N)7T0BmBSg5MaWztDEm9$c0S>i+UK`&#Y~1E
z2)hJfr}Vn({yJ6=whO|JG$B4oNQo1KFT^*3kSGYde>@FU;x$Qv5GTHk7lZ^sND+io
zK}Z$^-`iAaCrLV+a{q%ViPC1W^uZMAqWCmn&woy7Kk+BlNB%8?mVS-!OS%!>|M9zW
z!q0q)fR#gCPr;MO`&s5wP+8r-^}Am=mT~^2?|kJ<Hr~H}=PUJJGEp-U`E?elj8sM{
zpPowBH6F!0LtqPoPpWe1EtVCki+D&uEl94H9lZNc<-b7U&b?6etyWrNI=cXv5_q47
z#D7edy8!r<D+N5DFIzhRKwByAf2)->?+$hMs#L1#t66O1AulU>>?)D*P4pQ&K)%f|
z&@OH^mR7Lwn^k&?@(N0)c~H}t>=}T##!RDBITuef0GIOe%f>)5``IU>|F4X*Hde80
zDgW429kBJ>d81U>pF=d@sVo<%JRww~dVi0Z7c8u@`0*9){e2NQ$4Mg+O<gYl&YwF?
zYcC=(Tx(S$nXD=2zD*XQ>w$C5f+-}`=f{A$;#(V(Q(Fk7GFAcqsAiR|HNZzI{Aqm?
zww@s{%PUZ`z{4uwxjAY>s{HfFykd(7=xp&B1%`hEu;w(_TGTBy;?#;qeajrco`0m?
z{GEVPJXzIpq2)qzbzMW1w5)5f0iNex%2@)5zQt#lW#hjGLaAJMw({Z#0D7H|894b7
zz|Tg(uG8r1b(f@R(9Hw9sJ{C84B!$^)%vEjUZa&3y30B{fK~CQB9L6y`HZlvI6A~i
z^*b!9RQhxR#R<5n*bK}nk14ao$$t@#T%`qA`X#Ja0}JA*1ImNSgQpH>pUCnp#81rv
zwV+M_NsZE{jb)oFLah96F3WCPd=`M|S1;A&ML7VE#cVNJOui9UOMqq_{84&_iW?)A
zQOoE}qiJH)w-7($h2b^0J}`mgj>X3c68A6egjU&dJkQQU4C#t3OIncF!GGmu*+ky)
zQJNKFu(FE{R&@7dWsI=0yRvyB_jvwXc%SOe{$&CrN+@@t#lN0GTxaN6z%L~z@U*ca
zyp<heENd<}Q$WWE0qiYLwa%*X@0?PpqTyB$l_4u>G0zq&2%vI7iT(rpTdb(C8RTtG
zqO!aYqV)veOuCM7&nW&Wm4C2h_(@b+yW#v-1kwnT<#zltnxNDi`K}(Rj8sM{gRg9a
z252Gp%XBuhPpVQmF;R@2V4WG8IE8~JRcShOY`~ORLy+c$a?RY)f+tmpQVBbz2$r%0
zWCP)@93LBJ*6gRINe!QU$%E$1M!0L9CxG75uw6p{MzeL%Z1mVo(|^HL7X3=k(92zX
zUB+J@gPJ$T2!%WPm1)awGd$C4JA$h$-Ud!3U*Cpm$afQ(vmfGlUd=!^!Bs|GfMx^W
z+?TL7E<IMZQx-2vkR?i!Ag*`GV)w?SB_yRJ3Wor8Wz*3GFf2=zCCgHlC-pJ2Th<FS
zuA?fdgkplMd~Oa30DrhQZ=DM`^Yhku>moqj7fbm7c*HZ}hBRMi<pz5HHmgoKqL~b`
za{77T2!JzNb~x=wnp}|Ym8Z*P(xi)PL7sMG&w=!e{re8)0bE|IxCg+9JX4+_-|stC
zO{R2+v+8V?ydSvvyE5cE%L%g5_5zgj0bm$3^c(sN*Tv~u8Gq?r|5pP;HwK4I0EVB|
zBe5F>4E+I*m66Vfvj8}Lr04V>oWWL7l9_iE0GCQ}_SCr(szTK%af-z8y%vgd@?2q=
zqNG$=UIpOV3X+>DrAi?l;;dfzJzJtO0wh3N_4ohVhAp+~WNz{>t0W&Xy=J<a3Eb6H
zoy8A#T4iz8(SH_JITAnl&w-&Nz^T#YgtIc?3eJL(t{IqOV%9M}>i|rj^U`R~0yEsb
zWl-Qp&UrZ6RA+%Hre^KtdkcVd6aQ{CjdR;QKe?C@&dL{UKuK<rO}JT{aJ=)a&NzTI
zrm_qzMMK%$NBviB8UdPi9~j?1nU|B%8r2j7uwlC5bAK&0ZAUCg;jP?$9keCA2WK|+
z=ueo5C2sI|FS7ltY30Kn?M#5mta{Kksmt`6dOB;{Np!`TkGE6w1#7fy(>0PD-pcu1
zn!4M2RMFbf*51U6ws-XJP6CGg#8}Z*w`=2T)9}L?U*BlVKbn5FvZ*_}z_a=4CL=Hx
zi_FONGcwv6A9Q~b&Ps6MhZk>%mqmW}L@Fbdk;+Kr54`e!7TjW(>#<@C00000NkvXX
Hu0mjfUUyfH

diff --git a/tests/ref/math-stretch-horizontal.png b/tests/ref/math-stretch-horizontal.png
index 9b30be594438dc609456decd6f4e2e24f0368015..03d8eb154569cd376c35c514c1d7883c7639846e 100644
GIT binary patch
delta 568
zcmV-80>}N&1jGc87k@+u00000Z?~@40006DNkl<Zc-mw5KR|$C)Z$T#M=c(;n64IY
zeTu@}cL+^>I;|}JQ1KUucfhPOr?WGvv#=0Ibmn$;c6w6D;;C(IZCOoi{%zUWK%yzD
ztu4|QA)7c4LqjLc;<)kxg8itpj7C1j1bg?OaBH8^%g3)!xqrXzqsiYJ&Bvn_4|R+G
z4UolGmko@??~8v8jKxj0ot^m&oxUB}S)D$e4f((#lUlXYbf8&zO`X1-**QR>5omNl
z#=s=5ABDe=orUh>lww+0y!|fTNG}_pe7yeEXvsBd@u<akz_T5_rD+KX2^r;+_P(K;
z#m~Dd+7|CT|9|xT`}dE}ZeQ3~HSr@|EIu+1z54kw?b2xC8nt-TV(MG`<0+O--4}ZJ
zxL^yq$f<;1bP4LxiWU@5pZuFnalB(a3fS~_G*ypUJj5-&dHM9^GndX@ICuX1xeI46
zodI%h5}}QWfiSpy=E#{Nr;eUDcH+dblSfY-0dg-RWPhJNdHDFjqlb@x;Nc@6^YOzc
zPl+&;7>mDs`|=eCzJ2=&24B8@`SuOT1SV!61S24X04iDh=Jm_hFJ8ZV^%96)L*N^P
ztca+%7zBz*h>3$Zq9RnX*wEP0#M0El%-r0}!qmbP$T2oV$X>s4;nIam7eNrnxD13>
zt`lJ><uQrt&GW}V_~hABAb9o!%y~1Kk4G&YwRqHGS^@x`ve?eVv+IWd0000<MNUMn
GLSTZ#Iv|Pw

delta 579
zcmV-J0=)gi1kVJJ7k@<v00000r0acs0006ONkl<Zc-rlh-%ry}6vz3i{2xqQeDueY
z#<vaKhS3ZX7hFR1I0-Ye?Qmi0fH2$w8e=NDjcwhJA`dLxGDy@BO>nXY1YrcWF}Uzj
zTF4$qcN@q#w>i1r^G);V?Y-xA?Hd$b2u3i15lj{QX+<UDDSwU6cM81j*gK{Ym!KQq
zCfMyH!Ce5jtP_}J7{=^kt}+%2NiH+P+%PHb?ZAl_pksU7n^)$)A3W4?#qA>&Rmn#y
zv{qbI%lfj$FJm7g7{O<Y<&ZJpot|xDz`geYto>kmYB9qV=(hp@uM?ODfO{@5fu)<I
z$5wzon=yObw159seU@g$c1Nec9}Df=T2I}WcAET!7YKq8+$Nf($jbqz)A@vZ|Gh;G
zTnjjC1O5-Wd_JF^^0{n%p#~Lj)>F|`em*bK0Jl!7;i*RO1qQe3Cu@y83gF#a-?XJ4
z*EVSU>c$-|sEWY#O*(tr9QLTfTf<Y0;ByY%+W1GtI)535=}2tp1YWEDsaC3$)xWFc
zArm6k6nE6;=G^R{cgXW%$UDfo`DeaSoxtHB_l67jMqc^-!z27__AMI>D{gs7UXm9J
zr9!b-D9MX5k!790^1L`N&ZTpiTrMM}=R_i9#TBN<rp6-U?<PW%6XEd)5z~TBU@0ji
zKF4QbUp%AHFR_`pkPwnmdzZ@LT99U?*=#bM62(*|ktIS}z&=JWf)RWn!3S-5rpT$-
R%6I?(002ovPDHLkV1kHQ7qI{U

diff --git a/tests/ref/math-stretch-min-overlap-exceeds-max.png b/tests/ref/math-stretch-min-overlap-exceeds-max.png
index a75437fd960a4dad089f5c72add051e356fc7cb1..1de22c62c61bcda5d1cd6fd9bddb4ef5f519888c 100644
GIT binary patch
delta 561
zcmV-10?z%(1j+=EB!3Y}L_t(|+U=9=OH*MO#{Jv+X5cCc{jg{?tu{K=mh?g;b@q}$
zoxQY|a(JH9a<%tf*ptkx2HSG&sC8^@n$uadjfkc*a@N}24TVtOP6dLT`+@7euItMW
z9-gNKHfdU9und;LGWb7(Q~v&2e|BDT<ClAE+bDDT2>Z4j?tlJF8yi;Zm5ILqf6@XB
zLHgNxxPAwwqmB3zEHf5(J^{gG<;?*1IgzVAOlGlF!s`{LcE1)Cgyc*$S{+SfK^zBN
zC^OqkOnnQ?#-)HqT`-?2ztnx#f(E*T7k%l*8cf>!sZdP+Xl^jeWtO{P&(eMX*nZCf
z40J;KVq5VLZhvf><F<mS5+8OfxWxnceN72qu?IeOtP$n<5nzDsEcG9raj#6;*`j#u
zOwAWt<O+T@Fn9p=LaB`Iw=;Nd%2de=Ghbq122Ru^fWb84b|x?Arms6Ya%V4wy}bbR
zl8|?L%Bpxt$scvyR239O#Rtf5i=2L{SlCf)n`_Ot7Jn2=*uK(Oy(668nC2bJyXKXm
z{GGNm_<cwkc#Pn5SqZVL(Xe`y<1C8WPKdP=&G{abV@5)FwSy4uAg11vDBWg4JZcvq
zmo=EKo+7)ot5U!M#WDFP4H(eyRumhLVhB*`Gol%=qgZZG8Z`tdy=}(iaiCloqV$0w
zLaDb8Q!3C!RqWSIx$1Xg@~f7?GFS%7;D4SUZn@Ap?LAGG00000NkvXXu0mjf0ZS5o

delta 560
zcmV-00?+-*1jz)DB!3V|L_t(|+U=9?Pf}4B$Nk%SXPfk6O<&M}%$e4WVa=_XIW0me
z!E5{qPn3|dM7)?A<Y8K|0ZAa%H3Cf(YXjC=D7C~%JUv^@t=`>ob93i8+xPi?zi&R<
z**SG^KvT!S49vg`ywBjM$3FUZ=e}9}?Vj;_WxB)H_n{G{et)IC4PPt8`F{X^X$NpZ
z?B$M7c?^sGYUnwZaU;B%2XCbK{=VT`I9+-gNntC8cUxR}y6jIRB1<KIX(pTkaSk+-
z@#R`LxjV5Ok^-Kwz-qMcM)RW`+Mp%zx<6Lkh6UaeoeXx&u8gD%@y&~HYC{D8N1qsh
zgR{`M-jHj>jel)zj?Zd~A(v^*DxS$GY7)TWW%%5*{Xo8R0XPU8&)d%}S+^F3`f{SJ
zt2`cDH)K7{z~KQn4fz7PKh8*ZQd^9>xbH!MgU*TsFlfiD=18w*@t(OUeN`v8uK@(~
ziHv!;pbX{Z4z=ZxGAql;K0)S)@5&3=+Ob^2N`0n2D}UR-_HEmsd(7au5p$R}PpryC
z_MHwjIPaAP4iX&I03k*NnjSTZx(7vRBxFE^rdxx;^%63y;0d|ijH&Aq%K7Vr*c5jO
z(YIh4>?9{!%TmBeilg^ZD(KKSO(<q3icX-^+mGg<1!c%Zv6`ZE;uac*4TT@2G@zTN
ybo>q`pDCTHw7Um#)gNcst7c#ZW?%;X@A(N?qtHom;FqKT0000<MNUMnLSTab5*1Sb

diff --git a/tests/ref/math-underover-brace.png b/tests/ref/math-underover-brace.png
index d4a3f4a1c0eeb0a40eb973baca9ce6f5f7fc38b3..cd70c48366adab6641082b47bc45f8857603508c 100644
GIT binary patch
delta 724
zcmV;_0xSLR1>Xgb7k@Jd00000d61K#0007}Nkl<Zc-rlj+e;Kt9LN0=CacFFdg=0{
z5cQY`^0}lQgrbz{p|qEvv_@Ss+%Qp-TrbROVb-d+=JAH@Dn){(f|qsGR>WOu({yLS
z9WSZd`pubL*d2&)-DU-w&pZrg&X@CHe!rPB6N5b>Mir}KRe!9C6&LsA>fmPs5|;9N
zMZpU}<f)4I#J0%9XnqPmfpdxtM;9QX=MjQDRWtDuVTh*;uj<|az?Otutc67X5{|hc
z!nqKFJXPKQ))R)f1MzMXfXQN!lFguajptdO_peo-2f)koB{tp-8G@8r1z=rWxEh8S
zGq)gV>>>^X#ecmVm&9?60AMZswE@^T?piU&$@|<QrFsD9eK@jnv0yIK&yNDIH;EXf
zJ2q<NMRev^Y8|1a_H|=%1mknERL0iI>79$+g{@@`kTaxt&@Ef?MRM{Lgo>9n7^_A7
zfGlM-=1u;q_jnwTW83^wO5M43DIPYgVRx)I^+h7az<=eqGv^42Wlj)sh+&vmLQXOa
zA?H({boqep{2Pgc9Au6Ya(H|803oLsCV?cJjl1wE;!=M#QJT%_DAlkmn@wp2%Th`k
zYBaYy(lj*<RGclNG?!(?iAt7jp<NDTdu&#}$59g-TB9aj|Ng_fGA}H8c&E<^OQRc@
z!-CthY=7TWRxBia(YWr;-FIH>Pcu<V?ogxdTY2lFkI#o^locZr54VpDWC~hGmBoPc
zn<JmcnnBZNl@+_LkERGk?=M+Xd+&5*P3k)b%;rI(7Wp4$_UBVA{B2H2@oeGa%GZ86
zrvcvt4UBX-rM$AGcC=OdseD%OF2ATMFfz>}icLLU`k%H;uYDRY1B;&3=!&Nb`qoT2
z?XI@^g6N7nvy48p1A{N~_Mpcupr_8E{s^dIRji8lx%fBiA0outCW)m00000<MNUMn
GLSTX#V_~ZR

delta 740
zcmV<A0vr9`1@8rr7k@Gc00000vdlmP0008ENkl<Zc-rlkTTjzq7{|FQ`UN~BCb~O%
zhw%$|!3QugkpyGB5xqn(BR~R51_THPIe19vL=YIl5E&T9VJ3p^HB8xw&Eb-5ij1)i
z=VT*0_0hH@Ta7Wy*)@><d+|Q)`_KE!^E~PMws|0u@+7bXmVdw!Sa9&$+r7Xk$_?gw
z<!z}4De+zR3yU;aW<1dZoc6}64mj;&qdtmf<hhiqyP0HcAL)NG!~`@eKDdz^^g)mX
z*og2$n)ohKKm0ud@C+0NW&yy~&Zr}n0!JvShN8H&RP_K5r>G7G6#$+>tSbxv*0Aq#
z24HYr0~X_A<bQ?~c#$A35X4g^wBAib0UQKzrJW%7eV$}p3rri5aBBbH&|FWS*9ZWv
zaYkx3V|63Hi0ifH0e5<-lk>2(0+tP)tCHS1w|{V;b*g6+_*$-$&-0e-E-o&CbnuTl
zFb#m}9nWP|*W3Qrdu)N<<cR&rb<j7EwFLaDXnQu`@PDm4qYHY3l;jjb{Uk{$5z>$(
zLd%=LY0H4nBl0;yk4ci5m?23$((A?)Wx?!9jhaf%;&?uG9LJAf7?zLYCol}haoL&k
zqcB+{lNB(t$8h{8hA|T-F{}VDELJQE*W-w;TpJPRbfQH&7Ly5)z(eCX18=|ou<bQ@
z>@FJ$qJM;0X$M%1m{vVs4Libu6PH3Y(VG!@_@d{ANo8*FJWzx?mKux=me0b1q3YLF
zP0OJw)aZU_9-+%hSInkopp#pK1^dg4<ss#4skP!w^?b8a_41=(&Zy~x&ez_<`IY&%
zv^IqV`&vpX>pAsmcOj_h+`Fr|-W3tH)N!khlU;VKYp{D_j=OpFiO%H)5*KUBOo{;h
zW>|{BG{D;WMsC4h+MMy(+G)RbqB*zV7p>|fld)w`AwrMC01LyE^nWaYC9niO<lvt>
Weytc?Nkc*a0000<MNUMnLSTaG8)JF^

diff --git a/tests/ref/math-underover-parens.png b/tests/ref/math-underover-parens.png
index a461ee078021748637971894249a2e8044df6146..9d7057d43889f3e15516cc44584874189c510492 100644
GIT binary patch
delta 725
zcmV;`0xJF11>gmc7k@Vh00000;sMdO0007~Nkl<Zc-rmQPe@a700(d{o~9=cUJ5)b
zbdjC96of$?iYQPrNa#`|NM@cgHQkz|rX!08XRap8bWU;q-kaONX{${$=lqi+^Z%B6
z>T^0bb>Eh62Mq)d@26nz`wqXy_ws??`~BYU@e*)MNf2NG7Jpy?J_^_;H3OIeplPlH
zLjHKqmCV_~03jG1Isi=oYr(}BW{uZe`CB^)g7C2JfzAT7b+S5zOy}czOROA@*o+#2
zaL`}xXVBZ<AN9LB{994{y_i@TqyuA>gy2A(oY|e#)x2COH`UfnI%<f|zfs8$UDZLv
zvlH4=p5T2PnSb@T>}IM;CTpaqMwzUNGTU9A*$6o}NXzrHGEx$gQ`6Ej#YrO3X|ec}
zNR%YbOixQqPE5(j%9qnYzTv1MCtIqrd6&aDAmL@NO(o6FQABx#P2D(Tx=q3%K>$`C
zDIC(yP+sm<!VLr8;NKt*D??}8m3!ei(=`;h$-^s4*ME1%8i^!JBIyHGUB$Qn@-W+0
z8~L$ss%2K@26=e$c3Jt$&_1~9ZGoITjE&e8&qr=(Tfez<9Q!zYS8WnLZ~2EmA8_z4
zP7sC{%b(fVf6MvqQu!A77f5Si&ZYBL^9mlulAn9|+?8A9=Ix_;#+$#~j=or&V{<zv
zb8#`AV}F7-i*dM2E%OVb6i$2OgPn%A#}ENLww0f~3ofnUyMDt+=|=RJADq?p=y9)g
zn`hXmU#WX%k+P3RR6zJiV7wA#!Ta8lukDUko$99XJA)O*7R5xp4?M#(%~mK!pEHg0
z8nE^V3neI8ub6HaQh(9tZ7O#W0+i*w=k??auTJn{4XdYCo2?B4Pphi|^gDdcp3$ND
z-ZxZ>LEYY^v`pBhHJwVU@6$G+?exM?EBt&BU;!53{}lcML;@T?9WH-$00000NkvXX
Hu0mjfcd}y(

delta 715
zcmV;+0yO>L1=a<S7k@Sg00000DO~~*0007=Nkl<Zc-rmQ-Ahwp90%}S)Yb6POK<%L
z@*=A{iy&|ECWS&sg1V4I#VEtFB2DoHol8N?<wTd$ZN4z~a%2kTmbmG(?aY}w;+(eS
z4mwxc+{?GMc{Au@7w2rC=X>Bh@VoiIkLP)Ko`;7lg~!1h%zwcgoC(<7JO^M0fPAP6
z2zZc8vPfUA^|Ay*p#&fTd^+5YWAjKRS^PEm11!QD${M8(n3(b@2V0bGB%+HKH%=GS
zau#8~r`tngQLm4Aj0#UUhJPO&FZv0u?LAAdw@W}Lx_bQZL36Uz^Fbn}I_tk$OtU(x
z{WwcBkWxI4%YSK?5Y|@|7v$&V=J0tu-eo@jQhea&<mTlU6j#&>iCq?8S9?iOX-$V{
zY<f<=W_P+wMkDERkw&A*<+QKq=cdO*9W|vzCG9R|VO7;i7-=NDQl&c2d$m7Xa8pL%
zwNatyQwlsHfX2Z-tihF|MF38Us-q|$K$3S+cE~;qOMhiz7?()OB$Dp{WPP{^)?x2V
z+vgo~N~@cUrb_l<TA=BZAqA$y_ogyCt2Yz>z?0DZ?3}qKCjHzglX+N9;C~4XSXhR!
z@S?hNc6sYCf<%G`)+O27>UWMzwAw0eEWcG)crBi*H|{)cmG5&`80O&pex#RZj9D0s
zNH01!(|>SKqO!jhw?xOKeW$>%+%&VOF;tEA4%&uVdZe8vidAiopyT9`G{P_}`x<#B
zHn-6Y8a3c;g#RU~f4|!8G><KRnbnL~%2#Dt^)T6ez$_ek>gfHZ5EvSE21Y#qYJHYB
z2Osw9)|(dkwIa#n$EDVvW~oAGkP%Ks;iL6G$3%OuQtQrE^K$@U8)78(%+$s<xoz9r
xvO2ICvu|0cD9P4xA`DvY4TOU^n1e4U{1=aWrau`1Bw_#n002ovPDHLkV1o6mS-SuL

diff --git a/tests/ref/math-underover-shells.png b/tests/ref/math-underover-shells.png
index fb327af69589a0082635205868c3ef5631a65ba6..42fa690e3c19966995c5d374e9f343154a25d434 100644
GIT binary patch
delta 535
zcmV+y0_gpx1fv9y7k@Pf00000ugP${0005%Nkl<Zc-mw5KR|$C)Z$T#M=c(;ct9;)
z^N;Qp@0z}P;s5`O|NZ~Brtj7&I$Hd_?#2I`3)1E-__<-jw9E9f`0u3XlNZ1~{=agQ
zKRtu`<NvQf@-z@1yx2J~srt;`Kco4WMiy_Dm%{{#`)F?Q+JDr)SVVuv?x3;7Z+fwp
zR)4xajwUY3EIv}R4$6WC@zcpweNX|KTKs#~Y$&T6LKR*7uXhWQyl>DnsNoj3L4)AY
zf6J?2*2Zh}u=wA<)_>5jJ(dU&Sbqg5LTigRbar}lb}j=kU)25n{r~^H&d&Iv&dv|?
z3+gXTkB^=}34iL7|G!=N|Ku5!Ek0aSd<4bf+3xP{ACWEolluQ==l`{vX_k*qqYK=5
zKia&dqQ&R!o)V|<soi<%`uL>j$~6d3UjhWRYu40)=z1iHm8K`D9n|OCTo6D;2neKH
zT%<s>43dP~xzWT$Rg1g6G(y@vzaadB3r|m{i^Y@QwSPhy(W@agcK{*HEq=MM7i#hL
zGaJKqyvcl4^dkOB{0*90{B=djABe>p3a&MN`&;?H@_z#m(%j-DyK}cU-YI_h|No?~
z%jWO;)c88|L-yzF&$N%@8{gjFe108h@rN7#{@nZj<=U0!H(uR%Gg?WET0Cm;sKs;x
Z0N>v>2N3M_Ne}=4002ovPDHLkV1gvvBlG|O

delta 539
zcmV+$0_6Rp1g8X$7k@Me00000WR;^C0005*Nkl<Zc-rmQ-77<J7zc1yZulEWsolBv
z7tEbY7t%?YJJQ@B39<ahE+}s+(Y$1au^Y*hyyTd-&1fWf8AdWkm~H3$9@{x5+t|g*
zerL6Q-(5V<o?U#}b6z@~EJ#zbC`@4rQ#h@#87mI249<=N7=JNfv;N$qAnb4P!r55$
z=vcsF88}uB7W&HBBk>=@%u=b6tLESX0PFy;?m+1|tM_a?y^aaN*8IG`DOe*8&uN4N
z(@@1SVfeWhC!F)$96h=I2X8jd%N>@=U4N5a9uS2?BL=zak&4y<MdxB?b(4hQ2iD0e
zxPjsmv0FS<0)NK16U)2Zu9OA~E{uu87KBO=nu@gEmQV=b5+O#5(5rH*es90s+KF2=
z3!g6V+@~1c(AICp!3MQj&BemJ2F?)7S&3c8_TPgGUnbr_oF+&zCTB`vf$4yx(!mHR
zg#l{{Rng>Thm)gH<wR<3%nyYcobqG5%SJOj8qOrkPJc$~G#kxshCce}-*tl6@Y44!
z<I%7paQ{oEL@ory(j{~W#NnrjJ{ex!vz9GC*WNdH85iRw4*N}2yab!I?lwPeghpr$
ze~80ITa8V3-QWWl3QQQ*xz@Kbe_f#Ni#UuO+~eW(z6apZ$p=rtcWA#l@EknQR}mDZ
dFohM%HxyWgzrh2izfAxD002ovPDHLkV1lG}0z3c!


From 5a918cb67ef0782ecc3581d40e9d500bc1ac7bb5 Mon Sep 17 00:00:00 2001
From: iwkjosec <Actionintint@outlook.jp>
Date: Wed, 12 Nov 2025 22:13:50 +0900
Subject: [PATCH 17/54] Change `d` to `dif` in the examples in the
 documentation (#7361)

---
 crates/typst-library/src/math/equation.rs | 2 +-
 docs/reference/library/math.md            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/crates/typst-library/src/math/equation.rs b/crates/typst-library/src/math/equation.rs
index b3c2c7880d..3c559149a7 100644
--- a/crates/typst-library/src/math/equation.rs
+++ b/crates/typst-library/src/math/equation.rs
@@ -111,7 +111,7 @@ pub struct EquationElem {
     /// ```example
     /// #math.equation(
     ///   alt: "integral from 1 to infinity of a x squared plus b with respect to x",
-    ///   $ integral_1^oo a x^2 + b med d x $,
+    ///   $ integral_1^oo a x^2 + b dif x $,
     /// )
     /// ```
     pub alt: Option<EcoString>,
diff --git a/docs/reference/library/math.md b/docs/reference/library/math.md
index 7c37a48af7..5a26e629bf 100644
--- a/docs/reference/library/math.md
+++ b/docs/reference/library/math.md
@@ -110,7 +110,7 @@ Guide]($guides/accessibility/#textual-representations).
 ```example
 #math.equation(
   alt: "d S equals delta q divided by T",
-  $ d "S" = (delta q) / T $,
+  $ dif S = (delta q) / T $,
 )
 ```
 

From a0176eacf9de21fcf29f38d982318b8b9cc5234e Mon Sep 17 00:00:00 2001
From: Tobias Schmitz <tobiasschmitz2001@gmail.com>
Date: Wed, 12 Nov 2025 16:15:46 +0100
Subject: [PATCH 18/54] Bump MSRV to 1.89 (#7363)

---
 .github/workflows/ci.yml | 2 +-
 Cargo.toml               | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 3c6bbaad66..3fc7e23f42 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -88,7 +88,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - uses: dtolnay/rust-toolchain@1.88.0
+      - uses: dtolnay/rust-toolchain@1.89.0
       - uses: Swatinem/rust-cache@v2
       - run: cargo check --workspace
 
diff --git a/Cargo.toml b/Cargo.toml
index 946fcb148a..454d6a7cec 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -5,7 +5,7 @@ resolver = "2"
 
 [workspace.package]
 version = "0.14.0"
-rust-version = "1.88" # also change in ci.yml
+rust-version = "1.89" # also change in ci.yml
 authors = ["The Typst Project Developers"]
 edition = "2024"
 homepage = "https://typst.app"

From b2994161822904f19e674307ba6599dcfaf5cd2e Mon Sep 17 00:00:00 2001
From: "Y.D.X." <73375426+YDX-2147483647@users.noreply.github.com>
Date: Thu, 13 Nov 2025 00:58:51 +0800
Subject: [PATCH 19/54] Fix parsing of consecutive examples in docs (#7325)

---
 docs/src/lib.rs | 48 ++++++++++++++++++++++++++++++++++++++++++++----
 1 file changed, 44 insertions(+), 4 deletions(-)

diff --git a/docs/src/lib.rs b/docs/src/lib.rs
index 330dcd8f2d..cb6cbf1270 100644
--- a/docs/src/lib.rs
+++ b/docs/src/lib.rs
@@ -571,9 +571,12 @@ fn details_blocks(docs: &str) -> Vec<RawDetailsBlock<'_>> {
                 let tag = &docs[fence_idx + fence_len..lang_tag_end].trim();
                 let title = ExampleArgs::from_tag(tag).title;
 
-                // First, push non-fenced content.
-                if found > 0 {
-                    res.push(RawDetailsBlock::Markdown(&docs[i..fence_idx]));
+                // First, push non-fenced content. It might be all whitespaces
+                // if it's between two consecutive fences. Therefore, we have to
+                // trim it before checking.
+                let content_before_fence = &docs[i..fence_idx];
+                if !content_before_fence.trim().is_empty() {
+                    res.push(RawDetailsBlock::Markdown(content_before_fence));
                 }
 
                 // Then, find the end of the fence.
@@ -596,7 +599,11 @@ fn details_blocks(docs: &str) -> Vec<RawDetailsBlock<'_>> {
                 i = fence_end;
             }
             None => {
-                res.push(RawDetailsBlock::Markdown(&docs[i..]));
+                // Push the remaining content only if it's non-empty after trimming.
+                let slice = &docs[i..];
+                if !slice.trim().is_empty() {
+                    res.push(RawDetailsBlock::Markdown(slice));
+                }
                 break;
             }
         }
@@ -1082,4 +1089,37 @@ mod tests {
             "/"
         }
     }
+
+    #[test]
+    fn test_parsing_details_blocks() {
+        let docs = r#"
+A brief description of the parameter.
+
+```example
+A basic example.
+```
+
+Further descriptions.
+
+```example
+An _advanced_ example.
+```
+
+```example
+Immediately followed by another example.
+There should be no additional markdown block between them.
+
+Empty lines after the final example should also be dropped.
+```
+
+"#;
+        let blocks = details_blocks(docs);
+
+        assert_eq!(blocks.len(), 5);
+        matches!(blocks[0], RawDetailsBlock::Markdown { .. });
+        matches!(blocks[1], RawDetailsBlock::Example { .. });
+        matches!(blocks[2], RawDetailsBlock::Markdown { .. });
+        matches!(blocks[3], RawDetailsBlock::Example { .. });
+        matches!(blocks[4], RawDetailsBlock::Example { .. });
+    }
 }

From 47be47671bf4e0cac62b3747450c3c74432dd32d Mon Sep 17 00:00:00 2001
From: PgBiel <9021226+PgBiel@users.noreply.github.com>
Date: Wed, 12 Nov 2025 14:05:42 -0300
Subject: [PATCH 20/54] Fix table headers and footers with gutter in HTML
 export (#7332)

---
 crates/typst-html/src/rules.rs                | 33 ++++++++---
 tests/ref/html/col-gutter-table.html          | 34 +++++++-----
 tests/ref/html/col-row-gutter-table.html      | 34 +++++++-----
 tests/ref/html/multi-header-table-gutter.html | 49 +++++++++++++++++
 tests/ref/html/row-gutter-table.html          | 34 +++++++-----
 .../html/table-wide-header-gutter-table.html  | 29 ++++++++++
 tests/ref/html/table-wide-header-table.html   | 29 ++++++++++
 tests/suite/layout/grid/html.typ              | 55 ++++++++++++++++++-
 8 files changed, 241 insertions(+), 56 deletions(-)
 create mode 100644 tests/ref/html/multi-header-table-gutter.html
 create mode 100644 tests/ref/html/table-wide-header-gutter-table.html
 create mode 100644 tests/ref/html/table-wide-header-table.html

diff --git a/crates/typst-html/src/rules.rs b/crates/typst-html/src/rules.rs
index 8bca088d0d..06dd0584b1 100644
--- a/crates/typst-html/src/rules.rs
+++ b/crates/typst-html/src/rules.rs
@@ -8,7 +8,7 @@ use typst_library::foundations::{
     Content, Context, NativeElement, NativeRuleMap, ShowFn, Smart, StyleChain, Target,
 };
 use typst_library::introspection::Counter;
-use typst_library::layout::resolve::{Cell, CellGrid, Entry};
+use typst_library::layout::resolve::{Cell, CellGrid, Entry, Header};
 use typst_library::layout::{
     BlockBody, BlockElem, BoxElem, HElem, OuterVAlignment, Sizing,
 };
@@ -563,10 +563,25 @@ fn show_cellgrid(grid: &CellGrid, styles: StyleChain) -> Content {
     // TODO(subfooters): similarly to headers, take consecutive footers from
     // the end for 'tfoot'.
     let footer = grid.footer.as_ref().map(|ft| {
-        let rows = rows.drain(ft.start..);
+        // Convert from gutter to non-gutter coordinates. Use ceil as it might
+        // include the previous gutter row
+        // (cf. typst-library/layout/grid/resolve.rs).
+        let footer_start = if grid.has_gutter { ft.start.div_ceil(2) } else { ft.start };
+        let rows = rows.drain(footer_start..);
         elem(tag::tfoot, Content::sequence(rows.map(|row| tr(tag::td, row))))
     });
 
+    // Header range converting from gutter (doubled) to non-gutter coordinates.
+    let header_range = |hd: &Header| {
+        if grid.has_gutter {
+            // Use ceil as it might be `2 * row_amount - 1` if the header is at
+            // the end (cf. typst-library/layout/grid/resolve.rs).
+            hd.range.start / 2..hd.range.end.div_ceil(2)
+        } else {
+            hd.range.clone()
+        }
+    };
+
     // Store all consecutive headers at the start in 'thead'. All remaining
     // headers are just 'th' rows across the table body.
     let mut consecutive_header_end = 0;
@@ -574,15 +589,16 @@ fn show_cellgrid(grid: &CellGrid, styles: StyleChain) -> Content {
         .headers
         .iter()
         .take_while(|hd| {
-            let is_consecutive = hd.range.start == consecutive_header_end;
-            consecutive_header_end = hd.range.end;
+            let range = header_range(hd);
+            let is_consecutive = range.start == consecutive_header_end;
+            consecutive_header_end = range.end;
             is_consecutive
         })
         .count();
 
     let (y_offset, header) = if first_mid_table_header > 0 {
         let removed_header_rows =
-            grid.headers.get(first_mid_table_header - 1).unwrap().range.end;
+            header_range(grid.headers.get(first_mid_table_header - 1).unwrap()).end;
         let rows = rows.drain(..removed_header_rows);
 
         (
@@ -601,10 +617,11 @@ fn show_cellgrid(grid: &CellGrid, styles: StyleChain) -> Content {
     let mut body =
         Content::sequence(rows.into_iter().enumerate().map(|(relative_y, row)| {
             let y = relative_y + y_offset;
-            if let Some(current_header) =
-                grid.headers.get(next_header).filter(|h| h.range.contains(&y))
+            if let Some(current_header_range) =
+                grid.headers.get(next_header).map(|h| header_range(h))
+                && current_header_range.contains(&y)
             {
-                if y + 1 == current_header.range.end {
+                if y + 1 == current_header_range.end {
                     next_header += 1;
                 }
 
diff --git a/tests/ref/html/col-gutter-table.html b/tests/ref/html/col-gutter-table.html
index 54170f5340..8894df9b17 100644
--- a/tests/ref/html/col-gutter-table.html
+++ b/tests/ref/html/col-gutter-table.html
@@ -6,21 +6,25 @@
   </head>
   <body>
     <table>
-      <tr>
-        <td>a</td>
-        <td>b</td>
-        <td>c</td>
-      </tr>
-      <tr>
-        <td>d</td>
-        <td>e</td>
-        <td>f</td>
-      </tr>
-      <tr>
-        <td>g</td>
-        <td>h</td>
-        <td>i</td>
-      </tr>
+      <thead>
+        <tr>
+          <th>a</th>
+          <th>b</th>
+          <th>c</th>
+        </tr>
+      </thead>
+      <tbody>
+        <tr>
+          <td>d</td>
+          <td>e</td>
+          <td>f</td>
+        </tr>
+        <tr>
+          <td>g</td>
+          <td>h</td>
+          <td>i</td>
+        </tr>
+      </tbody>
     </table>
   </body>
 </html>
diff --git a/tests/ref/html/col-row-gutter-table.html b/tests/ref/html/col-row-gutter-table.html
index 54170f5340..8894df9b17 100644
--- a/tests/ref/html/col-row-gutter-table.html
+++ b/tests/ref/html/col-row-gutter-table.html
@@ -6,21 +6,25 @@
   </head>
   <body>
     <table>
-      <tr>
-        <td>a</td>
-        <td>b</td>
-        <td>c</td>
-      </tr>
-      <tr>
-        <td>d</td>
-        <td>e</td>
-        <td>f</td>
-      </tr>
-      <tr>
-        <td>g</td>
-        <td>h</td>
-        <td>i</td>
-      </tr>
+      <thead>
+        <tr>
+          <th>a</th>
+          <th>b</th>
+          <th>c</th>
+        </tr>
+      </thead>
+      <tbody>
+        <tr>
+          <td>d</td>
+          <td>e</td>
+          <td>f</td>
+        </tr>
+        <tr>
+          <td>g</td>
+          <td>h</td>
+          <td>i</td>
+        </tr>
+      </tbody>
     </table>
   </body>
 </html>
diff --git a/tests/ref/html/multi-header-table-gutter.html b/tests/ref/html/multi-header-table-gutter.html
new file mode 100644
index 0000000000..8a34ac1709
--- /dev/null
+++ b/tests/ref/html/multi-header-table-gutter.html
@@ -0,0 +1,49 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+  </head>
+  <body>
+    <table>
+      <thead>
+        <tr>
+          <th>First</th>
+          <th>Header</th>
+        </tr>
+        <tr>
+          <th>Second</th>
+          <th>Header</th>
+        </tr>
+        <tr>
+          <th>Level 2</th>
+          <th>Header</th>
+        </tr>
+        <tr>
+          <th>Level 3</th>
+          <th>Header</th>
+        </tr>
+      </thead>
+      <tbody>
+        <tr>
+          <td>Body</td>
+          <td>Cells</td>
+        </tr>
+        <tr>
+          <td>Yet</td>
+          <td>More</td>
+        </tr>
+      </tbody>
+      <tfoot>
+        <tr>
+          <td>Footer</td>
+          <td>Row</td>
+        </tr>
+        <tr>
+          <td>Ending</td>
+          <td>Table</td>
+        </tr>
+      </tfoot>
+    </table>
+  </body>
+</html>
diff --git a/tests/ref/html/row-gutter-table.html b/tests/ref/html/row-gutter-table.html
index 54170f5340..8894df9b17 100644
--- a/tests/ref/html/row-gutter-table.html
+++ b/tests/ref/html/row-gutter-table.html
@@ -6,21 +6,25 @@
   </head>
   <body>
     <table>
-      <tr>
-        <td>a</td>
-        <td>b</td>
-        <td>c</td>
-      </tr>
-      <tr>
-        <td>d</td>
-        <td>e</td>
-        <td>f</td>
-      </tr>
-      <tr>
-        <td>g</td>
-        <td>h</td>
-        <td>i</td>
-      </tr>
+      <thead>
+        <tr>
+          <th>a</th>
+          <th>b</th>
+          <th>c</th>
+        </tr>
+      </thead>
+      <tbody>
+        <tr>
+          <td>d</td>
+          <td>e</td>
+          <td>f</td>
+        </tr>
+        <tr>
+          <td>g</td>
+          <td>h</td>
+          <td>i</td>
+        </tr>
+      </tbody>
     </table>
   </body>
 </html>
diff --git a/tests/ref/html/table-wide-header-gutter-table.html b/tests/ref/html/table-wide-header-gutter-table.html
new file mode 100644
index 0000000000..99005a1aec
--- /dev/null
+++ b/tests/ref/html/table-wide-header-gutter-table.html
@@ -0,0 +1,29 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+  </head>
+  <body>
+    <table>
+      <thead>
+        <tr>
+          <th>a</th>
+          <th>b</th>
+          <th>c</th>
+        </tr>
+        <tr>
+          <th>d</th>
+          <th>e</th>
+          <th>f</th>
+        </tr>
+        <tr>
+          <th>g</th>
+          <th>h</th>
+          <th>i</th>
+        </tr>
+      </thead>
+      <tbody></tbody>
+    </table>
+  </body>
+</html>
diff --git a/tests/ref/html/table-wide-header-table.html b/tests/ref/html/table-wide-header-table.html
new file mode 100644
index 0000000000..99005a1aec
--- /dev/null
+++ b/tests/ref/html/table-wide-header-table.html
@@ -0,0 +1,29 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+  </head>
+  <body>
+    <table>
+      <thead>
+        <tr>
+          <th>a</th>
+          <th>b</th>
+          <th>c</th>
+        </tr>
+        <tr>
+          <th>d</th>
+          <th>e</th>
+          <th>f</th>
+        </tr>
+        <tr>
+          <th>g</th>
+          <th>h</th>
+          <th>i</th>
+        </tr>
+      </thead>
+      <tbody></tbody>
+    </table>
+  </body>
+</html>
diff --git a/tests/suite/layout/grid/html.typ b/tests/suite/layout/grid/html.typ
index cf98d4bc5a..1fb0cc79b8 100644
--- a/tests/suite/layout/grid/html.typ
+++ b/tests/suite/layout/grid/html.typ
@@ -35,7 +35,7 @@
 #table(
   columns: 3,
   column-gutter: 3pt,
-  [a], [b], [c],
+  table.header([a], [b], [c]),
   [d], [e], [f],
   [g], [h], [i]
 )
@@ -44,7 +44,7 @@
 #table(
   columns: 3,
   row-gutter: 3pt,
-  [a], [b], [c],
+  table.header([a], [b], [c]),
   [d], [e], [f],
   [g], [h], [i]
 )
@@ -53,11 +53,32 @@
 #table(
   columns: 3,
   gutter: 3pt,
-  [a], [b], [c],
+  table.header([a], [b], [c]),
   [d], [e], [f],
   [g], [h], [i]
 )
 
+--- table-wide-header-table html ---
+#table(
+  columns: 3,
+  table.header(
+    [a], [b], [c],
+    [d], [e], [f],
+    [g], [h], [i]
+  )
+)
+
+--- table-wide-header-gutter-table html ---
+#table(
+  columns: 3,
+  gutter: 3pt,
+  table.header(
+    [a], [b], [c],
+    [d], [e], [f],
+    [g], [h], [i]
+  )
+)
+
 --- multi-header-table html ---
 #table(
   columns: 2,
@@ -86,6 +107,34 @@
   ),
 )
 
+--- multi-header-table-gutter html ---
+#table(
+  columns: 2,
+  gutter: 3pt,
+  table.header(
+    [First], [Header]
+  ),
+  table.header(
+    [Second], [Header]
+  ),
+  table.header(
+    [Level 2], [Header],
+    level: 2,
+  ),
+  table.header(
+    [Level 3], [Header],
+    level: 3,
+  ),
+
+  [Body], [Cells],
+  [Yet], [More],
+
+  table.footer(
+    [Footer], [Row],
+    [Ending], [Table],
+  ),
+)
+
 --- multi-header-inside-table html ---
 #table(
   columns: 2,

From 84bd738e9009ccae20e85dcc7682cefcb72f2b85 Mon Sep 17 00:00:00 2001
From: Laurenz <laurmaedje@gmail.com>
Date: Thu, 13 Nov 2025 17:56:11 +0100
Subject: [PATCH 21/54] Update Rust nightly version used in tests (#7366)

---
 .github/workflows/ci.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 3fc7e23f42..846321a7c5 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -99,7 +99,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: dtolnay/rust-toolchain@master
         with:
-          toolchain: nightly-2025-05-10
+          toolchain: nightly-2025-10-28
       - uses: Swatinem/rust-cache@v2
       - run: cargo install --locked cargo-fuzz@0.12.0
       - run: cd tests/fuzz && cargo fuzz build --dev
@@ -112,6 +112,6 @@ jobs:
       - uses: dtolnay/rust-toolchain@master
         with:
           components: miri
-          toolchain: nightly-2025-05-10
+          toolchain: nightly-2025-10-28
       - uses: Swatinem/rust-cache@v2
       - run: cargo miri test -p typst-library test_miri

From ab330a804b42b177898366fdde4157c97c263ab3 Mon Sep 17 00:00:00 2001
From: Tobias Schmitz <tobiasschmitz2001@gmail.com>
Date: Fri, 14 Nov 2025 14:28:13 +0100
Subject: [PATCH 22/54] Update krilla (#7369)

Co-authored-by: Laurenz <laurmaedje@gmail.com>
---
 Cargo.lock                      | 33 +++++++++++++++++++++++----------
 Cargo.toml                      |  4 ++--
 crates/typst-pdf/src/convert.rs | 10 +++++-----
 crates/typst-pdf/src/image.rs   | 12 ++++++------
 4 files changed, 36 insertions(+), 23 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index a1c8dae33e..d39cc706a7 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1020,7 +1020,7 @@ dependencies = [
  "log",
  "rustc-hash",
  "smallvec",
- "zune-jpeg",
+ "zune-jpeg 0.4.14",
 ]
 
 [[package]]
@@ -1282,8 +1282,8 @@ dependencies = [
  "image-webp",
  "num-traits",
  "png",
- "zune-core",
- "zune-jpeg",
+ "zune-core 0.4.12",
+ "zune-jpeg 0.4.14",
 ]
 
 [[package]]
@@ -1438,8 +1438,7 @@ dependencies = [
 [[package]]
 name = "krilla"
 version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "199be5f63da6e19b71051fd5276258a8e55449ac48e2e7492c68238f38ca9f3b"
+source = "git+https://github.com/LaurenzV/krilla?rev=e5639c6#e5639c6a22e763cae577212b87074bb3f0ffd3cc"
 dependencies = [
  "base64",
  "bumpalo",
@@ -1463,14 +1462,13 @@ dependencies = [
  "tiny-skia-path",
  "xmp-writer",
  "yoke 0.8.0",
- "zune-jpeg",
+ "zune-jpeg 0.5.5",
 ]
 
 [[package]]
 name = "krilla-svg"
 version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8d3eec075c9507dfdbfb4b9bc3b2aeac074ed422b61bcfd93517616d6b3d19c3"
+source = "git+https://github.com/LaurenzV/krilla?rev=e5639c6#e5639c6a22e763cae577212b87074bb3f0ffd3cc"
 dependencies = [
  "flate2",
  "fontdb",
@@ -2275,7 +2273,7 @@ dependencies = [
  "svgtypes",
  "tiny-skia",
  "usvg",
- "zune-jpeg",
+ "zune-jpeg 0.4.14",
 ]
 
 [[package]]
@@ -4125,11 +4123,26 @@ version = "0.4.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3f423a2c17029964870cfaabb1f13dfab7d092a62a29a89264f4d36990ca414a"
 
+[[package]]
+name = "zune-core"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "111f7d9820f05fd715df3144e254d6fc02ee4088b0644c0ffd0efc9e6d9d2773"
+
 [[package]]
 name = "zune-jpeg"
 version = "0.4.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "99a5bab8d7dedf81405c4bb1f2b83ea057643d9cb28778cea9eecddeedd2e028"
 dependencies = [
- "zune-core",
+ "zune-core 0.4.12",
+]
+
+[[package]]
+name = "zune-jpeg"
+version = "0.5.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dc6fb7703e32e9a07fb3f757360338b3a567a5054f21b5f52a666752e333d58e"
+dependencies = [
+ "zune-core 0.5.0",
 ]
diff --git a/Cargo.toml b/Cargo.toml
index 454d6a7cec..53bf35bf23 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -77,8 +77,8 @@ image = { version = "0.25.5", default-features = false, features = ["png", "jpeg
 indexmap = { version = "2", features = ["serde"] }
 infer = { version = "0.19.0", default-features = false }
 kamadak-exif = "0.6"
-krilla = { version = "0.5.0", default-features = false, features = ["raster-images", "comemo", "rayon", "pdf"] }
-krilla-svg = "0.2"
+krilla = { git = "https://github.com/LaurenzV/krilla", rev = "e5639c6", default-features = false, features = ["raster-images", "comemo", "rayon", "pdf"] }
+krilla-svg = { git = "https://github.com/LaurenzV/krilla", rev = "e5639c6" }
 kurbo = "0.12"
 libfuzzer-sys = "0.4"
 lipsum = "0.9"
diff --git a/crates/typst-pdf/src/convert.rs b/crates/typst-pdf/src/convert.rs
index 0944dc4b96..90dbace104 100644
--- a/crates/typst-pdf/src/convert.rs
+++ b/crates/typst-pdf/src/convert.rs
@@ -399,8 +399,8 @@ pub(crate) fn handle_group(
     Ok(())
 }
 
-#[typst_macros::time(name = "finish export")]
 /// Finish a krilla document and handle export errors.
+#[typst_macros::time(name = "finish export")]
 fn finish(
     document: Document,
     gc: GlobalContext,
@@ -411,11 +411,11 @@ fn finish(
     match document.finish() {
         Ok(r) => Ok(r),
         Err(e) => match e {
-            KrillaError::Font(f, s) => {
+            KrillaError::Font(f, err) => {
                 let font_str = display_font(gc.fonts_backward.get(&f).unwrap());
                 bail!(
                     Span::detached(),
-                    "failed to process font {font_str}: {s}";
+                    "failed to process font {font_str} ({err})";
                     hint: "make sure the font is valid";
                     hint: "the used font might be unsupported by Typst"
                 );
@@ -427,9 +427,9 @@ fn finish(
                     .collect::<EcoVec<_>>();
                 Err(errors)
             }
-            KrillaError::Image(_, loc) => {
+            KrillaError::Image(_, loc, err) => {
                 let span = to_span(loc);
-                bail!(span, "failed to process image");
+                bail!(span, "failed to process image ({err})");
             }
             KrillaError::SixteenBitImage(image, _) => {
                 let span = gc.image_to_spans.get(&image).unwrap();
diff --git a/crates/typst-pdf/src/image.rs b/crates/typst-pdf/src/image.rs
index 69099696cd..a94d598be9 100644
--- a/crates/typst-pdf/src/image.rs
+++ b/crates/typst-pdf/src/image.rs
@@ -1,12 +1,13 @@
 use std::hash::{Hash, Hasher};
 use std::sync::{Arc, OnceLock};
 
+use ecow::eco_format;
 use image::{DynamicImage, EncodableLayout, GenericImageView, Rgba};
 use krilla::image::{BitsPerComponent, CustomImage, ImageColorspace};
 use krilla::pdf::PdfDocument;
 use krilla::surface::Surface;
 use krilla_svg::{SurfaceExt, SvgSettings};
-use typst_library::diag::{SourceResult, bail};
+use typst_library::diag::{At, SourceResult};
 use typst_library::foundations::Smart;
 use typst_library::layout::{Abs, Angle, Ratio, Size, Transform};
 use typst_library::visualize::{
@@ -48,10 +49,9 @@ pub(crate) fn handle_image(
             surface.push_transform(&exif_transform.to_krilla());
             let mut surface = defer(surface, |s| s.pop());
 
-            let image = match convert_raster(raster.clone(), interpolate) {
-                None => bail!(span, "failed to process image"),
-                Some(i) => i,
-            };
+            let image = convert_raster(raster.clone(), interpolate)
+                .map_err(|err| eco_format!("failed to process image ({err})"))
+                .at(span)?;
 
             if !gc.image_to_spans.contains_key(&image) {
                 gc.image_to_spans.insert(image.clone(), span);
@@ -189,7 +189,7 @@ impl CustomImage for PdfRasterImage {
 fn convert_raster(
     raster: RasterImage,
     interpolate: bool,
-) -> Option<krilla::image::Image> {
+) -> Result<krilla::image::Image, String> {
     if let RasterFormat::Exchange(ExchangeFormat::Jpg) = raster.format() {
         let image_data: Arc<dyn AsRef<[u8]> + Send + Sync> =
             Arc::new(raster.data().clone());

From 74b7514ea488b074bb6b0d640cb7fdbf1f40f652 Mon Sep 17 00:00:00 2001
From: "Y.D.X." <73375426+YDX-2147483647@users.noreply.github.com>
Date: Mon, 17 Nov 2025 23:06:58 +0800
Subject: [PATCH 23/54] Correct a typo in v0.14.0 changelog (#7387)

---
 docs/changelog/0.14.0.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/changelog/0.14.0.md b/docs/changelog/0.14.0.md
index a6e060ad94..f51821bbd2 100644
--- a/docs/changelog/0.14.0.md
+++ b/docs/changelog/0.14.0.md
@@ -208,7 +208,7 @@ _Thanks to [@mkorje](https://github.com/mkorje) for his work on math!_
 - Added [`from`]($direction.from), [`to`]($direction.to), and [`sign`]($direction.sign) methods to `direction` type [#5893]
 - [Labels]($label) cannot be empty anymore [#6332] **(Minor breaking change)**
 - The WebAssembly runtime used by the [`plugin`] system was updated and now supports SIMD [#6997]
-- Numberings and counters now use 64-bit numbers instead of platform-dependant numbers for consistency across platforms [#6026]
+- Numberings and counters now use 64-bit numbers instead of platform-dependent numbers for consistency across platforms [#6026]
 - Improved consistency of how large numbers are handled in data loading functions [#6836]
 - The [`toml`] function is now guaranteed to return a [dictionary] and [`toml.encode`] must receive a dictionary (it already errored before when passed something else, but the new function signature makes the error clearer) [#6743]
 - Serialization of [`bytes`] in human-readable formats now uses [`repr`] [#6743]

From 7715e8889097d14f0d34c93b27e6b8399ad747a2 Mon Sep 17 00:00:00 2001
From: Reina <383821630@qq.com>
Date: Tue, 18 Nov 2025 00:15:35 +0800
Subject: [PATCH 24/54] Add documentation for column breaks in multi-column
 layout example (#7372)

---
 crates/typst-library/src/layout/columns.rs | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/crates/typst-library/src/layout/columns.rs b/crates/typst-library/src/layout/columns.rs
index 0dce1b2b79..3cb4203de2 100644
--- a/crates/typst-library/src/layout/columns.rs
+++ b/crates/typst-library/src/layout/columns.rs
@@ -11,6 +11,22 @@ use crate::layout::{Length, Ratio, Rel};
 /// remaining height on the page. Support for balanced columns is planned for
 /// the future.
 ///
+/// When arranging content across multiple columns, use [`colbreak`]($colbreak)
+/// to explicitly continue in the next column.
+///
+/// # Example
+/// ```example
+/// #columns(2, gutter: 8pt)[
+///   This text is in the
+///   first column.
+///
+///   #colbreak()
+///
+///   This text is in the
+///   second column.
+/// ]
+/// ```
+///
 /// # Page-level columns { #page-level }
 /// If you need to insert columns across your whole document, use the `{page}`
 /// function's [`columns` parameter]($page.columns) instead. This will create

From 92d2a35d8fbbcdc1816818f84d21e10b708422e2 Mon Sep 17 00:00:00 2001
From: Andrew Voynov <37143421+Andrew15-5@users.noreply.github.com>
Date: Tue, 18 Nov 2025 02:23:41 +0300
Subject: [PATCH 25/54] Improve documentation for `state.update` (#7192)

Co-authored-by: Ulrik Sverdrup <bluss@users.noreply.github.com>
Co-authored-by: Laurenz <laurmaedje@gmail.com>
Co-authored-by: bluss <3209739+bluss@users.noreply.github.com>
Co-authored-by: bdr <329386+benderydt@users.noreply.github.com>
---
 .../typst-library/src/introspection/state.rs  | 34 +++++++++++++++----
 1 file changed, 27 insertions(+), 7 deletions(-)

diff --git a/crates/typst-library/src/introspection/state.rs b/crates/typst-library/src/introspection/state.rs
index 1803d7d41c..5a17e3eaf5 100644
--- a/crates/typst-library/src/introspection/state.rs
+++ b/crates/typst-library/src/introspection/state.rs
@@ -353,15 +353,35 @@ impl State {
 
     /// Updates the value of the state.
     ///
-    /// The update will be in effect at the position where the returned content
-    /// is inserted into the document. If you don't put the output into the
-    /// document, nothing happens! This would be the case, for example, if you
-    /// write `{let _ = state("key").update(7)}`. State updates are always
-    /// applied in layout order and in that case, Typst wouldn't know when to
-    /// update the state.
+    /// Returns an invisible piece of [content] that must be inserted into the
+    /// document to take effect. This invisible content tells Typst that the
+    /// specified update should take place wherever the content is inserted into
+    /// the document.
+    ///
+    /// State is a part of your document and runs like a thread embedded in the
+    /// document content. The value of a state is the result of all state
+    /// updates that happened in the document up until that point.
+    ///
+    /// That's why `state.update` returns an invisible sliver of content that
+    /// you need to return and include in the document — a state update that is
+    /// not "placed" in the document does not happen, and "when" it happens is
+    /// determined by where you place it. That's also why you need [context] to
+    /// read state: You need to use the current document position to know where
+    /// on the state's "thread" you are.
+    ///
+    /// Storing a state update in a variable (e.g.
+    /// `{let my-update = state("key").update(c => c * 2)}`) will have no effect
+    /// by itself. Only once you insert the variable `[#my-update]` somewhere
+    /// into the document content, the update will take effect — at the position
+    /// where it was inserted. You can also use `[#my-update]` multiple times at
+    /// different positions. Then, the update will take effect multiple times as
+    /// well.
     ///
     /// In contrast to [`get`]($state.get), [`at`]($state.at), and
-    /// [`final`]($state.final), this function does not require [context].
+    /// [`final`]($state.final), this function does not require [context]. This
+    /// is because, to create the state update, we do not need to know where in
+    /// the document we are. We only need this information to resolve the
+    /// state's value.
     #[func]
     pub fn update(
         self,

From 0d01556eff83fed08560b08b0afb872390f486ac Mon Sep 17 00:00:00 2001
From: Kokologiannakis Michalis
 <95026293+fidelity-michael@users.noreply.github.com>
Date: Wed, 19 Nov 2025 16:43:53 +0200
Subject: [PATCH 26/54] Fix issue with table example  (#7409)

Co-authored-by: Laurenz <laurmaedje@gmail.com>
---
 docs/guides/tables.md | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/docs/guides/tables.md b/docs/guides/tables.md
index 77df47d813..ed7f4c4a6d 100644
--- a/docs/guides/tables.md
+++ b/docs/guides/tables.md
@@ -1257,20 +1257,21 @@ style:
 #let moore = csv("moore.csv")
 
 #table(
-   columns: moore.first().len(),
-   ..moore.map(m => m.slice(2)).flatten(),
+   columns: 2,
+   ..moore.map(m => m.slice(2, 4)).flatten(),
 )
 ```
 
-This example renders the same as the previous one, but first uses the `map`
-function to change each row of the data. We pass a function to map that gets run
-on each row of the CSV and returns a new value to replace that row with. We use
-it to discard the first two columns with `slice`. Then, we spread the data into
-the `table` function. However, we need to pass a one-dimensional array and
-`moore`'s value is two-dimensional (that means that each of its row values
-contains an array with the cell data). That's why we call `flatten` which
-converts it to a one-dimensional array. We also extract the number of columns
-from the data itself.
+This example renders the same as the previous one, but we first load the CSV and
+then transform each row using `map`. The function we pass to `map` is applied to
+each row of the data and returns a new array that replaces the original row.
+Here, we use `{.slice(2, 4)}` to extract only the third and fourth column, since
+these are the ones we want to keep. Because `moore` is a two-dimensional array
+(each row is itself an array), the result of mapping is still a nested array.
+The `flatten` function converts this nested structure into a one-dimensional
+array, which is required when spreading the data into the `table` function.
+Finally, we explicitly specify `{columns: 2}` because we are keeping exactly two
+columns from each row.
 
 Now that we have nice code for our table, we should try to also make the table
 itself nice! The transistor counts go from millions in 1995 to trillions in 2021

From 7b8c83099faf7ee3ca3236e8f22e45cf7e718941 Mon Sep 17 00:00:00 2001
From: "Y.D.X." <73375426+YDX-2147483647@users.noreply.github.com>
Date: Fri, 21 Nov 2025 21:42:56 +0800
Subject: [PATCH 27/54] Fix lack of fallback to float for large integer
 literals (#7389)

---
 crates/typst-syntax/src/lexer.rs | 12 +++++++++++
 tests/suite/foundations/int.typ  | 34 ++++++++++++++++++++++++++++++++
 2 files changed, 46 insertions(+)

diff --git a/crates/typst-syntax/src/lexer.rs b/crates/typst-syntax/src/lexer.rs
index 40b1e29945..6f8f3b9370 100644
--- a/crates/typst-syntax/src/lexer.rs
+++ b/crates/typst-syntax/src/lexer.rs
@@ -1,3 +1,5 @@
+use std::num::IntErrorKind;
+
 use ecow::{EcoString, eco_format};
 use unicode_ident::{is_xid_continue, is_xid_start};
 use unicode_script::{Script, UnicodeScript};
@@ -830,6 +832,16 @@ impl Lexer<'_> {
         let number = self.s.from(start);
         let suffix = self.s.eat_while(|c: char| c.is_ascii_alphanumeric() || c == '%');
 
+        // Parse large integer literals as floats
+        if base == 10
+            && !is_float
+            && let Err(e) = i64::from_str_radix(number, base)
+            && matches!(e.kind(), IntErrorKind::PosOverflow | IntErrorKind::NegOverflow)
+            && number.parse::<f64>().is_ok()
+        {
+            is_float = true;
+        }
+
         let mut suffix_result = match suffix {
             "" => Ok(None),
             "pt" | "mm" | "cm" | "in" | "deg" | "rad" | "em" | "fr" | "%" => Ok(Some(())),
diff --git a/tests/suite/foundations/int.typ b/tests/suite/foundations/int.typ
index 9cb27cf58c..7a8bd3f680 100644
--- a/tests/suite/foundations/int.typ
+++ b/tests/suite/foundations/int.typ
@@ -87,6 +87,40 @@
 #test(repr(-0987654321), "-987654321")
 #test(repr(4 - 8), "-4")
 
+--- int-parse-large-literals ---
+#import "../loading/edge-case.typ": large-integer, representable-integer
+
+#for (name, source) in representable-integer {
+  if name == "i64-min" {
+    // i64-min will be parsed as a float
+    assert.eq(
+      type(eval(source)),
+      float,
+      message: "failed to approximately parse " + name,
+    )
+    // but can still be obtained through integer arithmetic
+    let n = -1 - eval(representable-integer.i64-max)
+    assert(
+      type(n) == int and n < 0,
+      message: "failed to obtained i64-min through integer arithmetic",
+    )
+  } else {
+    assert.eq(
+      type(eval(source)),
+      int,
+      message: "failed to parse " + name,
+    )
+  }
+}
+
+#for (name, source) in large-integer {
+  assert.eq(
+    type(eval(source)),
+    float,
+    message: "failed to approximately parse " + name,
+  )
+}
+
 --- int-display ---
 // Test integers.
 #12 \

From 624de26449a7e61139f092941c792f194b28b006 Mon Sep 17 00:00:00 2001
From: Laurenz <laurmaedje@gmail.com>
Date: Tue, 25 Nov 2025 09:54:45 +0100
Subject: [PATCH 28/54] Bump krilla (#7458)

---
 Cargo.lock | 4 ++--
 Cargo.toml | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index d39cc706a7..a8c217d6cf 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1438,7 +1438,7 @@ dependencies = [
 [[package]]
 name = "krilla"
 version = "0.5.0"
-source = "git+https://github.com/LaurenzV/krilla?rev=e5639c6#e5639c6a22e763cae577212b87074bb3f0ffd3cc"
+source = "git+https://github.com/LaurenzV/krilla?rev=f22a936#f22a9365bafa46bbe26c8c56c88208eb50063e63"
 dependencies = [
  "base64",
  "bumpalo",
@@ -1468,7 +1468,7 @@ dependencies = [
 [[package]]
 name = "krilla-svg"
 version = "0.2.0"
-source = "git+https://github.com/LaurenzV/krilla?rev=e5639c6#e5639c6a22e763cae577212b87074bb3f0ffd3cc"
+source = "git+https://github.com/LaurenzV/krilla?rev=f22a936#f22a9365bafa46bbe26c8c56c88208eb50063e63"
 dependencies = [
  "flate2",
  "fontdb",
diff --git a/Cargo.toml b/Cargo.toml
index 53bf35bf23..fbe55f242b 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -77,8 +77,8 @@ image = { version = "0.25.5", default-features = false, features = ["png", "jpeg
 indexmap = { version = "2", features = ["serde"] }
 infer = { version = "0.19.0", default-features = false }
 kamadak-exif = "0.6"
-krilla = { git = "https://github.com/LaurenzV/krilla", rev = "e5639c6", default-features = false, features = ["raster-images", "comemo", "rayon", "pdf"] }
-krilla-svg = { git = "https://github.com/LaurenzV/krilla", rev = "e5639c6" }
+krilla = { git = "https://github.com/LaurenzV/krilla", rev = "f22a936", default-features = false, features = ["raster-images", "comemo", "rayon", "pdf"] }
+krilla-svg = { git = "https://github.com/LaurenzV/krilla", rev = "f22a936" }
 kurbo = "0.12"
 libfuzzer-sys = "0.4"
 lipsum = "0.9"

From 7cc3fdcf145c17ad4d42340928b585af1f333975 Mon Sep 17 00:00:00 2001
From: Laurenz <laurmaedje@gmail.com>
Date: Tue, 25 Nov 2025 14:02:41 +0100
Subject: [PATCH 29/54] Consider all lookups and subtables in `subs` / `sups`
 coverage checks (#7462)

Co-Authored-By: Malo <57839069+MDLC01@users.noreply.github.com>
---
 Cargo.lock                                    |   2 +-
 Cargo.toml                                    |   2 +-
 crates/typst-layout/src/inline/shaping.rs     |  18 +++++++++---------
 .../ref/issue-7249-multiple-lookup-tables.png | Bin 0 -> 997 bytes
 tests/suite/text/shift.typ                    |  13 +++++++++++++
 5 files changed, 24 insertions(+), 11 deletions(-)
 create mode 100644 tests/ref/issue-7249-multiple-lookup-tables.png

diff --git a/Cargo.lock b/Cargo.lock
index a8c217d6cf..64488f82ad 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3005,7 +3005,7 @@ dependencies = [
 [[package]]
 name = "typst-dev-assets"
 version = "0.14.0"
-source = "git+https://github.com/typst/typst-dev-assets?tag=v0.14.0#0b12d75772199e07294749ffe078ea030b857746"
+source = "git+https://github.com/typst/typst-dev-assets?rev=f46583d#f46583d68167e3512c1f4ebaf564a86c60862160"
 
 [[package]]
 name = "typst-docs"
diff --git a/Cargo.toml b/Cargo.toml
index fbe55f242b..30d369f769 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -33,7 +33,7 @@ typst-syntax = { path = "crates/typst-syntax", version = "0.14.0" }
 typst-timing = { path = "crates/typst-timing", version = "0.14.0" }
 typst-utils = { path = "crates/typst-utils", version = "0.14.0" }
 typst-assets = "0.14.0"
-typst-dev-assets = { git = "https://github.com/typst/typst-dev-assets", tag = "v0.14.0" }
+typst-dev-assets = { git = "https://github.com/typst/typst-dev-assets", rev = "f46583d" }
 arrayvec = "0.7.4"
 az = "1.2"
 base64 = "0.22"
diff --git a/crates/typst-layout/src/inline/shaping.rs b/crates/typst-layout/src/inline/shaping.rs
index 847f2c0ca5..7346c54d85 100644
--- a/crates/typst-layout/src/inline/shaping.rs
+++ b/crates/typst-layout/src/inline/shaping.rs
@@ -1100,17 +1100,17 @@ fn determine_shift(
             // "subs"/"sups" to the feature list if supported by the font.
             // In case of a problem, we just early exit
             let gsub = font.rusty().tables().gsub?;
-            let subtable_index =
-                gsub.features.find(settings.kind.feature())?.lookup_indices.get(0)?;
-            let coverage = gsub
-                .lookups
-                .get(subtable_index)?
-                .subtables
-                .get::<SubstitutionSubtable>(0)?
-                .coverage();
+            let lookups = gsub.features.find(settings.kind.feature())?.lookup_indices;
             text.chars()
                 .all(|c| {
-                    font.rusty().glyph_index(c).is_some_and(|i| coverage.contains(i))
+                    let Some(i) = font.rusty().glyph_index(c) else { return false };
+                    lookups
+                        .into_iter()
+                        .flat_map(|i| gsub.lookups.get(i))
+                        .flat_map(|lookup| {
+                            lookup.subtables.into_iter::<SubstitutionSubtable>()
+                        })
+                        .any(|subtable| subtable.coverage().contains(i))
                 })
                 .then(|| {
                     // If we can use the OpenType feature, we can keep the text
diff --git a/tests/ref/issue-7249-multiple-lookup-tables.png b/tests/ref/issue-7249-multiple-lookup-tables.png
new file mode 100644
index 0000000000000000000000000000000000000000..80291866c7a779c328f170385220c47631b054b4
GIT binary patch
literal 997
zcmV<B0~-8^P)<h;3K|Lk000e1NJLTq004LZ003DC00000(Eq=k000B5Nkl<Zc-rmO
zYfO_@7zc1+fv|KNyJ$9IwpE>*i^4Y97h_zuOy&kM*bI)?nM$Z4pvIKMcr8&81hqvj
zUZ9G1f>mp6qG+ubf@no72B=jm7b#+)1u5^_YT@N?-e4k$Up=Qr-}B-Bob&1T={e6c
z27WqY1XzII5m-0+asC-K`03=Q0Mib@)s5jF9UOVs>*aIFN2&JGB$W)xoK^djL9$x%
z@caZmZDRPwnl0kqxTV$}yw89*%zQ3lM&MRag+}A;l!hLs0v{_3DhJT@X$LDVa%;Fu
z=%o0p-bEZ<;E9UoYvv-?UFkoUp<chH4g3GIl7^p1Q4-SchdwUT!Wn$f4{&^RY;0IG
zeYhtHKuNHRI=n~E>p`Wo;k5C8>S0L~iL)rfEW`M~F%07o=CJ?^@au!Oj(!xfVD&jv
z;G5&GvABMU!Jx5{wN5<W)1EhuF#O;FpF75?dsk*xMIl{VR-_LuvcX0gj+*^q=NkC%
z$l)&@C(Swwe)S;^JH$bb5x7%iX=&jG3nt`Jfs3`GVgS9Nr@LmRT*>1Se7ZDzb-*%Y
z__&=YJdd0I3tzQ`gM9^At*F^t=tXs2pGl=sbrOW_={WITryu%QS#G}{lJ5sNIyE&l
zVg`NKwgP}Au#GyLT@AqVK^|>b8vfe}G{j7uzE&8E0xZC<5w2rjT}!+a;71a4XJFJ>
z2(%<qfaB`i^6ACs$jx=5F}tW=6;|NJ$_j$;B_p3h6Yy-yoI3+kAJ!%!!dGUk_{Qu*
zrHmjP8OdkEOyFoD&P>V9n1-0|51~FBK+6y0;O3tLn*q4L1rJw70Njw{_>^Py(*V@O
zlY=+k7?;J@NGD8RZ)AR2ur0qk=8o(_?<X4^*twk?9EX%}z8d7f^?P6|uMNYlxeGMa
z!ZW*{7~HrH#=s^3*!yZ9>zhFgUcXg$Dn#LjpKFd<t^Vsf`tYqx02c$zv|(?W5r8XH
z&QXS!N+c)IAdyHE!aNpW0e<V?BlKX)%d2%5Y6E##UCL*N%nj}_06Vw@CkK{1JZU1I
zia&I=WbGy_JC|mfT;c?X!=`@&OaN|XAY)T`IA-kW!z_RTEVoUPkHE<nJzhM?`JE0t
z9FNss0%-lauIktF-972n{}F5GCl6O`$L)Y>0Jq)fy2|2V%@CZ8AP=W6RwzQ2)BixY
zxn{FDC5)pE8}b3v1ze&Ho96EA!hkV!UK3?_mr_}SHl<Q|R2Yi_EWiT%M#Ikm)RL2F
Tf{i|S00000NkvXXu0mjf4a3;C

literal 0
HcmV?d00001

diff --git a/tests/suite/text/shift.typ b/tests/suite/text/shift.typ
index 0b292dd97e..7fb7054786 100644
--- a/tests/suite/text/shift.typ
+++ b/tests/suite/text/shift.typ
@@ -89,3 +89,16 @@ A#super(highlight[4])
 1#super[st], 2#super[nd], 3#super[rd].
 
 log#sub[2], log#sub[3], log#sub[variable].
+
+--- issue-7249-multiple-lookup-tables ---
+// We increase the font size to make sure the difference is visible in the
+// low-resolution reference image.
+#set text(font: "Source Serif 4", size: 1.5em)
+#set super(typographic: true)
+
+A#super[test] \
+A#super[test1] \
+A#super[(test)] \
+// Source Serif 4 does not support `sups` for backticks, so this should be
+// synthesized.
+A#super[test\`]

From f820a9031858614bfce2a95dd4f058f7ab32e21b Mon Sep 17 00:00:00 2001
From: Laurenz <laurmaedje@gmail.com>
Date: Tue, 25 Nov 2025 14:06:52 +0100
Subject: [PATCH 30/54] Fix crash in PDF error formatting (#7460)

---
 crates/typst-pdf/src/convert.rs | 13 +++++++------
 crates/typst-pdf/src/text.rs    |  9 ++++++---
 crates/typst-pdf/src/util.rs    |  9 +++++++--
 3 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/crates/typst-pdf/src/convert.rs b/crates/typst-pdf/src/convert.rs
index 90dbace104..e46fb10319 100644
--- a/crates/typst-pdf/src/convert.rs
+++ b/crates/typst-pdf/src/convert.rs
@@ -412,10 +412,10 @@ fn finish(
         Ok(r) => Ok(r),
         Err(e) => match e {
             KrillaError::Font(f, err) => {
-                let font_str = display_font(gc.fonts_backward.get(&f).unwrap());
                 bail!(
                     Span::detached(),
-                    "failed to process font {font_str} ({err})";
+                    "failed to process {} ({err})",
+                    display_font(gc.fonts_backward.get(&f));
                     hint: "make sure the font is valid";
                     hint: "the used font might be unsupported by Typst"
                 );
@@ -536,8 +536,9 @@ fn convert_error(
         ),
         ValidationError::ContainsNotDefGlyph(f, loc, text) => error!(
             to_span(*loc),
-            "{prefix} the text '{text}' cannot be displayed using {}",
-            display_font(gc.fonts_backward.get(f).unwrap());
+            "{prefix} the text `{}` could not be displayed with {}",
+            text.repr(),
+            display_font(gc.fonts_backward.get(f));
             hint: "try using a different font"
         ),
         ValidationError::NoCodepointMapping(_, _, loc) => {
@@ -576,8 +577,8 @@ fn convert_error(
         }
         ValidationError::RestrictedLicense(f) => error!(
             Span::detached(),
-            "{prefix} license of font {} is too restrictive",
-            display_font(gc.fonts_backward.get(f).unwrap()).repr();
+            "{prefix} license of {} is too restrictive",
+            display_font(gc.fonts_backward.get(f));
             hint: "the font has specified \"Restricted License embedding\" in its metadata";
             hint: "restrictive font licenses are prohibited by {} because they limit the suitability for archival",
             validator.as_str()
diff --git a/crates/typst-pdf/src/text.rs b/crates/typst-pdf/src/text.rs
index 281620db28..a280d0ed2d 100644
--- a/crates/typst-pdf/src/text.rs
+++ b/crates/typst-pdf/src/text.rs
@@ -85,11 +85,14 @@ fn build_font(typst_font: Font) -> SourceResult<krilla::text::Font> {
         Arc::new(typst_font.data().clone());
 
     match krilla::text::Font::new(font_data.into(), typst_font.index()) {
+        Some(f) => Ok(f),
         None => {
-            let font_str = display_font(&typst_font);
-            bail!(Span::detached(), "failed to process font {font_str}");
+            bail!(
+                Span::detached(),
+                "failed to process {}",
+                display_font(Some(&typst_font))
+            )
         }
-        Some(f) => Ok(f),
     }
 }
 
diff --git a/crates/typst-pdf/src/util.rs b/crates/typst-pdf/src/util.rs
index 865d0bbb4f..9639f8a12f 100644
--- a/crates/typst-pdf/src/util.rs
+++ b/crates/typst-pdf/src/util.rs
@@ -1,9 +1,11 @@
 //! Basic utilities for converting Typst types to krilla.
 
+use ecow::{EcoString, eco_format};
 use krilla::geom as kg;
 use krilla::geom::PathBuilder;
 use krilla::paint as kp;
 use krilla::tagging as kt;
+use typst_library::foundations::Repr;
 use typst_library::layout::{Abs, Point, Sides, Size, Transform};
 use typst_library::text::Font;
 use typst_library::visualize::{Curve, CurveItem, FillRule, LineCap, LineJoin};
@@ -113,8 +115,11 @@ impl AbsExt for Abs {
 }
 
 /// Display the font family of a font.
-pub(crate) fn display_font(font: &Font) -> &str {
-    &font.info().family
+pub(crate) fn display_font(font: Option<&Font>) -> EcoString {
+    match font {
+        Some(font) => eco_format!("font `{}`", font.info().family.repr()),
+        None => "a font".into(),
+    }
 }
 
 /// Convert a Typst path to a krilla path.

From 6b12b24f3540095550dfb613a1923892ed7cce83 Mon Sep 17 00:00:00 2001
From: Laurenz <laurmaedje@gmail.com>
Date: Tue, 25 Nov 2025 14:07:30 +0100
Subject: [PATCH 31/54] Do not propagate errors in numbering resolution during
 heading synthesis (#7459)

---
 crates/typst-library/src/model/heading.rs      |  17 ++++++++++++-----
 .../issue-7428-heading-numbering-errors.png    | Bin 0 -> 233 bytes
 tests/suite/model/heading.typ                  |   9 +++++++++
 3 files changed, 21 insertions(+), 5 deletions(-)
 create mode 100644 tests/ref/issue-7428-heading-numbering-errors.png

diff --git a/crates/typst-library/src/model/heading.rs b/crates/typst-library/src/model/heading.rs
index 0a054e8cfd..16874ede06 100644
--- a/crates/typst-library/src/model/heading.rs
+++ b/crates/typst-library/src/model/heading.rs
@@ -250,12 +250,19 @@ impl Synthesize for Packed<HeadingElem> {
 
         if let Some((numbering, location)) =
             self.numbering.get_ref(styles).as_ref().zip(self.location())
+            // We are not early returning on error here because of
+            // https://github.com/typst/typst/issues/7428
+            //
+            // A more comprehensive fix might introduce the error catching logic
+            // of show rules for synthesis, too.
+            && let Ok(numbers) = self.counter().display_at_loc(
+                engine,
+                location,
+                styles,
+                numbering,
+            )
         {
-            self.numbers = Some(
-                self.counter()
-                    .display_at_loc(engine, location, styles, numbering)?
-                    .plain_text(),
-            );
+            self.numbers = Some(numbers.plain_text());
         }
 
         let elem = self.as_mut();
diff --git a/tests/ref/issue-7428-heading-numbering-errors.png b/tests/ref/issue-7428-heading-numbering-errors.png
new file mode 100644
index 0000000000000000000000000000000000000000..210abd21cc24cea352c03102e315868d8d607ce8
GIT binary patch
literal 233
zcmeAS@N?(olHy`uVBq!ia0vp^6+kS@0VEh)%)UPdQX4#7978H@CI7H@Xh^*BD6rdI
zSMHiv{lfW2?@!;~uzCKh%8RETMYkU6nf_ppl-;%IC7UYV=XoF7ZE(*2ywS1F67E+C
zYCDd0FQ1=mBFoV&YxnPZ!Y;@9Zhy~~7AeDP7w$jW(ft4a{luU}(~pMvxGVM?zol?#
z%141%oqsVWj-+hkK4O)lvF+dg|G7~;S+`$2daQrHzUDV)(w|@d-db<4`1$Mc?f#2i
eNl=HCh%qz7F-2c5SDID_@`I<VpUXO@geCys6l{qA

literal 0
HcmV?d00001

diff --git a/tests/suite/model/heading.typ b/tests/suite/model/heading.typ
index 930842bb5f..e14c1138d6 100644
--- a/tests/suite/model/heading.typ
+++ b/tests/suite/model/heading.typ
@@ -162,3 +162,12 @@ Cannot be used as @intro
 --- issue-5719-heading-nested ---
 // Headings may not be nested like this.
 = = A
+
+--- issue-7428-heading-numbering-errors ---
+// Ensure that the error from the first layout iteration is silenced.
+#set heading(numbering: (n, ..nums) => {
+  assert(n > 0)
+  [#n]
+})
+
+= A

From faab8a2db5cc84498d6d8db69a00685b272025ec Mon Sep 17 00:00:00 2001
From: Tobias Schmitz <tobiasschmitz2001@gmail.com>
Date: Tue, 25 Nov 2025 14:07:57 +0100
Subject: [PATCH 32/54] Fix crash in PDF tagging with oob grid line end (#7448)

---
 crates/typst-pdf/src/tags/context/table.rs |   2 +-
 tests/ref/issue-7398-grid-line-end-oob.png | Bin 0 -> 382 bytes
 tests/suite/layout/grid/stroke.typ         |  10 ++++++++++
 3 files changed, 11 insertions(+), 1 deletion(-)
 create mode 100644 tests/ref/issue-7398-grid-line-end-oob.png

diff --git a/crates/typst-pdf/src/tags/context/table.rs b/crates/typst-pdf/src/tags/context/table.rs
index 784fed057c..51800ee7e1 100644
--- a/crates/typst-pdf/src/tags/context/table.rs
+++ b/crates/typst-pdf/src/tags/context/table.rs
@@ -471,7 +471,7 @@ fn place_explicit_lines<F>(
     ) -> Option<&mut PrioritzedStroke>,
 {
     for line in lines.iter().flat_map(|lines| lines.iter()) {
-        let end = line.end.map(|n| n.get() as u32).unwrap_or(inline_end);
+        let end = line.end.map(|n| n.get() as u32).unwrap_or(inline_end).min(inline_end);
         let explicit_stroke = || PrioritzedStroke {
             stroke: line.stroke.clone(),
             priority: StrokePriority::ExplicitLine,
diff --git a/tests/ref/issue-7398-grid-line-end-oob.png b/tests/ref/issue-7398-grid-line-end-oob.png
new file mode 100644
index 0000000000000000000000000000000000000000..b17e75a26beedcc4c2361108264a1e72947653e6
GIT binary patch
literal 382
zcmV-^0fGLBP)<h;3K|Lk000e1NJLTq001@s001=z00000FS<vs0003+Nkl<Zc-mw5
zPZnSp)i%VnO-N`!1u-dT0<kl(XiIRYM+Fw{XaZK*ShO|NqdBCYA5Ea7d&q0^c!jKO
zrq+VC{X}RxojDm<+duXHkFAK%*89;8#gVGdCodqZ?RCaMvs=j8<aX3X{U)fb_t@2G
zb;#N@{{K(iL`d7$g8%=2=>0}$`zG`MfAk4L+NRXJ{(mBO0Yclt?3v52!2CAC5|=BN
z2rA&@K@;E##G<Xb^ff9-Z$T5tZX4<$d1>*^4@lbfZQFc-2yG3kzi+lj(son)`KE|t
zgtQ$j1`^xQa==%MHw3g*uSWNq21vsa0@^C3W7F0+kASxAu0Z1BKQwKw?+67+XV#I`
z8<A|=D|GBw#cIM4@caB1WJlh*e&x>Zp`PEeLRO#xuQ)UT-!d%Pimk&@frTBqK;3A&
cWMpas0Jmi=CtURI4FCWD07*qoM6N<$f@|}(5dZ)H

literal 0
HcmV?d00001

diff --git a/tests/suite/layout/grid/stroke.typ b/tests/suite/layout/grid/stroke.typ
index 4e81d549e4..1e6e7e71e8 100644
--- a/tests/suite/layout/grid/stroke.typ
+++ b/tests/suite/layout/grid/stroke.typ
@@ -437,3 +437,13 @@
 --- grid-vline-position-top ---
 // Error: 24-27 expected `start`, `left`, `right`, or `end`, found top
 #table.vline(position: top)
+
+--- issue-7398-grid-line-end-oob ---
+#set page(width: auto)
+#table(
+  columns: 2,
+  [A], [B],
+  [C], [D],
+  table.vline(end: 3),
+  table.hline(end: 3),
+)

From 64d959905727184d41c698f20b3d5b41d0fea858 Mon Sep 17 00:00:00 2001
From: T6 <t6@t6.fyi>
Date: Tue, 25 Nov 2025 08:10:56 -0500
Subject: [PATCH 33/54] Bump wasmi to v0.51.2 (#7438)

---
 Cargo.lock | 16 ++++++++--------
 Cargo.toml |  2 +-
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 64488f82ad..2fbbf74319 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3680,9 +3680,9 @@ dependencies = [
 
 [[package]]
 name = "wasmi"
-version = "0.51.1"
+version = "0.51.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cb4f6b71d5cb04a4615b9a8a2e522ba284c491ad847afd9e905d89be15e3efc0"
+checksum = "118030b2d125bc893e0cc5b1ce156eb41461f4373308cb5f2e3c698533b5e547"
 dependencies = [
  "spin",
  "wasmi_collections",
@@ -3693,24 +3693,24 @@ dependencies = [
 
 [[package]]
 name = "wasmi_collections"
-version = "0.51.1"
+version = "0.51.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a4a11fa090c4d742e5a77dbbc8efbbe1aa151db7335ca6850232e6cafbb1023"
+checksum = "653fa20efc966818934524dceb54b1b81e6f845bbcc2e155d6e9fc32becf667e"
 
 [[package]]
 name = "wasmi_core"
-version = "0.51.1"
+version = "0.51.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ab3e422fc1f4df78c9ded6ed48c4ca6d1f55f4609f04c99962fc07532e4db61d"
+checksum = "65701f60308c7e46cca85f273ad17e80c60998cc63d3fa168ac393f62b123038"
 dependencies = [
  "libm",
 ]
 
 [[package]]
 name = "wasmi_ir"
-version = "0.51.1"
+version = "0.51.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "13fe9f9f1747ec81644e764c4dc798f063f5d54a495f0a3b4a375bce9af65399"
+checksum = "a6539f63bf2a6838f27876e2877f0b00a088e84f91e92445620cc6b977fde032"
 dependencies = [
  "wasmi_core",
 ]
diff --git a/Cargo.toml b/Cargo.toml
index 30d369f769..0e11507f01 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -141,7 +141,7 @@ ureq = { version = "2", default-features = false, features = ["native-tls", "gzi
 usvg = { version = "0.45", default-features = false, features = ["text"] }
 utf8_iter = "1.0.4"
 walkdir = "2"
-wasmi = { version = "0.51.0", default-features = false, features = ["simd"] }
+wasmi = { version = "0.51.2", default-features = false, features = ["simd"] }
 web-sys = "0.3"
 xmlparser = "0.13.5"
 xmlwriter = "0.1.0"

From e31aa60e7fd7fb1d3d1c3b1189f71307724050fe Mon Sep 17 00:00:00 2001
From: Tobias Schmitz <tobiasschmitz2001@gmail.com>
Date: Tue, 25 Nov 2025 14:32:34 +0100
Subject: [PATCH 34/54] Clamp PDF page size to 3x3 units (#7454)

---
 crates/typst-pdf/src/convert.rs                    |   7 +++++--
 .../issue-7292-page-height-auto-margin-zero.png    | Bin 0 -> 69 bytes
 .../ref/issue-7292-page-size-auto-margin-zero.png  | Bin 0 -> 70 bytes
 .../ref/issue-7292-page-width-auto-margin-zero.png | Bin 0 -> 70 bytes
 tests/suite/layout/page.typ                        |   9 +++++++++
 5 files changed, 14 insertions(+), 2 deletions(-)
 create mode 100644 tests/ref/issue-7292-page-height-auto-margin-zero.png
 create mode 100644 tests/ref/issue-7292-page-size-auto-margin-zero.png
 create mode 100644 tests/ref/issue-7292-page-width-auto-margin-zero.png

diff --git a/crates/typst-pdf/src/convert.rs b/crates/typst-pdf/src/convert.rs
index e46fb10319..47d66fa2f0 100644
--- a/crates/typst-pdf/src/convert.rs
+++ b/crates/typst-pdf/src/convert.rs
@@ -118,9 +118,12 @@ fn convert_pages(gc: &mut GlobalContext, document: &mut Document) -> SourceResul
             // Don't export this page.
             continue;
         } else {
+            // PDF 1.4 upwards to 1.7 specifies a minimum page size of 3x3 units.
+            // PDF 2.0 doesn't define an explicit limit, but krilla and probably
+            // some viewers won't handle pages that have zero sized pages.
             let mut settings = PageSettings::new(
-                typst_page.frame.width().to_f32(),
-                typst_page.frame.height().to_f32(),
+                typst_page.frame.width().to_f32().max(3.0),
+                typst_page.frame.height().to_f32().max(3.0),
             );
 
             if let Some(label) = typst_page
diff --git a/tests/ref/issue-7292-page-height-auto-margin-zero.png b/tests/ref/issue-7292-page-height-auto-margin-zero.png
new file mode 100644
index 0000000000000000000000000000000000000000..2cac04180c590191282ba53e4c18eb9d919ea0cd
GIT binary patch
literal 69
zcmeAS@N?(olHy`uVBq!ia0vp^DL~A~0VEiBH-sbtDIQN3$B>F!$v^zr85owINS>?F
Ru;4C8-qY33Wt~$(69CBY5Oe?l

literal 0
HcmV?d00001

diff --git a/tests/ref/issue-7292-page-size-auto-margin-zero.png b/tests/ref/issue-7292-page-size-auto-margin-zero.png
new file mode 100644
index 0000000000000000000000000000000000000000..3690123d4a182de87c57b03c6945469af71fe1dd
GIT binary patch
literal 70
zcmeAS@N?(olHy`uVBq!ia0vp^j35jm7|ip2ssJfoPZ!6Kid&3K41fPKG%z$VG`@4#
Q!UR&_>FVdQ&MBb@0J?n-d;kCd

literal 0
HcmV?d00001

diff --git a/tests/ref/issue-7292-page-width-auto-margin-zero.png b/tests/ref/issue-7292-page-width-auto-margin-zero.png
new file mode 100644
index 0000000000000000000000000000000000000000..141749bd057fdcaa57c2e528374fd2628af956de
GIT binary patch
literal 70
zcmeAS@N?(olHy`uVBq!ia0vp^j6j?MA{g?+)6W7aUQZXtkcwN$83__%0t}r`jTrsX
R*|R|kJYD@<);T3K0RX_J4&nd+

literal 0
HcmV?d00001

diff --git a/tests/suite/layout/page.typ b/tests/suite/layout/page.typ
index 4df9f9cac5..57c145f621 100644
--- a/tests/suite/layout/page.typ
+++ b/tests/suite/layout/page.typ
@@ -394,3 +394,12 @@ text
 #metadata(none)
 #set page(fill: red)
 2
+
+--- issue-7292-page-width-auto-margin-zero ---
+#set page(width: auto, height: 100pt, margin: 0pt)
+
+--- issue-7292-page-height-auto-margin-zero ---
+#set page(width: 100pt, height: auto, margin: 0pt)
+
+--- issue-7292-page-size-auto-margin-zero ---
+#set page(width: auto, height: auto, margin: 0pt)

From 62cc09d186147972423c382cd5afc1160803f9ad Mon Sep 17 00:00:00 2001
From: Tobias Schmitz <tobiasschmitz2001@gmail.com>
Date: Wed, 26 Nov 2025 17:43:43 +0100
Subject: [PATCH 35/54] Slightly more accurate path separator replacement in
 tests (#7465)

---
 tests/src/run.rs         | 18 ++++++++++++------
 tests/suite/text/raw.typ |  2 +-
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/tests/src/run.rs b/tests/src/run.rs
index 7386d06d23..70ee5bab9e 100644
--- a/tests/src/run.rs
+++ b/tests/src/run.rs
@@ -1,8 +1,10 @@
 use std::fmt::Write;
 use std::ops::Range;
 use std::path::PathBuf;
+use std::sync::LazyLock;
 
 use ecow::eco_vec;
+use regex::{Captures, Regex};
 use tiny_skia as sk;
 use typst::diag::{SourceDiagnostic, SourceResult, Warned};
 use typst::layout::{Abs, Frame, FrameItem, PagedDocument, Transform};
@@ -238,13 +240,8 @@ impl<'a> Runner<'a> {
             return;
         }
 
-        let message = if diag.message.contains("\\u{") {
-            &diag.message
-        } else {
-            &diag.message.replace("\\", "/")
-        };
         let range = self.world.range(diag.span);
-        self.validate_note(kind, diag.span.id(), range.clone(), message);
+        self.validate_note(kind, diag.span.id(), range.clone(), &diag.message);
 
         // Check hints.
         for hint in &diag.hints {
@@ -264,6 +261,15 @@ impl<'a> Runner<'a> {
         range: Option<Range<usize>>,
         message: &str,
     ) {
+        // HACK: Replace backslashes path sepators with slashes for cross
+        // platform reproducible error messages.
+        static RE: LazyLock<Regex> =
+            LazyLock::new(|| Regex::new("\\((.*) (at|in) (.+)\\)").unwrap());
+        let message = RE.replace(message, |caps: &Captures| {
+            let path = caps[3].replace('\\', "/");
+            format!("({} {} {})", &caps[1], &caps[2], path)
+        });
+
         // Try to find perfect match.
         let file = file.unwrap_or(self.test.source.id());
         if let Some((i, _)) = self.test.notes.iter().enumerate().find(|&(i, note)| {
diff --git a/tests/suite/text/raw.typ b/tests/suite/text/raw.typ
index 87ff2f6bac..046692aea6 100644
--- a/tests/suite/text/raw.typ
+++ b/tests/suite/text/raw.typ
@@ -105,7 +105,7 @@ contexts:
     - match: '\'
 ```.text
 
-// Error: 35-56 failed to parse syntax (Error while compiling regex '/': Parsing error at position 0: Backslash without following character)
+// Error: 35-56 failed to parse syntax (Error while compiling regex '\': Parsing error at position 0: Backslash without following character)
 #raw("text", lang: "a", syntaxes: bytes(sublime-syntax))
 
 --- raw-theme ---

From 73f40b102bc1d1a0d458f3ce1b9dee5d05e78461 Mon Sep 17 00:00:00 2001
From: Tobias Schmitz <tobiasschmitz2001@gmail.com>
Date: Thu, 27 Nov 2025 14:46:50 +0100
Subject: [PATCH 36/54] Generate internal compiler errors instead of panicking
 (#7450)

Co-Authored-By: Laurenz <laurmaedje@gmail.com>
---
 crates/typst-library/src/diag.rs        | 53 +++++++++++++++++++++++++
 crates/typst-pdf/src/link.rs            |  6 ++-
 crates/typst-pdf/src/tags/resolve.rs    |  5 ++-
 crates/typst-pdf/src/tags/tree/build.rs | 27 ++++++++-----
 crates/typst-pdf/src/tags/tree/mod.rs   | 32 +++++++--------
 tests/suite/pdftags/break.typ           |  8 ++++
 tests/suite/pdftags/link.typ            | 18 +++++++++
 7 files changed, 119 insertions(+), 30 deletions(-)

diff --git a/crates/typst-library/src/diag.rs b/crates/typst-library/src/diag.rs
index 11d09a1b18..fe9026f348 100644
--- a/crates/typst-library/src/diag.rs
+++ b/crates/typst-library/src/diag.rs
@@ -1,5 +1,6 @@
 //! Diagnostics.
 
+use std::backtrace::{Backtrace, BacktraceStatus};
 use std::fmt::{self, Display, Formatter, Write as _};
 use std::io;
 use std::path::{Path, PathBuf};
@@ -868,3 +869,55 @@ pub fn format_xml_like_error(format: &str, error: roxmltree::Error) -> LoadError
 
     LoadError { pos: pos.into(), message }
 }
+
+/// Asserts a condition, generating an internal compiler error with the provided
+/// message on failure.
+#[track_caller]
+pub fn assert_internal(cond: bool, msg: &str) -> HintedStrResult<()> {
+    if !cond { Err(internal_error(msg)) } else { Ok(()) }
+}
+
+/// Generates an internal compiler error with the provided message.
+#[track_caller]
+pub fn panic_internal(msg: &str) -> HintedStrResult<()> {
+    Err(internal_error(msg))
+}
+
+/// Adds a method analogous to [`Option::expect`] that raises an internal
+/// compiler error instead of panicking.
+pub trait ExpectInternal<T> {
+    /// Extracts the value, producing an internal error if `self` is `None`.
+    fn expect_internal(self, msg: &str) -> HintedStrResult<T>;
+}
+
+impl<T> ExpectInternal<T> for Option<T> {
+    #[track_caller]
+    fn expect_internal(self, msg: &str) -> HintedStrResult<T> {
+        match self {
+            Some(val) => Ok(val),
+            None => Err(internal_error(msg)),
+        }
+    }
+}
+
+/// The shared internal implementation of [`assert_internal`] and
+/// [`expect_internal`].
+#[track_caller]
+fn internal_error(msg: &str) -> HintedString {
+    let loc = std::panic::Location::caller();
+    let mut error = error!(
+        "internal error: {msg} (occurred at {loc})";
+        hint: "please report this as a bug"
+    );
+
+    if cfg!(debug_assertions) {
+        let backtrace = Backtrace::capture();
+        if backtrace.status() == BacktraceStatus::Captured {
+            error.hint(eco_format!("compiler backtrace:\n{backtrace}"));
+        } else {
+            error.hint("set `RUST_BACKTRACE` to `1` or `full` to capture a backtrace");
+        }
+    }
+
+    error
+}
diff --git a/crates/typst-pdf/src/link.rs b/crates/typst-pdf/src/link.rs
index ceb5e3a0d8..fe0f0b3bf7 100644
--- a/crates/typst-pdf/src/link.rs
+++ b/crates/typst-pdf/src/link.rs
@@ -2,7 +2,7 @@ use krilla::action::{Action, LinkAction};
 use krilla::annotation::Target;
 use krilla::destination::XyzDestination;
 use krilla::geom as kg;
-use typst_library::diag::{SourceResult, bail};
+use typst_library::diag::{At, ExpectInternal, SourceResult, bail};
 use typst_library::layout::{Abs, Point, Position, Size};
 use typst_library::model::Destination;
 use typst_syntax::Span;
@@ -84,7 +84,9 @@ pub(crate) fn handle_link(
         return Ok(());
     }
 
-    let (group_id, link) = gc.tags.tree.parent_link().expect("link parent");
+    let (group_id, link) = (gc.tags.tree.parent_link())
+        .expect_internal("expected link ancestor in logical tree")
+        .at(Span::detached())?;
     let alt = link.alt.as_ref().map(Into::into);
 
     if gc.tags.tree.parent_artifact().is_some() {
diff --git a/crates/typst-pdf/src/tags/resolve.rs b/crates/typst-pdf/src/tags/resolve.rs
index a090354886..ae94468abd 100644
--- a/crates/typst-pdf/src/tags/resolve.rs
+++ b/crates/typst-pdf/src/tags/resolve.rs
@@ -4,8 +4,9 @@ use ecow::EcoVec;
 use krilla::tagging::{self as kt, Node, Tag, TagGroup, TagKind};
 use krilla::tagging::{Identifier, TagTree};
 use smallvec::SmallVec;
-use typst_library::diag::{SourceDiagnostic, SourceResult, error};
+use typst_library::diag::{At, SourceDiagnostic, SourceResult, error};
 use typst_library::text::Locale;
+use typst_syntax::Span;
 
 use crate::PdfOptions;
 use crate::convert::{GlobalContext, to_span};
@@ -49,7 +50,7 @@ impl<'a> Resolver<'a> {
 }
 
 pub fn resolve(gc: &mut GlobalContext) -> SourceResult<(Option<Locale>, TagTree)> {
-    gc.tags.tree.assert_finished_traversal();
+    gc.tags.tree.assert_finished_traversal().at(Span::detached())?;
 
     if !disabled(gc) {
         context::finish(&mut gc.tags.tree);
diff --git a/crates/typst-pdf/src/tags/tree/build.rs b/crates/typst-pdf/src/tags/tree/build.rs
index 5ec1ebcc39..cf0886cb12 100644
--- a/crates/typst-pdf/src/tags/tree/build.rs
+++ b/crates/typst-pdf/src/tags/tree/build.rs
@@ -19,7 +19,10 @@ use ecow::EcoVec;
 use krilla::tagging::{ArtifactType, ListNumbering, Tag, TagKind};
 use rustc_hash::FxHashMap;
 use smallvec::SmallVec;
-use typst_library::diag::{SourceDiagnostic, SourceResult, bail, error};
+use typst_library::diag::{
+    At, ExpectInternal, SourceDiagnostic, SourceResult, assert_internal, bail, error,
+    panic_internal,
+};
 use typst_library::foundations::{Content, ContextElem};
 use typst_library::introspection::Location;
 use typst_library::layout::{
@@ -180,18 +183,24 @@ pub fn build(document: &PagedDocument, options: &PdfOptions) -> SourceResult<Tre
         visit_frame(&mut tree, &page.frame)?;
     }
 
-    assert!(tree.stack.is_empty(), "tags weren't properly closed");
-    assert!(tree.unfinished_stacks.is_empty(), "tags weren't properly closed");
-    assert_eq!(
-        tree.progressions.first(),
-        tree.progressions.last(),
-        "tags weren't properly closed"
-    );
+    if let Some(last) = tree.stack.last() {
+        panic_internal("tags weren't properly closed")
+            .at(tree.groups.get(last.id).span)?;
+    }
+    assert_internal(tree.unfinished_stacks.is_empty(), "tags weren't properly closed")
+        .at(Span::detached())?;
+    assert_internal(
+        tree.progressions.first() == tree.progressions.last(),
+        "tags weren't properly closed",
+    )
+    .at(Span::detached())?;
 
     // Insert logical children into the tree.
     #[allow(clippy::iter_over_hash_type)]
     for (loc, children) in tree.logical_children.iter() {
-        let located = tree.groups.by_loc(loc).expect("parent group");
+        let located = (tree.groups.by_loc(loc))
+            .expect_internal("parent group")
+            .at(Span::detached())?;
 
         if options.is_pdf_ua() && located.multiple_parents {
             let validator = options.standards.config.validator().as_str();
diff --git a/crates/typst-pdf/src/tags/tree/mod.rs b/crates/typst-pdf/src/tags/tree/mod.rs
index 0919f766c2..d2f10afdcf 100644
--- a/crates/typst-pdf/src/tags/tree/mod.rs
+++ b/crates/typst-pdf/src/tags/tree/mod.rs
@@ -9,7 +9,7 @@ use krilla::surface::Surface;
 use krilla::tagging::{ArtifactType, ContentTag, Tag};
 use rustc_hash::FxHashMap;
 use smallvec::SmallVec;
-use typst_library::diag::SourceDiagnostic;
+use typst_library::diag::{HintedStrResult, SourceDiagnostic, assert_internal};
 use typst_library::foundations::Packed;
 use typst_library::introspection::Location;
 use typst_library::layout::{Inherit, PagedDocument};
@@ -74,22 +74,20 @@ impl Tree {
         Some(self.ctx.bboxes.get_mut(id))
     }
 
-    pub fn assert_finished_traversal(&self) {
-        assert_eq!(
-            self.prog_cursor + 1,
-            self.progressions.len(),
-            "tree traversal didn't complete properly"
-        );
-        assert_eq!(
-            self.break_cursor,
-            self.breaks.len(),
-            "tree traversal didn't complete properly"
-        );
-        assert_eq!(
-            self.unfinished_cursor,
-            self.unfinished.len(),
-            "tree traversal didn't complete properly"
-        );
+    pub fn assert_finished_traversal(&self) -> HintedStrResult<()> {
+        assert_internal(
+            self.prog_cursor + 1 == self.progressions.len(),
+            "tree traversal didn't complete properly",
+        )?;
+        assert_internal(
+            self.break_cursor == self.breaks.len(),
+            "tree traversal didn't complete properly",
+        )?;
+        assert_internal(
+            self.unfinished_cursor == self.unfinished.len(),
+            "tree traversal didn't complete properly",
+        )?;
+        Ok(())
     }
 }
 
diff --git a/tests/suite/pdftags/break.typ b/tests/suite/pdftags/break.typ
index 37eb582ced..57eeb063bb 100644
--- a/tests/suite/pdftags/break.typ
+++ b/tests/suite/pdftags/break.typ
@@ -24,3 +24,11 @@ Start of the first paragraph #link(target)[
 
 --- break-tags-issue-7020 pdftags nopdfua ---
 Foo #quote($$ + parbreak())
+
+--- issue-7257-break-tags-show-par-none pdftags ---
+#show par: none
+#show heading: v(0pt) + [A]
+// Error: 3-6 internal error: tags weren't properly closed (occurred at crates/typst-pdf/src/tags/tree/build.rs:187:9)
+// Hint: 3-6 please report this as a bug
+// Hint: 3-6 set `RUST_BACKTRACE` to `1` or `full` to capture a backtrace
+#[= A]B
diff --git a/tests/suite/pdftags/link.typ b/tests/suite/pdftags/link.typ
index 5c50903d65..defcf5c6e2 100644
--- a/tests/suite/pdftags/link.typ
+++ b/tests/suite/pdftags/link.typ
@@ -55,3 +55,21 @@ Look #link("https://github.com/typst/typst")[this #parbreak() thing].
 
 --- link-tags-with-parbreak pdftags nopdfua ---
 Look #link("https://github.com/typst/typst")[this #parbreak() thing].
+
+--- issue-7301-link-tags-empty-link-body pdftags ---
+// Error: internal error: expected link ancestor in logical tree (occurred at crates/typst-pdf/src/link.rs:88:10)
+// Hint: please report this as a bug
+// Hint: set `RUST_BACKTRACE` to `1` or `full` to capture a backtrace
+#link("asf")[#none\ #none]
+
+--- issue-7301-link-tags-empty-link-body-linebreak pdftags ---
+// Error: internal error: expected link ancestor in logical tree (occurred at crates/typst-pdf/src/link.rs:88:10)
+// Hint: please report this as a bug
+// Hint: set `RUST_BACKTRACE` to `1` or `full` to capture a backtrace
+#link("asf", linebreak())
+
+--- issue-7301-link-tags-empty-link-body-footnote pdftags ---
+// Error: internal error: expected link ancestor in logical tree (occurred at crates/typst-pdf/src/link.rs:88:10)
+// Hint: please report this as a bug
+// Hint: set `RUST_BACKTRACE` to `1` or `full` to capture a backtrace
+#footnote(numbering: it => "", [asdf])

From 9adeaf39cf0eb39db18fecf82d00ac8e3f0f25b0 Mon Sep 17 00:00:00 2001
From: Tobias Schmitz <tobiasschmitz2001@gmail.com>
Date: Thu, 27 Nov 2025 15:07:18 +0100
Subject: [PATCH 37/54] Use original logical index of line fallback text item
 (#7471)

---
 crates/typst-layout/src/inline/line.rs              |  9 ++++-----
 ...ssue-7301-link-tags-empty-link-body-footnote.yml | 13 +++++++++++++
 ...sue-7301-link-tags-empty-link-body-linebreak.yml |  5 +++++
 ...ssue-7301-link-tags-empty-link-body-mutliple.yml |  8 ++++++++
 .../issue-7301-link-tags-empty-link-body.yml        |  5 +++++
 tests/suite/pdftags/link.typ                        | 12 +++---------
 6 files changed, 38 insertions(+), 14 deletions(-)
 create mode 100644 tests/ref/pdftags/issue-7301-link-tags-empty-link-body-footnote.yml
 create mode 100644 tests/ref/pdftags/issue-7301-link-tags-empty-link-body-linebreak.yml
 create mode 100644 tests/ref/pdftags/issue-7301-link-tags-empty-link-body-mutliple.yml
 create mode 100644 tests/ref/pdftags/issue-7301-link-tags-empty-link-body.yml

diff --git a/crates/typst-layout/src/inline/line.rs b/crates/typst-layout/src/inline/line.rs
index 646522002f..f4d93517f1 100644
--- a/crates/typst-layout/src/inline/line.rs
+++ b/crates/typst-layout/src/inline/line.rs
@@ -222,9 +222,9 @@ fn collect_items<'a>(
 
     // Add fallback text to expand the line height, if necessary.
     if !items.iter().any(|item| matches!(item, Item::Text(_)))
-        && let Some(fallback) = fallback
+        && let Some((idx, fallback)) = fallback
     {
-        items.push(fallback, LogicalIndex::FALLBACK_TEXT);
+        items.push(fallback, idx);
     }
 }
 
@@ -287,7 +287,7 @@ fn collect_range<'a>(
     range: Range,
     trim: &Trim,
     items: &mut Items<'a>,
-    fallback: &mut Option<ItemEntry<'a>>,
+    fallback: &mut Option<(LogicalIndex, ItemEntry<'a>)>,
 ) {
     for (i, (subrange, item)) in p.slice(range.clone()) {
         let idx = LogicalIndex::from_item_index(i);
@@ -310,7 +310,7 @@ fn collect_range<'a>(
             // When there is no text, still keep this as a fallback item, which
             // we can use to force a non-zero line-height when the line doesn't
             // contain any other text.
-            *fallback = Some(ItemEntry::from(Item::Text(shaped.empty())));
+            *fallback = Some((idx, ItemEntry::from(Item::Text(shaped.empty()))));
             continue;
         }
 
@@ -782,7 +782,6 @@ pub struct LogicalIndex(usize);
 
 impl LogicalIndex {
     const START_HYPHEN: Self = Self(0);
-    const FALLBACK_TEXT: Self = Self(usize::MAX - 1);
     const END_HYPHEN: Self = Self(usize::MAX);
 
     /// Create a logical index from the index of an item in the [`p.items`](Preparation::items).
diff --git a/tests/ref/pdftags/issue-7301-link-tags-empty-link-body-footnote.yml b/tests/ref/pdftags/issue-7301-link-tags-empty-link-body-footnote.yml
new file mode 100644
index 0000000000..8cf814a695
--- /dev/null
+++ b/tests/ref/pdftags/issue-7301-link-tags-empty-link-body-footnote.yml
@@ -0,0 +1,13 @@
+- Tag: P
+  /K:
+    - Tag: Lbl
+      /K:
+        - Tag: Link
+          /K:
+            - Annotation: page=0 index=0
+    - Tag: Note
+      /K:
+        - Tag: Lbl
+          /K:
+            - Tag: Link
+        - Content: page=0 mcid=0
diff --git a/tests/ref/pdftags/issue-7301-link-tags-empty-link-body-linebreak.yml b/tests/ref/pdftags/issue-7301-link-tags-empty-link-body-linebreak.yml
new file mode 100644
index 0000000000..d0307dea89
--- /dev/null
+++ b/tests/ref/pdftags/issue-7301-link-tags-empty-link-body-linebreak.yml
@@ -0,0 +1,5 @@
+- Tag: P
+  /K:
+    - Tag: Link
+      /K:
+        - Annotation: page=0 index=0
diff --git a/tests/ref/pdftags/issue-7301-link-tags-empty-link-body-mutliple.yml b/tests/ref/pdftags/issue-7301-link-tags-empty-link-body-mutliple.yml
new file mode 100644
index 0000000000..41e9123559
--- /dev/null
+++ b/tests/ref/pdftags/issue-7301-link-tags-empty-link-body-mutliple.yml
@@ -0,0 +1,8 @@
+- Tag: P
+  /K:
+    - Tag: Link
+      /K:
+        - Annotation: page=0 index=0
+    - Tag: Link
+      /K:
+        - Annotation: page=0 index=1
diff --git a/tests/ref/pdftags/issue-7301-link-tags-empty-link-body.yml b/tests/ref/pdftags/issue-7301-link-tags-empty-link-body.yml
new file mode 100644
index 0000000000..d0307dea89
--- /dev/null
+++ b/tests/ref/pdftags/issue-7301-link-tags-empty-link-body.yml
@@ -0,0 +1,5 @@
+- Tag: P
+  /K:
+    - Tag: Link
+      /K:
+        - Annotation: page=0 index=0
diff --git a/tests/suite/pdftags/link.typ b/tests/suite/pdftags/link.typ
index defcf5c6e2..7d9ccbfe5f 100644
--- a/tests/suite/pdftags/link.typ
+++ b/tests/suite/pdftags/link.typ
@@ -57,19 +57,13 @@ Look #link("https://github.com/typst/typst")[this #parbreak() thing].
 Look #link("https://github.com/typst/typst")[this #parbreak() thing].
 
 --- issue-7301-link-tags-empty-link-body pdftags ---
-// Error: internal error: expected link ancestor in logical tree (occurred at crates/typst-pdf/src/link.rs:88:10)
-// Hint: please report this as a bug
-// Hint: set `RUST_BACKTRACE` to `1` or `full` to capture a backtrace
 #link("asf")[#none\ #none]
 
 --- issue-7301-link-tags-empty-link-body-linebreak pdftags ---
-// Error: internal error: expected link ancestor in logical tree (occurred at crates/typst-pdf/src/link.rs:88:10)
-// Hint: please report this as a bug
-// Hint: set `RUST_BACKTRACE` to `1` or `full` to capture a backtrace
 #link("asf", linebreak())
 
 --- issue-7301-link-tags-empty-link-body-footnote pdftags ---
-// Error: internal error: expected link ancestor in logical tree (occurred at crates/typst-pdf/src/link.rs:88:10)
-// Hint: please report this as a bug
-// Hint: set `RUST_BACKTRACE` to `1` or `full` to capture a backtrace
 #footnote(numbering: it => "", [asdf])
+
+--- issue-7301-link-tags-empty-link-body-mutliple pdftags ---
+#link("asf")[#none\ #none] #link("asf")[#none\ #none]

From e95d5809f49b947ae3d37cb057007143872316b9 Mon Sep 17 00:00:00 2001
From: Laurenz <laurmaedje@gmail.com>
Date: Mon, 1 Dec 2025 10:16:16 +0100
Subject: [PATCH 38/54] Fix oblique fonts being classified as italic (#7483)

---
 crates/typst-library/src/text/font/book.rs | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/crates/typst-library/src/text/font/book.rs b/crates/typst-library/src/text/font/book.rs
index a453142daf..7347fc0e65 100644
--- a/crates/typst-library/src/text/font/book.rs
+++ b/crates/typst-library/src/text/font/book.rs
@@ -248,7 +248,14 @@ impl FontInfo {
 
                 // Some fonts miss the relevant bits for italic or oblique, so
                 // we also try to infer that from the full name.
-                let italic = ttf.is_italic() || full.contains("italic");
+                //
+                // We do not use `ttf.is_italic()` because that also checks the
+                // italic angle which leads to false positives for some oblique
+                // fonts.
+                //
+                // See <https://github.com/typst/typst/issues/7479>.
+                let italic =
+                    ttf.style() == ttf_parser::Style::Italic || full.contains("italic");
                 let oblique = ttf.is_oblique()
                     || full.contains("oblique")
                     || full.contains("slanted");

From cef869f25c658de0fd54cafe6be27811ff53ab01 Mon Sep 17 00:00:00 2001
From: Laurenz <laurmaedje@gmail.com>
Date: Mon, 1 Dec 2025 10:26:27 +0100
Subject: [PATCH 39/54] Fix `arrow.l.r` not working as an accent (#7481)

---
 .../typst-library/src/foundations/symbol.rs   |   2 +-
 crates/typst-library/src/math/accent.rs       |  88 +++++++++++-------
 docs/src/lib.rs                               |   4 +-
 ...sue-7437-math-accent-text-presentation.png | Bin 0 -> 835 bytes
 tests/ref/math-accent-sym-call.png            | Bin 930 -> 1274 bytes
 tests/suite/math/accent.typ                   |  47 +++++++++-
 6 files changed, 101 insertions(+), 40 deletions(-)
 create mode 100644 tests/ref/issue-7437-math-accent-text-presentation.png

diff --git a/crates/typst-library/src/foundations/symbol.rs b/crates/typst-library/src/foundations/symbol.rs
index 752e0fc26c..ae16880c5d 100644
--- a/crates/typst-library/src/foundations/symbol.rs
+++ b/crates/typst-library/src/foundations/symbol.rs
@@ -150,7 +150,7 @@ impl Symbol {
             "○" => Ok(crate::math::accent::circle::func()),
             "→" => Ok(crate::math::accent::arrow::func()),
             "←" => Ok(crate::math::accent::arrow_l::func()),
-            "↔" => Ok(crate::math::accent::arrow_l_r::func()),
+            "↔" | "↔\u{fe0e}" => Ok(crate::math::accent::arrow_l_r::func()),
             "⇀" => Ok(crate::math::accent::harpoon::func()),
             "↼" => Ok(crate::math::accent::harpoon_lt::func()),
             _ => bail!("symbol {self} is not callable"),
diff --git a/crates/typst-library/src/math/accent.rs b/crates/typst-library/src/math/accent.rs
index 90a1e3118a..1112620c18 100644
--- a/crates/typst-library/src/math/accent.rs
+++ b/crates/typst-library/src/math/accent.rs
@@ -5,8 +5,7 @@ use icu_properties::maps::CodePointMapData;
 use icu_provider::AsDeserializingBufferProvider;
 use icu_provider_blob::BlobDataProvider;
 
-use crate::diag::bail;
-use crate::foundations::{Content, NativeElement, SymbolElem, cast, elem, func};
+use crate::foundations::{Content, NativeElement, Str, SymbolElem, cast, elem, func};
 use crate::layout::{Length, Rel};
 use crate::math::Mathy;
 
@@ -87,6 +86,15 @@ impl Accent {
         Self(Self::combine(c).unwrap_or(c))
     }
 
+    /// Tries to select the appropriate combining accent for a string, falling
+    /// back to the string's lone character if there is no corresponding one.
+    ///
+    /// Returns `None` if there isn't one and the string has more than one
+    /// character.
+    pub fn normalize(s: &str) -> Option<Self> {
+        Self::combining(s).or_else(|| s.parse::<char>().ok().map(Self))
+    }
+
     /// Whether this accent is a bottom accent or not.
     pub fn is_bottom(&self) -> bool {
         static COMBINING_CLASS_DATA: LazyLock<CodePointMapData<CanonicalCombiningClass>> =
@@ -110,11 +118,11 @@ impl Accent {
 ///
 /// ```ignore
 /// accents! {
-///     '\u{0300}' | '`' => grave,
-/// //  ^^^^^^^^^    ^^^    ^^^^^
-/// //  |            |      |
-/// //  |            |      +-- The name of the function.
-/// //  |            +--------- The alternative characters that represent the accent.
+///     '\u{0300}', "\u{0300}" | "`" => grave,
+/// //  ^^^^^^^^^   ^^^^^^^^^^^^^^^^    ^^^^^
+/// //  |           |                   |
+/// //  |           |                   +-- The name of the function.
+/// //  |           +--------- The list of strings that normalize to the accent.
 /// //  +---------------------- The primary character that represents the accent.
 /// }
 /// ```
@@ -122,12 +130,18 @@ impl Accent {
 /// When combined with the `Accent::combine` function, accent characters can be normalized
 /// to the primary character.
 macro_rules! accents {
-    ($($primary:literal $(| $alt:literal)* => $name:ident),* $(,)?) => {
+    ($($primary:literal, $($option:literal)|* => $name:ident),* $(,)?) => {
         impl Accent {
             /// Normalize an accent to a combining one.
             pub fn combine(c: char) -> Option<char> {
-                Some(match c {
-                    $($primary $(| $alt)* => $primary,)*
+                Self::combining(c.encode_utf8(&mut [0; 4])).map(|v| v.0)
+            }
+
+            /// Tries to select a well-known combining accent that matches for the
+            /// value.
+            pub fn combining(value: &str) -> Option<Self> {
+                Some(match value {
+                    $($($option)|* => Accent($primary),)*
                     _ => return None,
                 })
             }
@@ -162,33 +176,39 @@ macro_rules! accents {
 
 // Keep it synced with the documenting table above.
 accents! {
-    '\u{0300}' | '`' => grave,
-    '\u{0301}' | '´' => acute,
-    '\u{0302}' | '^' | 'ˆ' => hat,
-    '\u{0303}' | '~' | '∼' | '˜' => tilde,
-    '\u{0304}' | '¯' => macron,
-    '\u{0305}' | '-' | '‾' | '−' => dash,
-    '\u{0306}' | '˘' => breve,
-    '\u{0307}' | '.' | '˙' | '⋅' => dot,
-    '\u{0308}' | '¨' => dot_double,
-    '\u{20db}' => dot_triple,
-    '\u{20dc}' => dot_quad,
-    '\u{030a}' | '∘' | '○' => circle,
-    '\u{030b}' | '˝' => acute_double,
-    '\u{030c}' | 'ˇ' => caron,
-    '\u{20d6}' | '←' => arrow_l,
-    '\u{20d7}' | '→' | '⟶' => arrow,
-    '\u{20e1}' | '↔' | '⟷' => arrow_l_r,
-    '\u{20d0}' | '↼' => harpoon_lt,
-    '\u{20d1}' | '⇀' => harpoon,
+    // Note: Symbols that can have a text presentation must explicitly have that
+    // alternative listed here.
+    '\u{0300}', "\u{0300}" | "`" => grave,
+    '\u{0301}', "\u{0301}" | "´" => acute,
+    '\u{0302}', "\u{0302}" | "^" | "ˆ" => hat,
+    '\u{0303}', "\u{0303}" | "~" | "∼" | "˜" => tilde,
+    '\u{0304}', "\u{0304}" | "¯" => macron,
+    '\u{0305}', "\u{0305}" | "-" | "‾" | "−" => dash,
+    '\u{0306}', "\u{0306}" | "˘" => breve,
+    '\u{0307}', "\u{0307}" | "." | "˙" | "⋅" => dot,
+    '\u{0308}', "\u{0308}" | "¨" => dot_double,
+    '\u{20db}', "\u{20db}" => dot_triple,
+    '\u{20dc}', "\u{20dc}" => dot_quad,
+    '\u{030a}', "\u{030a}" | "∘" | "○" => circle,
+    '\u{030b}', "\u{030b}" | "˝" => acute_double,
+    '\u{030c}', "\u{030c}" | "ˇ" => caron,
+    '\u{20d6}', "\u{20d6}" | "←" => arrow_l,
+    '\u{20d7}', "\u{20d7}" | "→" | "⟶" => arrow,
+    '\u{20e1}', "\u{20e1}" | "↔" | "↔\u{fe0e}" | "⟷" => arrow_l_r,
+    '\u{20d0}', "\u{20d0}" | "↼" => harpoon_lt,
+    '\u{20d1}', "\u{20d1}" | "⇀" => harpoon,
 }
 
 cast! {
     Accent,
     self => self.0.into_value(),
-    v: char => Self::new(v),
-    v: Content => match v.to_packed::<SymbolElem>().and_then(|elem| elem.text.parse::<char>().ok()) {
-        Some(c) => Self::new(c),
-        _ => bail!("expected a single-codepoint symbol"),
-    },
+    // The string cast handles
+    // - strings: `accent(a, "↔")`
+    // - symbol values: `accent(a, <->)`
+    // - shorthands: `accent(a, arrow.l.r)`
+    v: Str => Self::normalize(&v).ok_or("expected exactly one character")?,
+    // The content cast is for accent uses like `accent(a, ↔)`
+    v: Content => v.to_packed::<SymbolElem>()
+        .and_then(|elem| Accent::normalize(&elem.text))
+        .ok_or("expected a single-codepoint symbol")?,
 }
diff --git a/docs/src/lib.rs b/docs/src/lib.rs
index cb6cbf1270..dee679e221 100644
--- a/docs/src/lib.rs
+++ b/docs/src/lib.rs
@@ -893,7 +893,6 @@ fn symbols_model(resolver: &dyn Resolver, group: &GroupData) -> SymbolsModel {
 
         for (variant, value, deprecation_message) in symbol.variants() {
             let value_char = value.parse::<char>().ok();
-
             let shorthand = |list: &[(&'static str, char)]| {
                 value_char.and_then(|c| {
                     list.iter().copied().find(|&(_, x)| x == c).map(|(s, _)| s)
@@ -912,8 +911,7 @@ fn symbols_model(resolver: &dyn Resolver, group: &GroupData) -> SymbolsModel {
                 }),
                 value: value.into(),
                 // Matches casting `Symbol` to `Accent`
-                accent: value_char
-                    .is_some_and(|c| typst::math::Accent::combine(c).is_some()),
+                accent: typst::math::Accent::combining(value).is_some(),
                 alternates: symbol
                     .variants()
                     .filter(|(other, _, _)| other != &variant)
diff --git a/tests/ref/issue-7437-math-accent-text-presentation.png b/tests/ref/issue-7437-math-accent-text-presentation.png
new file mode 100644
index 0000000000000000000000000000000000000000..42c9524186a93e6202fd68242858c58bcd2ce5f0
GIT binary patch
literal 835
zcmV-J1HAl+P)<h;3K|Lk000e1NJLTq004LZ004Lh0000091m#@0009DNkl<Zc-rmQ
zO-~b16b4}a4?jU&X>ez8N5L2)xDXUEHXtMjiAfV9l4wy1;Ug5ZUqT~}2&GbJJEatg
zi3M89w1tA&Aq`MbD74e#Fk#Ul-QHUg&RM)Onaz{jdvfpO6hVQi2w{W~MwlAB*ywOA
zvMehFyXca_(fFM>%xNOA-!ZXrBccgYUFv9|_E=37p3&EKJkNzQT~9!_LLQzIE@h$s
zFwQWy872e};>w_OpF9lSdPoC6!0)g1`x5}5doPp#ad@+@b!Z_V+vAr$YXf;WWn3~k
zKn8D*C|q>AdPmB`ip__GIWlc-yd)4t7-59Z6`b`!p7N20%~d)*V=$TYjQ%tXj9ynY
zOdJL-??<|OJV3R%{+L&pCD|Vc>xRuFd3aDLUTe>V*Jo}*%_@2LfG?At?P_(2TJ07;
zc$(oF5Qhccpg9c6mRjxFR+5J!cV4t~9?M|cyBaOst{#<A=*udTg*Y<P^+pyi34{?w
z7-59PnpfGTJX7}Rldy|1eG)d+0&zH^-HIo8J|0iR<5KW^BEF@KQeEos#TcU6_0^iz
zTsW<*gZ^dm@O<X75CeeE7RxP*B?z#_DM9g<JPdOUa0CEcF!(qa+y#Jv55jdI4##?0
zhP<n?J#O=TeM%laG6&4;nIWo0;ilWw$<ra~dR<|TOuH8^34{?w7~yjTXY(G+-YjwW
zV`aV}Y9)msYBcXhx_jJDwYm08E2BSTe;`gLtnZPB2eZZD*ST=iSqjx5@^C7yln+r;
z?iRR8VTk%m-*FI-4^dgZoID)4+t#X0%iyWE_q*tJ^%p6HZYbL?$Pl&3=)p?@VT2Jz
z7-6yI9*vDVCnl{E&T*?%e6vo9Z)0^{;_yZ<zmwb*D<^jN-Wb)TUb`4W)Nh7+Z<=%A
z<IV@rvqT>DWv*m@0>FsLq%@h90XVJ#6#vM>;Aw;u0BnTAs&F_70R4sxg(2!j_p_nd
zkZg}%Eig^w;p5@Z@a&l(>ZcnXx?R05<zYFeD$J4T@ZlwaFv1AatpCm<aGXi6%GCe>
N002ovPDHLkV1lLSdk+8r

literal 0
HcmV?d00001

diff --git a/tests/ref/math-accent-sym-call.png b/tests/ref/math-accent-sym-call.png
index 609197f3c3da71d9f4b4efa72b92bcc64311b935..26ca5998242fa368de24c3c7d35254f66d4a655a 100644
GIT binary patch
delta 1267
zcmV<P1PuG42l@$+7k^U-00000ab%qP000ERNkl<Zc-rmN=}+5r0LStDA3pGj4~?4n
z#JMAJZjKS1SyXU}#LZ$9qhh$n#)ca>=nw}(pk>^pQc8hwRK_?4qfI%=xK~O!%2kfS
z20i%E<74=Kdtk_n+TY59{XQXlU&)vBoi^mx1K6h>;KE#(3x9Lr=N%58^ss7_9E-CX
zW;|oP<cE!L=R*&>s&n-K?4>zEkTuuVDhVb80>LzqCLylhr|{U23mXgYOt(tU$Cl^!
zQLpoi6w+Y0r;Z9EXZm2alc4dz%_RcFE%GUPr1=`3!f+VqS$!MsMX6~o4D%pcGfvy6
zv`!s`d11lgQ-4@q+DI!Ac~T1jx?eA$7`$esXsfKCFjeGCQ>m)%z?X2vZ#YQx&T5UT
zhZCSnocM_$_y9Z&fvj--3<1vClUjTUzxi}6h`{s_e$64mG!JxN*phVwqTho$35?02
zBLry7_@>;K@ClS>b~&bi<rth?vCacPO%?zxfa%O6?0?+#pT@UR?JNU?-rGFXwR5-p
zhBHN^Sl;;GVQF1{^7wopfTBDF`o9E#D?PyW+x8tsGK&Gg=2eLx)_SV|kmr=fwC>zF
zu2hypE&g%C#|KF7E|?mAbW%ZvlsWI6eZc!y9{Cn_s$DQ?0Apl_`z19^V!(Ze0o$IO
z?g{tp#D9gk@ZYzPu}@)Z_dbQqU3k_^FvA4E>VyR*LZG#WrLf{CJx5D~I;uO`cyd}w
zA%M^cv}$$t&1J{~0AvbT3Xh+~f7;wSOX0OJdK!wQ15_$;<qB1GNj(KqRIZ@Xmq<t0
z3F9(->C=`x0nsoIK{_Hq0S*%2bDf$;U<%yki+@=PH;~`r%LpGQ;<e*l0=&AVKTj|b
zfI<<GfRB(xcEVe|Fs=ZCO2=WPW5NamuW3U%F$Um0<Q8^r>wrfw_@rBFSO?OZm}3ty
z?qDITzYh5&U{xr&B*(RCpj%RPu^WK~pz>~hntt+Q0J&Ay3!TywV4<Kgp&1vOd<^gT
za(_2z-0F9FFZXD5hMn;Il3Qx*k!{GW$tRvm?%RnAbK!rUF?UKh5AP<eZVkgT`zTfx
zSq@`8$>8ylNR;-2%Oj^nqE44@#EFVevJ$rG^)|QdfdAgHM8aFAQpuWR58zsOwBYCC
z+te50goy!8>dz8{@n={G_d-oErfjTH4S)6!WAi4S9&uf)+=lVc2=#0}3~y;!32)Tu
ztOSz2DBR7G5W`?*PTix#9Ai1&>GF(y^Jov)2%A1Nh2AHs$`nHtDFvPLTp8SRoRxXJ
z9ViDYVZHz#nu(;USky%}fG#2pYOBj%XG3LoIiv^*R>BuXnNyG91Tfqut8PkF5`Tjq
z0YriNY61}La&!tDvBbWH<z<DzH8?y2pi9;vFIM8aTA=QwEdKkqfb-2j#mm`gr}BZ|
zE}-z0?9}7sz?nXu!(d<ordEhI$UEtQXO3L~X29#sF_xZOZM&>syzX##-M;(pxo;;f
z%!U8`+UW6U&97mFSe!LXlpz+2t!yvAM{Q0m;8STba>RZNhYnc+2$*Br4Qc)hZ@q?=
zUx@zv9`W7&3){}&D|z#53!qH59&BIr<9~InqKKJF1W;dJ*W&jFh;pBvTpLF2S<QvH
dFc;pJ{RPMe+$h_O^AZ36002ovPDHLkV1hd^Zd(8V

delta 921
zcmV;K17`gC38Dv(7k@4Y00000#@K@7000ANNkl<Zc-rmN-A`L(0LSsgzr@4~Z;Z*3
z`EtXB!x-a&ONLqIqH~6*a}k1@gSkN_Fc(ZvH$j4lbEKgQbT9!M7$8MpsBF+O=vFqd
z?YfSxZ!0?mO4rl#HF=(sN)|OH&lWD$&&~NI=i>W3SI;Ik$bS=?Hb_3a!Qtf4-+Sp1
zmH8*-Ghk}j7X;`(R(}bAkkjeRpl*E_9Vs0JQ^Jo+{xWM?Fc>r*cKG!OLg1YQm@J3V
z0O{}g;t0NE6d^tCUqJBURSRo2q?f@Id+Wz6K&K-<2Eb~yvkgHXUGyN-Ml03Aw^Inw
zUAK`8>!)b|=6@S8T?=4JMv%fYhElk4sJsJ!u03;A2>14!i~*n>Y?h~Lw4dlk=xwl+
z%0nHv^r1@l!pD?)04Tef-Ga0;j?m`t)BrF$_{|6MzRxrC1pu+WuIE(375x-O0NBpO
zcaaK_{KtFF15p0Grz8w;aX&|Xy$fL9yHXHV2%qa4cz?~xM>pZK@O!t|odl9QfSM^F
zQW>Yr2L*vMMLjn@fyBW-UTnW>?SQ%;oX?(72s3-fqjB{zFrmRf2(rI40|5u5V!;|b
zlc0}>Z`{vVfjhJD1>$zV?T)J4So#^$5b(y~6fmhlu+uusuz{3yU<zDEQVwU<k5CkI
z5nB{PGJgzA85F`w^5J~=e}xl};NKWvJgRV8U9AJDYMBQN*PrZQolXO3ZeBS|GK1-N
zg9nALlQUwqZu28moUmHsYGL;kFb!l8{5Bm)pPop8DG~~KlSpB2D735;UiiuerYD04
zt-bRI{`OF!`wG&?whsH#HU#?)TklhLrEpJ68-JL#q!4s3lEvN7HGOUcp;@QwOQa@)
zk`|Q0{(=CXAG!rVF@j;S3<40iT)0Nj{0PDd^#=fRS68DJ9@`w?Yy_bSp<-0q3V_r1
z0u)EiBUyHn(^7(3*mY{EcySP^AAq%I7_9?f^`|4w<;~Z|5e8npPdifgc3rnAg{vDl
zx__U5mh=Im26M2qlZwIL?gfCJ#l8!^vulPMm@3dXJ%;W9CSF?Q)U;CAx9@c8@vmEP
zy$@6@uWSXZ-QPB9lcfL-yS=M3we$+G_gK@>T?XMI;LX~m!*8P$&Y2?jS-<{!qaIHF
viQvMNxCuEf$eGDMi}`RqoDV-%;lBVSQxcE^gm~2{00000NkvXXu0mjfkodFs

diff --git a/tests/suite/math/accent.typ b/tests/suite/math/accent.typ
index 6cdd6d54f2..b93ead285e 100644
--- a/tests/suite/math/accent.typ
+++ b/tests/suite/math/accent.typ
@@ -2,8 +2,10 @@
 
 --- math-accent-sym-call ---
 // Test function call.
-$grave(a), acute(b), hat(f), tilde(§), macron(ä), diaer(a), ä \
- breve(\&), dot(!), circle(a), caron(@), arrow(Z), arrow.l(Z)$
+$ grave(a), acute(b), hat(f), tilde(§), macron(ä), dash(ä), breve(ä), \
+  dot(!), dot.double(a), diaer(a), dot.triple(a), dot.quad(a), circle(a), \
+  acute.double(a), caron(@), arrow(Z), arrow.l(Z), arrow.l.r(Z), \
+  harpoon(a), harpoon.lt(a) $
 
 --- math-accent-align ---
 $ x &= p \ dot(x) &= v \ dot.double(x) &= a \ dot.triple(x) &= j \ dot.quad(x) &= s $
@@ -92,3 +94,44 @@ $accent(sum, \u{0330}), accent(sum, \u{0330}, size: #50%), accent(H, \u{032D}, s
 $hat(accent(L, \u{0330})), accent(circle(p), \u{0323}),
   macron(accent(caron(accent(A, \u{20ED})), \u{0333})) \
   breve(accent(eta, \u{032E})) = accent(breve(eta), \u{032E})$
+
+--- math-accent-string-too-long ---
+// Error: 17-21 expected exactly one character
+$ accent(x + y, "..") $
+
+--- math-accent-content-too-long ---
+// Error: 17-19 expected a single-codepoint symbol
+$ accent(x + y, ..) $
+
+--- issue-7437-math-accent-text-presentation ---
+// Make sure that the `arrow.l.r` symbol correctly works as an accent even
+// though it includes a text presentation variation selector.
+
+// Ensure that symbol style works.
+$ accent(x + y, arrow.l.r) $
+// Ensure that string style works.
+$ accent(x + y, "↔") $
+// Ensure that content style works.
+$ accent(x + y, ↔) $
+// Ensure that shorthand style works.
+$ accent(x + y, <->) $
+// Ensure that function call works.
+$ arrow.l.r(x + y) $
+
+--- issue-7437-math-accent-emoji-presentation ---
+// Check that we do not normalize an accent character with emoji presentation
+// variation selector to an accent.
+//
+// Since we already support arbitrary characters as accents, we might want to
+// support clusters like this one, too, but it should render as an emoji instead
+// of normalizing into the same accent as `arrow.l.r`, so it's better to keep
+// this an error for now.
+
+// Error: 12-31 expected exactly one character
+$accent(A, std.emoji.arrow.l.r)$
+
+--- issue-7437-math-accent-trailing-text ---
+// Test that we don't allow extra text after the text variation selector.
+
+// Error: 13-47 expected exactly one character
+$accent(A, #symbol("\u{2194}\u{fe0e}\u{fe0f}"))$

From f3c1bae2e441498c519b6628ddd2321179e45053 Mon Sep 17 00:00:00 2001
From: Tobias Schmitz <tobiasschmitz2001@gmail.com>
Date: Mon, 1 Dec 2025 10:31:40 +0100
Subject: [PATCH 40/54] Fix caching of pdf tagging text attribute parameters
 (#7478)

---
 crates/typst-pdf/src/tags/tree/text.rs | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

diff --git a/crates/typst-pdf/src/tags/tree/text.rs b/crates/typst-pdf/src/tags/tree/text.rs
index 1b1e318979..7519c476d2 100644
--- a/crates/typst-pdf/src/tags/tree/text.rs
+++ b/crates/typst-pdf/src/tags/tree/text.rs
@@ -1,7 +1,7 @@
 use krilla::tagging::{LineHeight, NaiveRgbColor, TextDecorationType};
 use typst_library::diag::{SourceDiagnostic, error};
 use typst_library::foundations::{Content, Packed, Smart};
-use typst_library::layout::{Abs, Length};
+use typst_library::layout::Length;
 use typst_library::text::{
     HighlightElem, OverlineElem, ScriptKind, StrikeElem, SubElem, SuperElem, TextItem,
     TextSize, UnderlineElem,
@@ -16,8 +16,8 @@ use crate::util::AbsExt;
 
 #[derive(Debug, Clone)]
 pub struct TextAttrs {
-    /// Store the last resolved set of text attribute. The resolution isn't that
-    /// expensive, but for large bodies of text it is resolved quite often.
+    /// Store the last resolved set of text attributes. The resolution isn't
+    /// that expensive, but for large bodies of text it is resolved quite often.
     last_resolved: Option<(TextParams, ResolvedTextAttrs)>,
     items: Vec<(GroupId, TextAttr)>,
 }
@@ -113,19 +113,13 @@ impl TextDecoKind {
     }
 }
 
+/// A hash of relevant text parameters.
 #[derive(Debug, Copy, Clone, Eq, PartialEq)]
-struct TextParams {
-    pub font_index: u32,
-    pub size: Abs,
-}
+struct TextParams(u128);
 
 impl TextParams {
     fn new(text: &TextItem) -> TextParams {
-        TextParams {
-            // Comparing font indices is enough.
-            font_index: text.font.index(),
-            size: text.size,
-        }
+        TextParams(typst_utils::hash128(&(&text.font, text.size)))
     }
 }
 

From c782228cb4f023c5825996d11b7f4e9a572e21ee Mon Sep 17 00:00:00 2001
From: T0mstone <t0mstone@helium-plasma.de>
Date: Mon, 1 Dec 2025 11:17:56 +0100
Subject: [PATCH 41/54] Fix `page.numbering` docs (#7420)

---
 crates/typst-library/src/layout/page.rs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/crates/typst-library/src/layout/page.rs b/crates/typst-library/src/layout/page.rs
index 123b98cdb9..d1f87c2ad8 100644
--- a/crates/typst-library/src/layout/page.rs
+++ b/crates/typst-library/src/layout/page.rs
@@ -218,7 +218,8 @@ pub struct PageElem {
     /// 1. The first number is the current page number.
     /// 2. The second number is the total number of pages. In a numbering
     ///    pattern, the second number can be omitted. If a function is passed,
-    ///    it will always receive both numbers.
+    ///    it will receive one argument in the context of links or references,
+    ///    and two arguments when producing the visible page numbers.
     ///
     /// These are logical numbers controlled by the page counter, and may thus
     /// not match the physical numbers. Specifically, they are the

From 89515580c850ccb147ff8bab7503640f6665bcca Mon Sep 17 00:00:00 2001
From: Andy Li <andylizi666@gmail.com>
Date: Mon, 1 Dec 2025 06:37:36 -0400
Subject: [PATCH 42/54] Fix panic when division overflows in `calc` (#7419)

Co-authored-by: PgBiel <9021226+PgBiel@users.noreply.github.com>
Co-authored-by: Laurenz <laurmaedje@gmail.com>
---
 crates/typst-library/src/foundations/calc.rs | 33 +++++++++++++-------
 tests/suite/foundations/calc.typ             | 20 ++++++++++++
 2 files changed, 42 insertions(+), 11 deletions(-)

diff --git a/crates/typst-library/src/foundations/calc.rs b/crates/typst-library/src/foundations/calc.rs
index 8aa6c6bcb2..ce1a141c4f 100644
--- a/crates/typst-library/src/foundations/calc.rs
+++ b/crates/typst-library/src/foundations/calc.rs
@@ -564,6 +564,9 @@ fn binom_impl(n: u64, k: u64) -> Option<i64> {
 
 /// Calculates the greatest common divisor of two integers.
 ///
+/// This will error if the result of integer division would be larger than the
+/// maximum 64-bit signed integer.
+///
 /// ```example
 /// #calc.gcd(7, 42)
 /// ```
@@ -573,15 +576,15 @@ pub fn gcd(
     a: i64,
     /// The second integer.
     b: i64,
-) -> i64 {
+) -> StrResult<i64> {
     let (mut a, mut b) = (a, b);
     while b != 0 {
         let temp = b;
-        b = a % b;
+        b = a.checked_rem(b).ok_or_else(too_large)?;
         a = temp;
     }
 
-    a.abs()
+    Ok(a.abs())
 }
 
 /// Calculates the least common multiple of two integers.
@@ -600,7 +603,7 @@ pub fn lcm(
         return Ok(a.abs());
     }
 
-    Ok(a.checked_div(gcd(a, b))
+    Ok(a.checked_div(gcd(a, b)?)
         .and_then(|gcd| gcd.checked_mul(b))
         .map(|v| v.abs())
         .ok_or_else(too_large)?)
@@ -918,7 +921,9 @@ pub fn rem(
     dividend
         .apply2(
             divisor.v,
-            |a, b| Some(DecNum::Int(a % b)),
+            // `checked_rem` can only overflow on `i64::MIN % -1` which is
+            // mathematically zero.
+            |a, b| Some(DecNum::Int(a.checked_rem(b).unwrap_or(0))),
             |a, b| Some(DecNum::Float(a % b)),
             |a, b| a.checked_rem(b).map(DecNum::Decimal),
         )
@@ -931,7 +936,11 @@ pub fn rem(
 /// Performs euclidean division of two numbers.
 ///
 /// The result of this computation is that of a division rounded to the integer
-/// `{n}` such that the dividend is greater than or equal to `{n}` times the divisor.
+/// `{n}` such that the dividend is greater than or equal to `{n}` times
+/// the divisor.
+///
+/// This can error if the resulting number is larger than the maximum value or
+/// smaller than the minimum value for its type.
 ///
 /// ```example
 /// #calc.div-euclid(7, 3) \
@@ -956,7 +965,7 @@ pub fn div_euclid(
     dividend
         .apply2(
             divisor.v,
-            |a, b| Some(DecNum::Int(a.div_euclid(b))),
+            |a, b| a.checked_div_euclid(b).map(DecNum::Int),
             |a, b| Some(DecNum::Float(a.div_euclid(b))),
             |a, b| a.checked_div_euclid(b).map(DecNum::Decimal),
         )
@@ -999,7 +1008,9 @@ pub fn rem_euclid(
     dividend
         .apply2(
             divisor.v,
-            |a, b| Some(DecNum::Int(a.rem_euclid(b))),
+            // `checked_rem_euclid` can only overflow on `i64::MIN % -1` which
+            // is mathematically zero.
+            |a, b| Some(DecNum::Int(a.checked_rem_euclid(b).unwrap_or(0))),
             |a, b| Some(DecNum::Float(a.rem_euclid(b))),
             |a, b| a.checked_rem_euclid(b).map(DecNum::Decimal),
         )
@@ -1012,8 +1023,8 @@ pub fn rem_euclid(
 /// Calculates the quotient (floored division) of two numbers.
 ///
 /// Note that this function will always return an [integer]($int), and will
-/// error if the resulting [`float`] or [`decimal`] is larger than the maximum
-/// 64-bit signed integer or smaller than the minimum for that type.
+/// error if the resulting number is larger than the maximum 64-bit signed
+/// integer or smaller than the minimum for that type.
 ///
 /// ```example
 /// $ "quo"(a, b) &= floor(a/b) \
@@ -1035,7 +1046,7 @@ pub fn quo(
     let divided = dividend
         .apply2(
             divisor.v,
-            |a, b| Some(DecNum::Int(a / b)),
+            |a, b| a.checked_div(b).map(DecNum::Int),
             |a, b| Some(DecNum::Float(a / b)),
             |a, b| a.checked_div(b).map(DecNum::Decimal),
         )
diff --git a/tests/suite/foundations/calc.typ b/tests/suite/foundations/calc.typ
index 23fdea89c3..9e7d9a3b0a 100644
--- a/tests/suite/foundations/calc.typ
+++ b/tests/suite/foundations/calc.typ
@@ -60,6 +60,10 @@
 #test(calc.rem(decimal("-7"), decimal("3")), decimal("-1"))
 #test(calc.rem(decimal("-7"), decimal("-3")), decimal("-1"))
 
+// Ensure `i64::MIN % -1` will not overflow and panic.
+#test(calc.rem(int("-9223372036854775808"), -1), 0)
+#test(calc.rem(float("-9223372036854775808"), -1.0), 0.0)
+
 --- calc-rem-divisor-zero-1 ---
 // Error: 14-15 divisor must not be zero
 #calc.rem(5, 0)
@@ -97,6 +101,10 @@
 // Error: 35-50 divisor must not be zero
 #calc.div-euclid(decimal("3.00"), decimal("0.00"))
 
+--- calc-div-euclid-too-large ---
+// Error: 2-50 the result is too large
+#calc.div-euclid(int("-9223372036854775808"), -1)
+
 --- calc-rem-euclid ---
 // Test the `rem-euclid` function.
 #test(calc.rem-euclid(7, 3), 1)
@@ -110,6 +118,10 @@
 #test(calc.rem-euclid(decimal("-7"), decimal("-3")), decimal("2"))
 #test(calc.rem-euclid(decimal("2.5"), decimal("2")), decimal("0.5"))
 
+// Ensure `i64::MIN % -1` will not overflow and panic.
+#test(calc.rem-euclid(int("-9223372036854775808"), -1), 0)
+#test(calc.rem-euclid(float("-9223372036854775808"), -1.0), 0.0)
+
 --- calc-rem-euclid-divisor-zero-1 ---
 // Error: 21-22 divisor must not be zero
 #calc.rem-euclid(5, 0)
@@ -144,6 +156,10 @@
 // Error: 27-41 divisor must not be zero
 #calc.quo(decimal("4.0"), decimal("0.0"))
 
+--- calc-quo-too-large ---
+// Error: 2-43 the result is too large
+#calc.quo(int("-9223372036854775808"), -1)
+
 --- calc-min-and-max ---
 // Test the `min` and `max` functions.
 #test(calc.min(2, -4), -4)
@@ -298,6 +314,10 @@
 #test(calc.gcd(0, 0), 0)
 #test(calc.gcd(7, 0), 7)
 
+--- calc-gcd-too-large ---
+// Error: 2-43 the result is too large
+#calc.gcd(int("-9223372036854775808"), -1)
+
 --- calc-lcm ---
 // Test the `lcm` function.
 #test(calc.lcm(112, 77), 1232)

From fcda8ceb259da5e6df6e585b89aa85bb08478dd1 Mon Sep 17 00:00:00 2001
From: Tobias Schmitz <tobiasschmitz2001@gmail.com>
Date: Mon, 1 Dec 2025 16:04:08 +0100
Subject: [PATCH 43/54] Explicitly mark block equations in accessibility
 documentation (#7504)

---
 crates/typst-library/src/math/equation.rs | 1 +
 docs/guides/accessibility.md              | 1 +
 docs/reference/library/math.md            | 1 +
 3 files changed, 3 insertions(+)

diff --git a/crates/typst-library/src/math/equation.rs b/crates/typst-library/src/math/equation.rs
index 3c559149a7..dba85a5cd4 100644
--- a/crates/typst-library/src/math/equation.rs
+++ b/crates/typst-library/src/math/equation.rs
@@ -111,6 +111,7 @@ pub struct EquationElem {
     /// ```example
     /// #math.equation(
     ///   alt: "integral from 1 to infinity of a x squared plus b with respect to x",
+    ///   block: true,
     ///   $ integral_1^oo a x^2 + b dif x $,
     /// )
     /// ```
diff --git a/docs/guides/accessibility.md b/docs/guides/accessibility.md
index f520edc9f9..2749db9ca2 100644
--- a/docs/guides/accessibility.md
+++ b/docs/guides/accessibility.md
@@ -203,6 +203,7 @@ Finally, you can specify an alternative description on math using [`math.equatio
 ```typ
 #math.equation(
   alt: "a squared plus b squared equals c squared",
+  block: true,
   $ a^2 + b^2 = c^2 $,
 )
 ```
diff --git a/docs/reference/library/math.md b/docs/reference/library/math.md
index 5a26e629bf..d8da4eac1b 100644
--- a/docs/reference/library/math.md
+++ b/docs/reference/library/math.md
@@ -110,6 +110,7 @@ Guide]($guides/accessibility/#textual-representations).
 ```example
 #math.equation(
   alt: "d S equals delta q divided by T",
+  block: true,
   $ dif S = (delta q) / T $,
 )
 ```

From 1d640ac4ddac8a656c62f5b77d56e4a31089bf13 Mon Sep 17 00:00:00 2001
From: Laurenz <laurmaedje@gmail.com>
Date: Tue, 2 Dec 2025 14:21:42 +0100
Subject: [PATCH 44/54] Warn instead of erroring for page set rule in HTML
 export (#7513)

---
 crates/typst-realize/src/lib.rs   | 22 ++++++++++++++--------
 tests/ref/html/page-set-html.html | 10 ++++++++++
 tests/suite/layout/page.typ       |  5 +++++
 3 files changed, 29 insertions(+), 8 deletions(-)
 create mode 100644 tests/ref/html/page-set-html.html

diff --git a/crates/typst-realize/src/lib.rs b/crates/typst-realize/src/lib.rs
index cbd5265fa5..9e545b2edf 100644
--- a/crates/typst-realize/src/lib.rs
+++ b/crates/typst-realize/src/lib.rs
@@ -12,7 +12,7 @@ use bumpalo::Bump;
 use bumpalo::collections::{CollectIn, String as BumpString, Vec as BumpVec};
 use comemo::Track;
 use ecow::EcoString;
-use typst_library::diag::{At, SourceResult, bail};
+use typst_library::diag::{At, SourceResult, bail, warning};
 use typst_library::engine::Engine;
 use typst_library::foundations::{
     Content, Context, ContextElem, Element, NativeElement, NativeShowRule, Packed,
@@ -608,16 +608,22 @@ fn visit_styled<'a>(
                 info.populate_locale(&local)
             }
         } else if elem == PageElem::ELEM {
-            if !matches!(s.kind, RealizationKind::LayoutDocument { .. }) {
-                bail!(
+            match s.kind {
+                RealizationKind::LayoutDocument { .. } => {
+                    // When there are page styles, we "break free" from our show
+                    // rule cage.
+                    pagebreak = true;
+                    s.outside = true;
+                }
+                RealizationKind::HtmlDocument { .. } => s.engine.sink.warn(warning!(
+                    style.span(),
+                    "page set rule was ignored during HTML export"
+                )),
+                _ => bail!(
                     style.span(),
                     "page configuration is not allowed inside of containers"
-                );
+                ),
             }
-
-            // When there are page styles, we "break free" from our show rule cage.
-            pagebreak = true;
-            s.outside = true;
         }
     }
 
diff --git a/tests/ref/html/page-set-html.html b/tests/ref/html/page-set-html.html
new file mode 100644
index 0000000000..9864da9646
--- /dev/null
+++ b/tests/ref/html/page-set-html.html
@@ -0,0 +1,10 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+  </head>
+  <body>
+    <p>Hi</p>
+  </body>
+</html>
diff --git a/tests/suite/layout/page.typ b/tests/suite/layout/page.typ
index 57c145f621..6927591697 100644
--- a/tests/suite/layout/page.typ
+++ b/tests/suite/layout/page.typ
@@ -348,6 +348,11 @@ A
   A
 ]
 
+--- page-set-html html ---
+// Warning: 2-16 page set rule was ignored during HTML export
+#set page("a4")
+Hi
+
 --- issue-2631-page-header-ordering ---
 #set text(6pt)
 #show heading: set text(6pt, weight: "regular")

From 008ad40dbd65802ff583312a27b678d539c20b77 Mon Sep 17 00:00:00 2001
From: Tobias Schmitz <tobiasschmitz2001@gmail.com>
Date: Tue, 2 Dec 2025 14:53:08 +0100
Subject: [PATCH 45/54] Bump krilla (#7516)

---
 Cargo.lock                      | 60 ++++++++++++++++++++-------------
 Cargo.toml                      |  4 +--
 crates/typst-pdf/src/convert.rs | 10 ++++--
 crates/typst-pdf/src/page.rs    |  6 ++--
 4 files changed, 49 insertions(+), 31 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 2fbbf74319..e9c769ffa0 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -928,9 +928,9 @@ checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
 
 [[package]]
 name = "hashbrown"
-version = "0.15.2"
+version = "0.16.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bf151400ff0baff5465007dd2f3e717f3fe502074ca563069ce3a6629d07b289"
+checksum = "841d1cc9bed7f9236f321df977030373f4a4163ae1a7dbfe1a51a2c1a51d9100"
 
 [[package]]
 name = "hayagriva"
@@ -941,7 +941,7 @@ dependencies = [
  "biblatex",
  "ciborium",
  "citationberg",
- "indexmap 2.7.1",
+ "indexmap 2.12.1",
  "paste",
  "roman-numerals-rs",
  "serde",
@@ -1320,14 +1320,15 @@ dependencies = [
 
 [[package]]
 name = "indexmap"
-version = "2.7.1"
+version = "2.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8c9c992b02b5b4c94ea26e32fe5bccb7aa7d9f390ab5c1221ff895bc7ea8b652"
+checksum = "0ad4bb2b565bca0645f4d68c5c9af97fba094e9791da685bf83cb5f3ce74acf2"
 dependencies = [
  "equivalent",
- "hashbrown 0.15.2",
+ "hashbrown 0.16.1",
  "rayon",
  "serde",
+ "serde_core",
 ]
 
 [[package]]
@@ -1437,8 +1438,9 @@ dependencies = [
 
 [[package]]
 name = "krilla"
-version = "0.5.0"
-source = "git+https://github.com/LaurenzV/krilla?rev=f22a936#f22a9365bafa46bbe26c8c56c88208eb50063e63"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a0ddfec86fec13d068075e14f22a7e217c281f3ed69ddcb427bf3f5d504fd674"
 dependencies = [
  "base64",
  "bumpalo",
@@ -1449,6 +1451,7 @@ dependencies = [
  "hayro-write",
  "image-webp",
  "imagesize 0.14.0",
+ "indexmap 2.12.1",
  "once_cell",
  "pdf-writer",
  "png",
@@ -1467,8 +1470,9 @@ dependencies = [
 
 [[package]]
 name = "krilla-svg"
-version = "0.2.0"
-source = "git+https://github.com/LaurenzV/krilla?rev=f22a936#f22a9365bafa46bbe26c8c56c88208eb50063e63"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f485e1a850201a01dcd8d73e7cf09f2cd4c4cc85c2cd296359094d49336d8ef7"
 dependencies = [
  "flate2",
  "fontdb",
@@ -1855,7 +1859,7 @@ dependencies = [
  "bitvec",
  "crossbeam-channel",
  "filetime",
- "indexmap 2.7.1",
+ "indexmap 2.12.1",
  "libdeflater",
  "log",
  "rayon",
@@ -2012,7 +2016,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "42cf17e9a1800f5f396bc67d193dc9411b59012a5876445ef450d449881e1016"
 dependencies = [
  "base64",
- "indexmap 2.7.1",
+ "indexmap 2.12.1",
  "quick-xml 0.32.0",
  "serde",
  "time",
@@ -2428,18 +2432,28 @@ checksum = "f79dfe2d285b0488816f30e700a7438c5a73d816b5b7d3ac72fbc48b0d185e03"
 
 [[package]]
 name = "serde"
-version = "1.0.217"
+version = "1.0.228"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9a8e94ea7f378bd32cbbd37198a4a91436180c5bb472411e48b5ec2e2124ae9e"
+dependencies = [
+ "serde_core",
+ "serde_derive",
+]
+
+[[package]]
+name = "serde_core"
+version = "1.0.228"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "02fc4265df13d6fa1d00ecff087228cc0a2b5f3c0e87e258d8b94a156e984c70"
+checksum = "41d385c7d4ca58e59fc732af25c3983b67ac852c1a25000afe1175de458b67ad"
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.217"
+version = "1.0.228"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a9bf7cf98d04a2b28aead066b7496853d4779c9cc183c440dbac457641e19a0"
+checksum = "d540f220d3187173da220f885ab66608367b6574e925011a9353e4badda91d79"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -2485,7 +2499,7 @@ version = "0.9.34+deprecated"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6a8b1a1a2ebf674015cc02edccce75287f1a0130d394307b36743c2f5d504b47"
 dependencies = [
- "indexmap 2.7.1",
+ "indexmap 2.12.1",
  "itoa",
  "ryu",
  "serde",
@@ -2899,7 +2913,7 @@ version = "0.22.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "02a8b472d1a3d7c18e2d61a489aee3453fd9031c33e4f55bd533f4a7adca1bee"
 dependencies = [
- "indexmap 2.7.1",
+ "indexmap 2.12.1",
  "serde",
  "serde_spanned",
  "toml_datetime",
@@ -3039,7 +3053,7 @@ version = "0.14.0"
 dependencies = [
  "comemo",
  "ecow",
- "indexmap 2.7.1",
+ "indexmap 2.12.1",
  "rustc-hash",
  "stacker",
  "toml",
@@ -3179,7 +3193,7 @@ dependencies = [
  "icu_provider",
  "icu_provider_blob",
  "image",
- "indexmap 2.7.1",
+ "indexmap 2.12.1",
  "kamadak-exif",
  "kurbo 0.12.0",
  "lipsum",
@@ -3241,7 +3255,7 @@ dependencies = [
  "comemo",
  "ecow",
  "image",
- "indexmap 2.7.1",
+ "indexmap 2.12.1",
  "infer",
  "krilla",
  "krilla-svg",
@@ -3865,7 +3879,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "886614b5ce857341226aa091f3c285e450683894acaaa7887f366c361efef79d"
 dependencies = [
  "font-types",
- "indexmap 2.7.1",
+ "indexmap 2.12.1",
  "kurbo 0.12.0",
  "log",
  "read-fonts",
@@ -4092,7 +4106,7 @@ dependencies = [
  "arbitrary",
  "crc32fast",
  "flate2",
- "indexmap 2.7.1",
+ "indexmap 2.12.1",
  "memchr",
  "zopfli",
 ]
diff --git a/Cargo.toml b/Cargo.toml
index 0e11507f01..13cbf40d70 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -77,8 +77,8 @@ image = { version = "0.25.5", default-features = false, features = ["png", "jpeg
 indexmap = { version = "2", features = ["serde"] }
 infer = { version = "0.19.0", default-features = false }
 kamadak-exif = "0.6"
-krilla = { git = "https://github.com/LaurenzV/krilla", rev = "f22a936", default-features = false, features = ["raster-images", "comemo", "rayon", "pdf"] }
-krilla-svg = { git = "https://github.com/LaurenzV/krilla", rev = "f22a936" }
+krilla = { version = "0.6.0", default-features = false, features = ["raster-images", "comemo", "rayon", "pdf"] }
+krilla-svg = "0.3.0"
 kurbo = "0.12"
 libfuzzer-sys = "0.4"
 lipsum = "0.9"
diff --git a/crates/typst-pdf/src/convert.rs b/crates/typst-pdf/src/convert.rs
index 47d66fa2f0..0bbf634af9 100644
--- a/crates/typst-pdf/src/convert.rs
+++ b/crates/typst-pdf/src/convert.rs
@@ -13,7 +13,9 @@ use krilla::{Document, SerializeSettings};
 use krilla_svg::render_svg_glyph;
 use rustc_hash::{FxBuildHasher, FxHashMap, FxHashSet};
 use smallvec::SmallVec;
-use typst_library::diag::{SourceDiagnostic, SourceResult, bail, error};
+use typst_library::diag::{
+    At, ExpectInternal, SourceDiagnostic, SourceResult, bail, error,
+};
 use typst_library::foundations::{NativeElement, Repr};
 use typst_library::introspection::{Location, Tag};
 use typst_library::layout::{
@@ -121,10 +123,12 @@ fn convert_pages(gc: &mut GlobalContext, document: &mut Document) -> SourceResul
             // PDF 1.4 upwards to 1.7 specifies a minimum page size of 3x3 units.
             // PDF 2.0 doesn't define an explicit limit, but krilla and probably
             // some viewers won't handle pages that have zero sized pages.
-            let mut settings = PageSettings::new(
+            let mut settings = PageSettings::from_wh(
                 typst_page.frame.width().to_f32().max(3.0),
                 typst_page.frame.height().to_f32().max(3.0),
-            );
+            )
+            .expect_internal("invalid page size")
+            .at(Span::detached())?;
 
             if let Some(label) = typst_page
                 .numbering
diff --git a/crates/typst-pdf/src/page.rs b/crates/typst-pdf/src/page.rs
index 02fecef5eb..2edc3f7c7e 100644
--- a/crates/typst-pdf/src/page.rs
+++ b/crates/typst-pdf/src/page.rs
@@ -1,4 +1,4 @@
-use std::num::NonZeroUsize;
+use std::num::NonZeroU32;
 
 use krilla::page::{NumberingStyle, PageLabel};
 use typst_library::model::Numbering;
@@ -49,7 +49,7 @@ impl PageLabelExt for PageLabel {
                 (!prefix.is_empty()).then(|| prefix.clone())
             };
 
-            let offset = style.and(number.try_into().ok().and_then(NonZeroUsize::new));
+            let offset = style.and(number.try_into().ok().and_then(NonZeroU32::new));
             Some(PageLabel::new(style, prefix.map(Into::into), offset))
         }
     }
@@ -58,7 +58,7 @@ impl PageLabelExt for PageLabel {
         PageLabel::new(
             Some(NumberingStyle::Arabic),
             None,
-            number.try_into().ok().and_then(NonZeroUsize::new),
+            number.try_into().ok().and_then(NonZeroU32::new),
         )
     }
 }

From df5afd36a7e75b117b243d3d3c39d32bc96890f0 Mon Sep 17 00:00:00 2001
From: Laurenz <laurmaedje@gmail.com>
Date: Wed, 3 Dec 2025 15:04:53 +0100
Subject: [PATCH 46/54] Fix crash in `array.sorted` (#7520)

Co-Authored-By: Runge <50059102+RungeCC@users.noreply.github.com>
---
 crates/typst-library/src/foundations/array.rs | 15 +++++++--------
 tests/suite/foundations/array.typ             |  4 ++++
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/crates/typst-library/src/foundations/array.rs b/crates/typst-library/src/foundations/array.rs
index e4e8bbb487..0c2e2f5326 100644
--- a/crates/typst-library/src/foundations/array.rs
+++ b/crates/typst-library/src/foundations/array.rs
@@ -891,6 +891,10 @@ impl Array {
         #[named]
         by: Option<Func>,
     ) -> SourceResult<Array> {
+        // We use `glidesort` instead of the standard library sorting algorithm
+        // to prevent panics in case the comparison function does not define a
+        // valid order (see https://github.com/typst/typst/pull/5627 and
+        // https://github.com/typst/typst/issues/6285).
         match by {
             Some(by) => {
                 let mut are_in_order = |mut x, mut y| {
@@ -911,10 +915,7 @@ impl Array {
                         }
                     }
                 };
-                // If a comparison function is provided, we use `glidesort`
-                // instead of the standard library sorting algorithm to prevent
-                // panics in case the comparison function does not define a
-                // valid order (see https://github.com/typst/typst/pull/5627).
+
                 let mut result = Ok(());
                 let mut vec = self.0.into_iter().enumerate().collect::<Vec<_>>();
                 glidesort::sort_by(&mut vec, |(i, x), (j, y)| {
@@ -967,12 +968,10 @@ impl Array {
                     Some(f) => f.call(engine, context, [x]),
                     None => Ok(x),
                 };
-                // If no comparison function is provided, we know the order is
-                // valid, so we can use the standard library sort and prevent an
-                // extra allocation.
+
                 let mut result = Ok(());
                 let mut vec = self.0;
-                vec.make_mut().sort_by(|a, b| {
+                glidesort::sort_by(vec.make_mut(), |a, b| {
                     match (key_of(a.clone()), key_of(b.clone())) {
                         (Ok(a), Ok(b)) => ops::compare(&a, &b).unwrap_or_else(|err| {
                             if result.is_ok() {
diff --git a/tests/suite/foundations/array.typ b/tests/suite/foundations/array.typ
index e981945b66..6558d687f4 100644
--- a/tests/suite/foundations/array.typ
+++ b/tests/suite/foundations/array.typ
@@ -552,3 +552,7 @@
 --- array-reduce-unexpected-argument ---
 // Error: 19-21 unexpected argument
 #(1, 2, 3).reduce(() => none)
+
+--- issue-6285-crashed-with-sorting-non-total-order ---
+// Error: 2-66 cannot compare none and string
+#(("a", "b", "c", "d", "e", "z") * 3 + ("c", none, "a")).sorted()

From 9e68d1357dcadf8557d34d4ec4e51f4aff4f9309 Mon Sep 17 00:00:00 2001
From: Laurenz <laurmaedje@gmail.com>
Date: Wed, 3 Dec 2025 15:09:25 +0100
Subject: [PATCH 47/54] Typst 0.14.1 changelog (#7517)

---
 docs/changelog/0.14.1.md  | 51 +++++++++++++++++++++++++++++++++++++++
 docs/changelog/welcome.md |  1 +
 docs/src/lib.rs           |  1 +
 3 files changed, 53 insertions(+)
 create mode 100644 docs/changelog/0.14.1.md

diff --git a/docs/changelog/0.14.1.md b/docs/changelog/0.14.1.md
new file mode 100644
index 0000000000..bc62e961ba
--- /dev/null
+++ b/docs/changelog/0.14.1.md
@@ -0,0 +1,51 @@
+---
+title: 0.14.1
+description: Changes in Typst 0.14.1
+---
+
+# Version 0.14.1 { #v0.14.1 }
+
+## PDF export
+- Fixed regression where links to labelled elements would sometimes not work correctly [LaurenzV/krilla#304]
+- Fixed bug where PDF text attributes could be written incorrectly [#7478]
+- Fixed crash in link handling [#7471]
+- Fixed crash for zero-sized pages [#7454]
+- Fixed crash when a table [`vline`]($table.vline) or [`hline`]($table.hline) has an out-of-bounds index [#7448]
+- Fixed crash in formatting of font-related PDF export errors [#7460]
+- Fixed crash when a [`footnote`] or [`place`] element was queried and reinserted into the document [#7216]
+- Fixed crash for PNGs with invalid metadata [LaurenzV/krilla#286], [LaurenzV/krilla#287]
+- Fixed bug where text in SVGs with `fill-and-stroke` paint order could be exported incorrectly [LaurenzV/krilla#292]
+- Fixed bug with layer isolation in SVGs where blending/masking is used [LaurenzV/krilla#295]
+- Fixed that table headers could be tagged incorrectly in some scenarios [LaurenzV/krilla#289]
+- Fixed issues where generated PDFs could differ between 32-bit and 64-bit systems [LaurenzV/krilla#317], [LaurenzV/krilla#316], [LaurenzV/krilla#312]
+- Upgraded JPEG decoder used during PDF export for improved compatibility, fixing a case where a valid JPEG was rejected [LaurenzV/krilla#288]
+- A PDF document information dictionary that would be empty is now fully omitted instead [LaurenzV/krilla#280]
+- A rare crash in PDF tagging was turned into a compiler error [#7450]
+
+## HTML export
+- Fixed export of table [headers]($table.header) and [footers]($table.footer) with gutter [#7332]
+- A [`page`] set rule in HTML export is now a warning instead of a hard error, in line with how unsupported elements are generally treated [#7513]
+
+## Math
+- Fixed regression where `arrow.l.r` could not be used as an [accent]($math.accent) anymore [#7481]
+- Fixed that single-letter strings did not react to spaces around them like multi-letter strings do [#7276]
+- Fixed that spacing around [`mat`]($math.mat) and [`vec`]($math.vec) with a fence delimiter was whitespace-dependent [#7309]
+- Fixed height calculation for horizontally stretched glyphs [#7327]
+
+## Model
+- Fixed regression where Typst would error in heading numbering functions that don't handle the counter state `{(0,)}`. This can occur in the first layout iteration. Such errors are usually automatically caught by Typst, which was not the case here. [#7459]
+
+## Text
+- Fixed regression where Typst would synthesize superscripts for some fonts even when [typographic]($super.typographic) glyphs were available [#7462]
+- Fixed regression where some oblique fonts would be classified as italic [#7483]
+
+## Scripting
+- Fixed crash due to violated invariants in [`array.sorted`] [#7520]
+- Fixed crashes due to overflow in [`calc.rem`], [`calc.rem-euclid`], [`calc.div-euclid`], [`calc.quo`], and [`calc.gcd`] [#7419]
+- Upgraded WebAssembly runtime, fixing a bug that [plugins]($plugin) could run into [#7438]
+
+## Command Line Interface
+- Compiling to standard output in combination with `--deps --deps-format=make` (which results in an error) will not produce an empty Make dependency file as a side effect anymore [#7246]
+
+## Development
+- Increased minimum supported Rust version to 1.89 [#7363]
diff --git a/docs/changelog/welcome.md b/docs/changelog/welcome.md
index 99c8d8e934..6b97b16e36 100644
--- a/docs/changelog/welcome.md
+++ b/docs/changelog/welcome.md
@@ -10,6 +10,7 @@ forward. This section documents all changes to Typst since its initial public
 release.
 
 ## Versions
+- [Typst 0.14.1]($changelog/0.14.1)
 - [Typst 0.14.0]($changelog/0.14.0)
 - [Typst 0.13.1]($changelog/0.13.1)
 - [Typst 0.13.0]($changelog/0.13.0)
diff --git a/docs/src/lib.rs b/docs/src/lib.rs
index dee679e221..352594315b 100644
--- a/docs/src/lib.rs
+++ b/docs/src/lib.rs
@@ -219,6 +219,7 @@ fn changelog_pages(resolver: &dyn Resolver) -> PageModel {
     let mut page = md_page(resolver, resolver.base(), load!("changelog/welcome.md"));
     let base = format!("{}changelog/", resolver.base());
     page.children = vec![
+        md_page(resolver, &base, load!("changelog/0.14.1.md")),
         md_page(resolver, &base, load!("changelog/0.14.0.md")),
         md_page(resolver, &base, load!("changelog/0.13.1.md")),
         md_page(resolver, &base, load!("changelog/0.13.0.md")),

From eb2027e55f17a91cc2025c7a71674a2c5ea3a363 Mon Sep 17 00:00:00 2001
From: Laurenz <laurmaedje@gmail.com>
Date: Wed, 3 Dec 2025 15:18:11 +0100
Subject: [PATCH 48/54] Version bump

---
 Cargo.lock               | 46 ++++++++++++++++++++--------------------
 Cargo.toml               | 38 ++++++++++++++++-----------------
 docs/changelog/0.14.1.md |  5 ++++-
 3 files changed, 46 insertions(+), 43 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index e9c769ffa0..e90832b0c0 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2948,7 +2948,7 @@ checksum = "6af6ae20167a9ece4bcb41af5b80f8a1f1df981f6391189ce00fd257af04126a"
 
 [[package]]
 name = "typst"
-version = "0.14.0"
+version = "0.14.1"
 dependencies = [
  "comemo",
  "ecow",
@@ -2966,13 +2966,13 @@ dependencies = [
 
 [[package]]
 name = "typst-assets"
-version = "0.14.0"
+version = "0.14.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "712f5e2c4134bcf22f292086aa515caff00a21d54c8b30c77c4fc1227442a89a"
+checksum = "98b250f6c1ddd0f435db2283c7eb36a9b72bee34d6397625bf7f817c64ad7c62"
 
 [[package]]
 name = "typst-cli"
-version = "0.14.0"
+version = "0.14.1"
 dependencies = [
  "chrono",
  "clap",
@@ -3018,12 +3018,12 @@ dependencies = [
 
 [[package]]
 name = "typst-dev-assets"
-version = "0.14.0"
-source = "git+https://github.com/typst/typst-dev-assets?rev=f46583d#f46583d68167e3512c1f4ebaf564a86c60862160"
+version = "0.14.1"
+source = "git+https://github.com/typst/typst-dev-assets?tag=v0.14.1#03addcfb64f3f95209464a521e6aa49645bd271a"
 
 [[package]]
 name = "typst-docs"
-version = "0.14.0"
+version = "0.14.1"
 dependencies = [
  "clap",
  "codex",
@@ -3049,7 +3049,7 @@ dependencies = [
 
 [[package]]
 name = "typst-eval"
-version = "0.14.0"
+version = "0.14.1"
 dependencies = [
  "comemo",
  "ecow",
@@ -3067,7 +3067,7 @@ dependencies = [
 
 [[package]]
 name = "typst-fuzz"
-version = "0.14.0"
+version = "0.14.1"
 dependencies = [
  "comemo",
  "libfuzzer-sys",
@@ -3079,7 +3079,7 @@ dependencies = [
 
 [[package]]
 name = "typst-html"
-version = "0.14.0"
+version = "0.14.1"
 dependencies = [
  "bumpalo",
  "comemo",
@@ -3098,7 +3098,7 @@ dependencies = [
 
 [[package]]
 name = "typst-ide"
-version = "0.14.0"
+version = "0.14.1"
 dependencies = [
  "comemo",
  "ecow",
@@ -3115,7 +3115,7 @@ dependencies = [
 
 [[package]]
 name = "typst-kit"
-version = "0.14.0"
+version = "0.14.1"
 dependencies = [
  "dirs",
  "ecow",
@@ -3139,7 +3139,7 @@ dependencies = [
 
 [[package]]
 name = "typst-layout"
-version = "0.14.0"
+version = "0.14.1"
 dependencies = [
  "az",
  "bumpalo",
@@ -3173,7 +3173,7 @@ dependencies = [
 
 [[package]]
 name = "typst-library"
-version = "0.14.0"
+version = "0.14.1"
 dependencies = [
  "az",
  "bitflags 2.9.1",
@@ -3238,7 +3238,7 @@ dependencies = [
 
 [[package]]
 name = "typst-macros"
-version = "0.14.0"
+version = "0.14.1"
 dependencies = [
  "heck",
  "proc-macro2",
@@ -3248,7 +3248,7 @@ dependencies = [
 
 [[package]]
 name = "typst-pdf"
-version = "0.14.0"
+version = "0.14.1"
 dependencies = [
  "az",
  "bytemuck",
@@ -3272,7 +3272,7 @@ dependencies = [
 
 [[package]]
 name = "typst-realize"
-version = "0.14.0"
+version = "0.14.1"
 dependencies = [
  "arrayvec",
  "bumpalo",
@@ -3288,7 +3288,7 @@ dependencies = [
 
 [[package]]
 name = "typst-render"
-version = "0.14.0"
+version = "0.14.1"
 dependencies = [
  "bytemuck",
  "comemo",
@@ -3306,7 +3306,7 @@ dependencies = [
 
 [[package]]
 name = "typst-svg"
-version = "0.14.0"
+version = "0.14.1"
 dependencies = [
  "base64",
  "comemo",
@@ -3328,7 +3328,7 @@ dependencies = [
 
 [[package]]
 name = "typst-syntax"
-version = "0.14.0"
+version = "0.14.1"
 dependencies = [
  "ecow",
  "rustc-hash",
@@ -3345,7 +3345,7 @@ dependencies = [
 
 [[package]]
 name = "typst-tests"
-version = "0.14.0"
+version = "0.14.1"
 dependencies = [
  "bitflags 2.9.1",
  "clap",
@@ -3372,7 +3372,7 @@ dependencies = [
 
 [[package]]
 name = "typst-timing"
-version = "0.14.0"
+version = "0.14.1"
 dependencies = [
  "parking_lot",
  "serde",
@@ -3382,7 +3382,7 @@ dependencies = [
 
 [[package]]
 name = "typst-utils"
-version = "0.14.0"
+version = "0.14.1"
 dependencies = [
  "once_cell",
  "portable-atomic",
diff --git a/Cargo.toml b/Cargo.toml
index 13cbf40d70..91712f246b 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -4,7 +4,7 @@ default-members = ["crates/typst-cli"]
 resolver = "2"
 
 [workspace.package]
-version = "0.14.0"
+version = "0.14.1"
 rust-version = "1.89" # also change in ci.yml
 authors = ["The Typst Project Developers"]
 edition = "2024"
@@ -16,24 +16,24 @@ keywords = ["typst"]
 readme = "README.md"
 
 [workspace.dependencies]
-typst = { path = "crates/typst", version = "0.14.0" }
-typst-cli = { path = "crates/typst-cli", version = "0.14.0" }
-typst-eval = { path = "crates/typst-eval", version = "0.14.0" }
-typst-html = { path = "crates/typst-html", version = "0.14.0" }
-typst-ide = { path = "crates/typst-ide", version = "0.14.0" }
-typst-kit = { path = "crates/typst-kit", version = "0.14.0" }
-typst-layout = { path = "crates/typst-layout", version = "0.14.0" }
-typst-library = { path = "crates/typst-library", version = "0.14.0" }
-typst-macros = { path = "crates/typst-macros", version = "0.14.0" }
-typst-pdf = { path = "crates/typst-pdf", version = "0.14.0" }
-typst-realize = { path = "crates/typst-realize", version = "0.14.0" }
-typst-render = { path = "crates/typst-render", version = "0.14.0" }
-typst-svg = { path = "crates/typst-svg", version = "0.14.0" }
-typst-syntax = { path = "crates/typst-syntax", version = "0.14.0" }
-typst-timing = { path = "crates/typst-timing", version = "0.14.0" }
-typst-utils = { path = "crates/typst-utils", version = "0.14.0" }
-typst-assets = "0.14.0"
-typst-dev-assets = { git = "https://github.com/typst/typst-dev-assets", rev = "f46583d" }
+typst = { path = "crates/typst", version = "0.14.1" }
+typst-cli = { path = "crates/typst-cli", version = "0.14.1" }
+typst-eval = { path = "crates/typst-eval", version = "0.14.1" }
+typst-html = { path = "crates/typst-html", version = "0.14.1" }
+typst-ide = { path = "crates/typst-ide", version = "0.14.1" }
+typst-kit = { path = "crates/typst-kit", version = "0.14.1" }
+typst-layout = { path = "crates/typst-layout", version = "0.14.1" }
+typst-library = { path = "crates/typst-library", version = "0.14.1" }
+typst-macros = { path = "crates/typst-macros", version = "0.14.1" }
+typst-pdf = { path = "crates/typst-pdf", version = "0.14.1" }
+typst-realize = { path = "crates/typst-realize", version = "0.14.1" }
+typst-render = { path = "crates/typst-render", version = "0.14.1" }
+typst-svg = { path = "crates/typst-svg", version = "0.14.1" }
+typst-syntax = { path = "crates/typst-syntax", version = "0.14.1" }
+typst-timing = { path = "crates/typst-timing", version = "0.14.1" }
+typst-utils = { path = "crates/typst-utils", version = "0.14.1" }
+typst-assets = "0.14.1"
+typst-dev-assets = { git = "https://github.com/typst/typst-dev-assets", tag = "v0.14.1" }
 arrayvec = "0.7.4"
 az = "1.2"
 base64 = "0.22"
diff --git a/docs/changelog/0.14.1.md b/docs/changelog/0.14.1.md
index bc62e961ba..552d142ff9 100644
--- a/docs/changelog/0.14.1.md
+++ b/docs/changelog/0.14.1.md
@@ -3,7 +3,7 @@ title: 0.14.1
 description: Changes in Typst 0.14.1
 ---
 
-# Version 0.14.1 { #v0.14.1 }
+# Version 0.14.1 (December 3, 2025) { #v0.14.1 }
 
 ## PDF export
 - Fixed regression where links to labelled elements would sometimes not work correctly [LaurenzV/krilla#304]
@@ -49,3 +49,6 @@ description: Changes in Typst 0.14.1
 
 ## Development
 - Increased minimum supported Rust version to 1.89 [#7363]
+
+## Contributors
+<contributors from="v0.14.0" to="v0.14.1" />

From b90e60c75099ac014e24c3b765266bba7c7f0cc2 Mon Sep 17 00:00:00 2001
From: 3w36zj6 <52315048+3w36zj6@users.noreply.github.com>
Date: Sat, 29 Aug 2026 21:39:08 +0900
Subject: [PATCH 49/54] =?UTF-8?q?chore:=20=E3=82=B3=E3=83=B3=E3=83=95?=
 =?UTF-8?q?=E3=83=AA=E3=82=AF=E3=83=88=E3=82=92=E8=A7=A3=E6=B6=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore                                    |   3 -
 Cargo.lock                                    | 234 ---------
 Cargo.toml                                    |  35 --
 crates/typst-cli/src/deps.rs                  |  11 -
 crates/typst-html/src/lib.rs                  |  61 ---
 crates/typst-html/src/rules.rs                |  27 --
 crates/typst-layout/src/inline/line.rs        |  18 -
 crates/typst-layout/src/inline/shaping.rs     |  14 -
 crates/typst-layout/src/math/fragment.rs      |   4 -
 crates/typst-layout/src/math/mat.rs           |   9 -
 crates/typst-layout/src/math/text.rs          |   9 -
 crates/typst-library/src/diag.rs              |   6 -
 crates/typst-library/src/foundations/args.rs  |  94 ----
 crates/typst-library/src/foundations/array.rs |  24 +-
 crates/typst-library/src/foundations/calc.rs  | 449 +----------------
 crates/typst-library/src/foundations/cast.rs  |  22 -
 .../src/foundations/content/mod.rs            |  81 ----
 .../typst-library/src/foundations/datetime.rs | 181 -------
 crates/typst-library/src/foundations/func.rs  | 105 ----
 .../typst-library/src/foundations/selector.rs |   4 -
 crates/typst-library/src/foundations/str.rs   |   4 -
 .../typst-library/src/foundations/symbol.rs   |  40 --
 .../typst-library/src/foundations/version.rs  |   7 -
 .../src/introspection/counter.rs              | 186 -------
 .../typst-library/src/introspection/here.rs   |  29 --
 .../typst-library/src/introspection/locate.rs |  22 -
 .../src/introspection/location.rs             |  65 ---
 .../src/introspection/metadata.rs             |  18 -
 .../typst-library/src/introspection/query.rs  |  83 ----
 .../typst-library/src/introspection/state.rs  | 181 -------
 crates/typst-library/src/layout/align.rs      |  82 ----
 crates/typst-library/src/layout/angle.rs      |  19 -
 crates/typst-library/src/layout/columns.rs    |  70 +--
 crates/typst-library/src/layout/container.rs  | 191 +-------
 crates/typst-library/src/layout/dir.rs        |  43 --
 crates/typst-library/src/layout/fr.rs         |  12 -
 crates/typst-library/src/layout/grid/mod.rs   | 458 ------------------
 crates/typst-library/src/layout/hide.rs       |  19 +-
 crates/typst-library/src/layout/layout.rs     |  51 +-
 crates/typst-library/src/layout/length.rs     |  57 ---
 crates/typst-library/src/layout/measure.rs    |  45 --
 crates/typst-library/src/layout/pad.rs        |  41 --
 crates/typst-library/src/layout/page.rs       | 243 +---------
 crates/typst-library/src/layout/place.rs      | 140 +-----
 crates/typst-library/src/layout/ratio.rs      |  26 -
 crates/typst-library/src/layout/rel.rs        |  57 +--
 crates/typst-library/src/layout/repeat.rs     |  33 --
 crates/typst-library/src/layout/spacing.rs    |  62 ---
 crates/typst-library/src/layout/stack.rs      |  40 --
 crates/typst-library/src/layout/transform.rs  | 140 ------
 crates/typst-library/src/loading/cbor.rs      |  64 ---
 crates/typst-library/src/loading/csv.rs       |  52 --
 crates/typst-library/src/loading/json.rs      |  74 ---
 crates/typst-library/src/loading/read.rs      |  27 --
 crates/typst-library/src/loading/toml.rs      |  78 ---
 crates/typst-library/src/loading/xml.rs       |  34 --
 crates/typst-library/src/loading/yaml.rs      |  75 ---
 crates/typst-library/src/math/accent.rs       | 107 +---
 crates/typst-library/src/math/attach.rs       |  91 ----
 crates/typst-library/src/math/cancel.rs       |  45 --
 crates/typst-library/src/math/equation.rs     |  65 ---
 crates/typst-library/src/math/frac.rs         |  63 ---
 crates/typst-library/src/math/lr.rs           |  77 ---
 crates/typst-library/src/math/matrix.rs       | 130 -----
 crates/typst-library/src/math/mod.rs          |  20 -
 crates/typst-library/src/math/op.rs           |  22 -
 crates/typst-library/src/math/root.rs         |  20 -
 crates/typst-library/src/math/style.rs        | 157 ------
 crates/typst-library/src/math/underover.rs    | 115 -----
 .../typst-library/src/model/bibliography.rs   |  91 ----
 crates/typst-library/src/model/cite.rs        |  72 ---
 crates/typst-library/src/model/document.rs    |  51 --
 crates/typst-library/src/model/emph.rs        |  21 -
 crates/typst-library/src/model/enum.rs        | 114 -----
 crates/typst-library/src/model/figure.rs      | 220 ---------
 crates/typst-library/src/model/footnote.rs    |  89 ----
 crates/typst-library/src/model/heading.rs     | 147 +-----
 crates/typst-library/src/model/link.rs        | 106 ----
 crates/typst-library/src/model/list.rs        |  72 ---
 crates/typst-library/src/model/numbering.rs   |  61 ---
 crates/typst-library/src/model/outline.rs     | 220 ---------
 crates/typst-library/src/model/par.rs         | 344 -------------
 crates/typst-library/src/model/quote.rs       |  38 --
 crates/typst-library/src/model/reference.rs   | 100 ----
 crates/typst-library/src/model/strong.rs      |  23 -
 crates/typst-library/src/text/case.rs         |  20 -
 crates/typst-library/src/text/deco.rs         | 158 ------
 crates/typst-library/src/text/font/book.rs    |   4 -
 crates/typst-library/src/text/linebreak.rs    |  23 -
 crates/typst-library/src/text/lorem.rs        |  15 -
 crates/typst-library/src/text/mod.rs          |  30 --
 crates/typst-library/src/text/raw.rs          | 179 -------
 crates/typst-library/src/text/shift.rs        |  98 ----
 crates/typst-library/src/text/smallcaps.rs    |  36 --
 crates/typst-library/src/text/smartquote.rs   |  46 --
 .../typst-library/src/visualize/image/mod.rs  | 165 -------
 .../src/visualize/image/raster.rs             |   9 -
 crates/typst-pdf/src/convert.rs               |  40 --
 crates/typst-pdf/src/image.rs                 |  18 -
 crates/typst-pdf/src/link.rs                  |   8 -
 crates/typst-pdf/src/page.rs                  |  12 -
 crates/typst-pdf/src/tags/context/table.rs    |   4 -
 crates/typst-pdf/src/tags/resolve.rs          |   9 -
 crates/typst-pdf/src/tags/tree/build.rs       |  18 -
 crates/typst-pdf/src/tags/tree/mod.rs         |  30 --
 crates/typst-pdf/src/tags/tree/text.rs        |  25 -
 crates/typst-pdf/src/text.rs                  |   8 -
 crates/typst-pdf/src/util.rs                  |  11 -
 crates/typst-realize/src/lib.rs               |  17 -
 crates/typst-syntax/src/lexer.rs              |   6 -
 docs/Cargo.toml                               |   4 -
 docs/changelog/0.1.0.md                       |  20 -
 docs/changelog/0.10.0.md                      |  24 -
 docs/changelog/0.11.0.md                      | 109 -----
 docs/changelog/0.11.1.md                      |   8 -
 docs/changelog/0.12.0.md                      | 106 ----
 docs/changelog/0.13.0.md                      | 135 ------
 docs/changelog/0.13.1.md                      |  29 --
 docs/changelog/0.14.0.md                      | 302 +-----------
 docs/changelog/0.2.0.md                       |  13 -
 docs/changelog/0.3.0.md                       |  12 -
 docs/changelog/0.4.0.md                       |  15 -
 docs/changelog/0.5.0.md                       |  24 -
 docs/changelog/0.6.0.md                       |   7 -
 docs/changelog/0.7.0.md                       |  22 -
 docs/changelog/0.8.0.md                       |  26 -
 docs/changelog/0.9.0.md                       |  28 --
 docs/changelog/earlier.md                     |  78 ---
 docs/changelog/welcome.md                     |  17 -
 docs/guides/accessibility.md                  | 286 -----------
 docs/guides/guide-for-latex-users.md          |  39 --
 docs/guides/page-setup.md                     |  30 --
 docs/guides/tables.md                         |  99 ----
 docs/guides/welcome.md                        |  16 -
 docs/overview.md                              |  19 -
 docs/reference/export/html.md                 |  62 ---
 docs/reference/export/pdf.md                  | 242 ---------
 docs/reference/export/png.md                  |  64 ---
 docs/reference/export/svg.md                  |  51 --
 docs/reference/groups.yml                     |  93 ----
 docs/reference/language/context.md            | 155 ------
 docs/reference/language/scripting.md          | 255 ----------
 docs/reference/language/styling.md            | 104 ----
 docs/reference/language/syntax.md             | 218 ---------
 docs/reference/library/data-loading.md        |  18 -
 docs/reference/library/introspection.md       |  13 -
 docs/reference/library/layout.md              |   6 -
 docs/reference/library/math.md                |  94 +---
 docs/reference/library/visualize.md           |  19 -
 docs/reference/welcome.md                     |  29 --
 docs/src/html.rs                              |  62 ---
 docs/src/lib.rs                               | 106 +---
 docs/src/link.rs                              |   3 -
 docs/tutorial/1-writing.md                    | 227 ---------
 docs/tutorial/2-formatting.md                 | 177 -------
 docs/tutorial/3-advanced.md                   | 344 -------------
 docs/tutorial/4-template.md                   | 244 ----------
 docs/tutorial/welcome.md                      |  46 --
 tests/ref/html/col-gutter-table.html          |  18 -
 tests/ref/html/col-row-gutter-table.html      |  18 -
 tests/ref/html/row-gutter-table.html          |  18 -
 tests/src/run.rs                              |  18 -
 tests/suite/foundations/array.typ             |   3 -
 tests/suite/foundations/calc.typ              |  15 -
 tests/suite/foundations/int.typ               |   3 -
 tests/suite/layout/grid/html.typ              |  18 -
 tests/suite/layout/grid/stroke.typ            |   3 -
 tests/suite/layout/page.typ                   |   6 -
 tests/suite/math/accent.typ                   |   8 -
 tests/suite/math/cases.typ                    |   3 -
 tests/suite/math/mat.typ                      |   3 -
 tests/suite/math/spacing.typ                  |   4 -
 tests/suite/math/vec.typ                      |   3 -
 tests/suite/model/heading.typ                 |   3 -
 tests/suite/pdftags/break.typ                 |   3 -
 tests/suite/pdftags/link.typ                  |   3 -
 tests/suite/pdftags/query.typ                 |  11 -
 tests/suite/text/raw.typ                      |   4 -
 tests/suite/text/shift.typ                    |   3 -
 179 files changed, 32 insertions(+), 12165 deletions(-)

diff --git a/.gitignore b/.gitignore
index 23a54630cf..3b98f0e185 100644
--- a/.gitignore
+++ b/.gitignore
@@ -26,7 +26,6 @@ package-lock.json
 # Nix
 /result
 .direnv/
-<<<<<<< HEAD
 
 # typst-jp/docs specific ignore rules
 
@@ -36,5 +35,3 @@ package-lock.json
 # Generated documentation
 /assets
 /docs.json
-=======
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
diff --git a/Cargo.lock b/Cargo.lock
index bf4db21f4a..58c2cb44c6 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -928,15 +928,9 @@ checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
 
 [[package]]
 name = "hashbrown"
-<<<<<<< HEAD
-version = "0.15.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bf151400ff0baff5465007dd2f3e717f3fe502074ca563069ce3a6629d07b289"
-=======
 version = "0.16.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "841d1cc9bed7f9236f321df977030373f4a4163ae1a7dbfe1a51a2c1a51d9100"
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 
 [[package]]
 name = "hayagriva"
@@ -947,11 +941,7 @@ dependencies = [
  "biblatex",
  "ciborium",
  "citationberg",
-<<<<<<< HEAD
- "indexmap 2.7.1",
-=======
  "indexmap 2.12.1",
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
  "paste",
  "roman-numerals-rs",
  "serde",
@@ -1030,11 +1020,7 @@ dependencies = [
  "log",
  "rustc-hash",
  "smallvec",
-<<<<<<< HEAD
- "zune-jpeg",
-=======
  "zune-jpeg 0.4.14",
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 ]
 
 [[package]]
@@ -1296,13 +1282,8 @@ dependencies = [
  "image-webp",
  "num-traits",
  "png",
-<<<<<<< HEAD
- "zune-core",
- "zune-jpeg",
-=======
  "zune-core 0.4.12",
  "zune-jpeg 0.4.14",
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 ]
 
 [[package]]
@@ -1339,16 +1320,6 @@ dependencies = [
 
 [[package]]
 name = "indexmap"
-<<<<<<< HEAD
-version = "2.7.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8c9c992b02b5b4c94ea26e32fe5bccb7aa7d9f390ab5c1221ff895bc7ea8b652"
-dependencies = [
- "equivalent",
- "hashbrown 0.15.2",
- "rayon",
- "serde",
-=======
 version = "2.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0ad4bb2b565bca0645f4d68c5c9af97fba094e9791da685bf83cb5f3ce74acf2"
@@ -1358,7 +1329,6 @@ dependencies = [
  "rayon",
  "serde",
  "serde_core",
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 ]
 
 [[package]]
@@ -1468,15 +1438,9 @@ dependencies = [
 
 [[package]]
 name = "krilla"
-<<<<<<< HEAD
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "199be5f63da6e19b71051fd5276258a8e55449ac48e2e7492c68238f38ca9f3b"
-=======
 version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a0ddfec86fec13d068075e14f22a7e217c281f3ed69ddcb427bf3f5d504fd674"
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 dependencies = [
  "base64",
  "bumpalo",
@@ -1487,10 +1451,7 @@ dependencies = [
  "hayro-write",
  "image-webp",
  "imagesize 0.14.0",
-<<<<<<< HEAD
-=======
  "indexmap 2.12.1",
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
  "once_cell",
  "pdf-writer",
  "png",
@@ -1504,24 +1465,14 @@ dependencies = [
  "tiny-skia-path",
  "xmp-writer",
  "yoke 0.8.0",
-<<<<<<< HEAD
- "zune-jpeg",
-=======
  "zune-jpeg 0.5.5",
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 ]
 
 [[package]]
 name = "krilla-svg"
-<<<<<<< HEAD
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8d3eec075c9507dfdbfb4b9bc3b2aeac074ed422b61bcfd93517616d6b3d19c3"
-=======
 version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f485e1a850201a01dcd8d73e7cf09f2cd4c4cc85c2cd296359094d49336d8ef7"
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 dependencies = [
  "flate2",
  "fontdb",
@@ -1908,11 +1859,7 @@ dependencies = [
  "bitvec",
  "crossbeam-channel",
  "filetime",
-<<<<<<< HEAD
- "indexmap 2.7.1",
-=======
  "indexmap 2.12.1",
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
  "libdeflater",
  "log",
  "rayon",
@@ -2069,11 +2016,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "42cf17e9a1800f5f396bc67d193dc9411b59012a5876445ef450d449881e1016"
 dependencies = [
  "base64",
-<<<<<<< HEAD
- "indexmap 2.7.1",
-=======
  "indexmap 2.12.1",
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
  "quick-xml 0.32.0",
  "serde",
  "time",
@@ -2151,34 +2094,22 @@ dependencies = [
 
 [[package]]
 name = "pulldown-cmark"
-<<<<<<< HEAD
 version = "0.13.0"
 source = "git+https://github.com/3w36zj6/pulldown-cmark-cjk-friendly?rev=ccdd8e0#ccdd8e0bd2ed96da7786272250b79a996911fd05"
-=======
-version = "0.9.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "57206b407293d2bcd3af849ce869d52068623f19e1b5ff8e8778e3309439682b"
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 dependencies = [
  "bitflags 2.9.1",
  "getopts",
  "memchr",
-<<<<<<< HEAD
  "pulldown-cmark-escape",
-=======
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
  "unicase",
 ]
 
 [[package]]
-<<<<<<< HEAD
 name = "pulldown-cmark-escape"
 version = "0.11.0"
 source = "git+https://github.com/3w36zj6/pulldown-cmark-cjk-friendly?rev=ccdd8e0#ccdd8e0bd2ed96da7786272250b79a996911fd05"
 
 [[package]]
-=======
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 name = "pxfm"
 version = "0.1.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -2351,11 +2282,7 @@ dependencies = [
  "svgtypes",
  "tiny-skia",
  "usvg",
-<<<<<<< HEAD
- "zune-jpeg",
-=======
  "zune-jpeg 0.4.14",
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 ]
 
 [[package]]
@@ -2510,11 +2437,6 @@ checksum = "f79dfe2d285b0488816f30e700a7438c5a73d816b5b7d3ac72fbc48b0d185e03"
 
 [[package]]
 name = "serde"
-<<<<<<< HEAD
-version = "1.0.217"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "02fc4265df13d6fa1d00ecff087228cc0a2b5f3c0e87e258d8b94a156e984c70"
-=======
 version = "1.0.228"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9a8e94ea7f378bd32cbbd37198a4a91436180c5bb472411e48b5ec2e2124ae9e"
@@ -2528,22 +2450,15 @@ name = "serde_core"
 version = "1.0.228"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "41d385c7d4ca58e59fc732af25c3983b67ac852c1a25000afe1175de458b67ad"
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
 name = "serde_derive"
-<<<<<<< HEAD
-version = "1.0.217"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a9bf7cf98d04a2b28aead066b7496853d4779c9cc183c440dbac457641e19a0"
-=======
 version = "1.0.228"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d540f220d3187173da220f885ab66608367b6574e925011a9353e4badda91d79"
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 dependencies = [
  "proc-macro2",
  "quote",
@@ -2589,11 +2504,7 @@ version = "0.9.34+deprecated"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6a8b1a1a2ebf674015cc02edccce75287f1a0130d394307b36743c2f5d504b47"
 dependencies = [
-<<<<<<< HEAD
- "indexmap 2.7.1",
-=======
  "indexmap 2.12.1",
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
  "itoa",
  "ryu",
  "serde",
@@ -3007,11 +2918,7 @@ version = "0.22.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "02a8b472d1a3d7c18e2d61a489aee3453fd9031c33e4f55bd533f4a7adca1bee"
 dependencies = [
-<<<<<<< HEAD
- "indexmap 2.7.1",
-=======
  "indexmap 2.12.1",
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
  "serde",
  "serde_spanned",
  "toml_datetime",
@@ -3046,11 +2953,7 @@ checksum = "6af6ae20167a9ece4bcb41af5b80f8a1f1df981f6391189ce00fd257af04126a"
 
 [[package]]
 name = "typst"
-<<<<<<< HEAD
-version = "0.14.0"
-=======
 version = "0.14.1"
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 dependencies = [
  "comemo",
  "ecow",
@@ -3068,15 +2971,6 @@ dependencies = [
 
 [[package]]
 name = "typst-assets"
-<<<<<<< HEAD
-version = "0.14.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "712f5e2c4134bcf22f292086aa515caff00a21d54c8b30c77c4fc1227442a89a"
-
-[[package]]
-name = "typst-cli"
-version = "0.14.0"
-=======
 version = "0.14.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "98b250f6c1ddd0f435db2283c7eb36a9b72bee34d6397625bf7f817c64ad7c62"
@@ -3084,7 +2978,6 @@ checksum = "98b250f6c1ddd0f435db2283c7eb36a9b72bee34d6397625bf7f817c64ad7c62"
 [[package]]
 name = "typst-cli"
 version = "0.14.1"
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 dependencies = [
  "chrono",
  "clap",
@@ -3130,31 +3023,19 @@ dependencies = [
 
 [[package]]
 name = "typst-dev-assets"
-<<<<<<< HEAD
-version = "0.14.0"
-source = "git+https://github.com/typst/typst-dev-assets?tag=v0.14.0#0b12d75772199e07294749ffe078ea030b857746"
-
-[[package]]
-name = "typst-docs"
-version = "0.14.0"
-=======
 version = "0.14.1"
 source = "git+https://github.com/typst/typst-dev-assets?tag=v0.14.1#03addcfb64f3f95209464a521e6aa49645bd271a"
 
 [[package]]
 name = "typst-docs"
 version = "0.14.1"
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 dependencies = [
  "clap",
  "codex",
  "ecow",
  "heck",
  "pulldown-cmark",
-<<<<<<< HEAD
  "pulldown-cmark-escape",
-=======
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
  "regex",
  "rustc-hash",
  "serde",
@@ -3174,19 +3055,11 @@ dependencies = [
 
 [[package]]
 name = "typst-eval"
-<<<<<<< HEAD
-version = "0.14.0"
-dependencies = [
- "comemo",
- "ecow",
- "indexmap 2.7.1",
-=======
 version = "0.14.1"
 dependencies = [
  "comemo",
  "ecow",
  "indexmap 2.12.1",
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
  "rustc-hash",
  "stacker",
  "toml",
@@ -3200,11 +3073,7 @@ dependencies = [
 
 [[package]]
 name = "typst-fuzz"
-<<<<<<< HEAD
-version = "0.14.0"
-=======
 version = "0.14.1"
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 dependencies = [
  "comemo",
  "libfuzzer-sys",
@@ -3216,11 +3085,7 @@ dependencies = [
 
 [[package]]
 name = "typst-html"
-<<<<<<< HEAD
-version = "0.14.0"
-=======
 version = "0.14.1"
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 dependencies = [
  "bumpalo",
  "comemo",
@@ -3239,11 +3104,7 @@ dependencies = [
 
 [[package]]
 name = "typst-ide"
-<<<<<<< HEAD
-version = "0.14.0"
-=======
 version = "0.14.1"
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 dependencies = [
  "comemo",
  "ecow",
@@ -3260,11 +3121,7 @@ dependencies = [
 
 [[package]]
 name = "typst-kit"
-<<<<<<< HEAD
-version = "0.14.0"
-=======
 version = "0.14.1"
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 dependencies = [
  "dirs",
  "ecow",
@@ -3288,11 +3145,7 @@ dependencies = [
 
 [[package]]
 name = "typst-layout"
-<<<<<<< HEAD
-version = "0.14.0"
-=======
 version = "0.14.1"
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 dependencies = [
  "az",
  "bumpalo",
@@ -3326,11 +3179,7 @@ dependencies = [
 
 [[package]]
 name = "typst-library"
-<<<<<<< HEAD
-version = "0.14.0"
-=======
 version = "0.14.1"
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 dependencies = [
  "az",
  "bitflags 2.9.1",
@@ -3350,11 +3199,7 @@ dependencies = [
  "icu_provider",
  "icu_provider_blob",
  "image",
-<<<<<<< HEAD
- "indexmap 2.7.1",
-=======
  "indexmap 2.12.1",
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
  "kamadak-exif",
  "kurbo 0.12.0",
  "lipsum",
@@ -3399,11 +3244,7 @@ dependencies = [
 
 [[package]]
 name = "typst-macros"
-<<<<<<< HEAD
-version = "0.14.0"
-=======
 version = "0.14.1"
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 dependencies = [
  "heck",
  "proc-macro2",
@@ -3413,22 +3254,14 @@ dependencies = [
 
 [[package]]
 name = "typst-pdf"
-<<<<<<< HEAD
-version = "0.14.0"
-=======
 version = "0.14.1"
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 dependencies = [
  "az",
  "bytemuck",
  "comemo",
  "ecow",
  "image",
-<<<<<<< HEAD
- "indexmap 2.7.1",
-=======
  "indexmap 2.12.1",
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
  "infer",
  "krilla",
  "krilla-svg",
@@ -3445,11 +3278,7 @@ dependencies = [
 
 [[package]]
 name = "typst-realize"
-<<<<<<< HEAD
-version = "0.14.0"
-=======
 version = "0.14.1"
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 dependencies = [
  "arrayvec",
  "bumpalo",
@@ -3465,11 +3294,7 @@ dependencies = [
 
 [[package]]
 name = "typst-render"
-<<<<<<< HEAD
-version = "0.14.0"
-=======
 version = "0.14.1"
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 dependencies = [
  "bytemuck",
  "comemo",
@@ -3487,11 +3312,7 @@ dependencies = [
 
 [[package]]
 name = "typst-svg"
-<<<<<<< HEAD
-version = "0.14.0"
-=======
 version = "0.14.1"
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 dependencies = [
  "base64",
  "comemo",
@@ -3513,11 +3334,7 @@ dependencies = [
 
 [[package]]
 name = "typst-syntax"
-<<<<<<< HEAD
-version = "0.14.0"
-=======
 version = "0.14.1"
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 dependencies = [
  "ecow",
  "rustc-hash",
@@ -3534,11 +3351,7 @@ dependencies = [
 
 [[package]]
 name = "typst-tests"
-<<<<<<< HEAD
-version = "0.14.0"
-=======
 version = "0.14.1"
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 dependencies = [
  "bitflags 2.9.1",
  "clap",
@@ -3565,11 +3378,7 @@ dependencies = [
 
 [[package]]
 name = "typst-timing"
-<<<<<<< HEAD
-version = "0.14.0"
-=======
 version = "0.14.1"
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 dependencies = [
  "parking_lot",
  "serde",
@@ -3579,11 +3388,7 @@ dependencies = [
 
 [[package]]
 name = "typst-utils"
-<<<<<<< HEAD
-version = "0.14.0"
-=======
 version = "0.14.1"
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 dependencies = [
  "once_cell",
  "portable-atomic",
@@ -3895,15 +3700,9 @@ dependencies = [
 
 [[package]]
 name = "wasmi"
-<<<<<<< HEAD
-version = "0.51.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cb4f6b71d5cb04a4615b9a8a2e522ba284c491ad847afd9e905d89be15e3efc0"
-=======
 version = "0.51.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "118030b2d125bc893e0cc5b1ce156eb41461f4373308cb5f2e3c698533b5e547"
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 dependencies = [
  "spin",
  "wasmi_collections",
@@ -3914,17 +3713,6 @@ dependencies = [
 
 [[package]]
 name = "wasmi_collections"
-<<<<<<< HEAD
-version = "0.51.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a4a11fa090c4d742e5a77dbbc8efbbe1aa151db7335ca6850232e6cafbb1023"
-
-[[package]]
-name = "wasmi_core"
-version = "0.51.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ab3e422fc1f4df78c9ded6ed48c4ca6d1f55f4609f04c99962fc07532e4db61d"
-=======
 version = "0.51.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "653fa20efc966818934524dceb54b1b81e6f845bbcc2e155d6e9fc32becf667e"
@@ -3934,22 +3722,15 @@ name = "wasmi_core"
 version = "0.51.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "65701f60308c7e46cca85f273ad17e80c60998cc63d3fa168ac393f62b123038"
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 dependencies = [
  "libm",
 ]
 
 [[package]]
 name = "wasmi_ir"
-<<<<<<< HEAD
-version = "0.51.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "13fe9f9f1747ec81644e764c4dc798f063f5d54a495f0a3b4a375bce9af65399"
-=======
 version = "0.51.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a6539f63bf2a6838f27876e2877f0b00a088e84f91e92445620cc6b977fde032"
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 dependencies = [
  "wasmi_core",
 ]
@@ -4104,11 +3885,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "886614b5ce857341226aa091f3c285e450683894acaaa7887f366c361efef79d"
 dependencies = [
  "font-types",
-<<<<<<< HEAD
- "indexmap 2.7.1",
-=======
  "indexmap 2.12.1",
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
  "kurbo 0.12.0",
  "log",
  "read-fonts",
@@ -4335,11 +4112,7 @@ dependencies = [
  "arbitrary",
  "crc32fast",
  "flate2",
-<<<<<<< HEAD
- "indexmap 2.7.1",
-=======
  "indexmap 2.12.1",
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
  "memchr",
  "zopfli",
 ]
@@ -4371,23 +4144,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3f423a2c17029964870cfaabb1f13dfab7d092a62a29a89264f4d36990ca414a"
 
 [[package]]
-<<<<<<< HEAD
-=======
 name = "zune-core"
 version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "111f7d9820f05fd715df3144e254d6fc02ee4088b0644c0ffd0efc9e6d9d2773"
 
 [[package]]
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 name = "zune-jpeg"
 version = "0.4.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "99a5bab8d7dedf81405c4bb1f2b83ea057643d9cb28778cea9eecddeedd2e028"
 dependencies = [
-<<<<<<< HEAD
- "zune-core",
-=======
  "zune-core 0.4.12",
 ]
 
@@ -4398,5 +4165,4 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "dc6fb7703e32e9a07fb3f757360338b3a567a5054f21b5f52a666752e333d58e"
 dependencies = [
  "zune-core 0.5.0",
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 ]
diff --git a/Cargo.toml b/Cargo.toml
index 70fc572cac..91712f246b 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -4,13 +4,8 @@ default-members = ["crates/typst-cli"]
 resolver = "2"
 
 [workspace.package]
-<<<<<<< HEAD
-version = "0.14.0"
-rust-version = "1.88" # also change in ci.yml
-=======
 version = "0.14.1"
 rust-version = "1.89" # also change in ci.yml
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 authors = ["The Typst Project Developers"]
 edition = "2024"
 homepage = "https://typst.app"
@@ -21,26 +16,6 @@ keywords = ["typst"]
 readme = "README.md"
 
 [workspace.dependencies]
-<<<<<<< HEAD
-typst = { path = "crates/typst", version = "0.14.0" }
-typst-cli = { path = "crates/typst-cli", version = "0.14.0" }
-typst-eval = { path = "crates/typst-eval", version = "0.14.0" }
-typst-html = { path = "crates/typst-html", version = "0.14.0" }
-typst-ide = { path = "crates/typst-ide", version = "0.14.0" }
-typst-kit = { path = "crates/typst-kit", version = "0.14.0" }
-typst-layout = { path = "crates/typst-layout", version = "0.14.0" }
-typst-library = { path = "crates/typst-library", version = "0.14.0" }
-typst-macros = { path = "crates/typst-macros", version = "0.14.0" }
-typst-pdf = { path = "crates/typst-pdf", version = "0.14.0" }
-typst-realize = { path = "crates/typst-realize", version = "0.14.0" }
-typst-render = { path = "crates/typst-render", version = "0.14.0" }
-typst-svg = { path = "crates/typst-svg", version = "0.14.0" }
-typst-syntax = { path = "crates/typst-syntax", version = "0.14.0" }
-typst-timing = { path = "crates/typst-timing", version = "0.14.0" }
-typst-utils = { path = "crates/typst-utils", version = "0.14.0" }
-typst-assets = "0.14.0"
-typst-dev-assets = { git = "https://github.com/typst/typst-dev-assets", tag = "v0.14.0" }
-=======
 typst = { path = "crates/typst", version = "0.14.1" }
 typst-cli = { path = "crates/typst-cli", version = "0.14.1" }
 typst-eval = { path = "crates/typst-eval", version = "0.14.1" }
@@ -59,7 +34,6 @@ typst-timing = { path = "crates/typst-timing", version = "0.14.1" }
 typst-utils = { path = "crates/typst-utils", version = "0.14.1" }
 typst-assets = "0.14.1"
 typst-dev-assets = { git = "https://github.com/typst/typst-dev-assets", tag = "v0.14.1" }
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 arrayvec = "0.7.4"
 az = "1.2"
 base64 = "0.22"
@@ -103,13 +77,8 @@ image = { version = "0.25.5", default-features = false, features = ["png", "jpeg
 indexmap = { version = "2", features = ["serde"] }
 infer = { version = "0.19.0", default-features = false }
 kamadak-exif = "0.6"
-<<<<<<< HEAD
-krilla = { version = "0.5.0", default-features = false, features = ["raster-images", "comemo", "rayon", "pdf"] }
-krilla-svg = "0.2"
-=======
 krilla = { version = "0.6.0", default-features = false, features = ["raster-images", "comemo", "rayon", "pdf"] }
 krilla-svg = "0.3.0"
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 kurbo = "0.12"
 libfuzzer-sys = "0.4"
 lipsum = "0.9"
@@ -172,11 +141,7 @@ ureq = { version = "2", default-features = false, features = ["native-tls", "gzi
 usvg = { version = "0.45", default-features = false, features = ["text"] }
 utf8_iter = "1.0.4"
 walkdir = "2"
-<<<<<<< HEAD
-wasmi = { version = "0.51.0", default-features = false, features = ["simd"] }
-=======
 wasmi = { version = "0.51.2", default-features = false, features = ["simd"] }
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 web-sys = "0.3"
 xmlparser = "0.13.5"
 xmlwriter = "0.1.0"
diff --git a/crates/typst-cli/src/deps.rs b/crates/typst-cli/src/deps.rs
index 0025950449..bdd97f8c48 100644
--- a/crates/typst-cli/src/deps.rs
+++ b/crates/typst-cli/src/deps.rs
@@ -64,11 +64,7 @@ fn write_deps_make(
     dest: &Output,
     outputs: &[Output],
 ) -> io::Result<()> {
-<<<<<<< HEAD
-    let mut dest = dest.open()?;
-=======
     let mut buffer = Vec::new();
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     for (i, output) in outputs.iter().enumerate() {
         let path = match output {
             Output::Path(path) => path.as_os_str(),
@@ -86,12 +82,6 @@ fn write_deps_make(
         // processed.
         let Some(string) = path.to_str() else { continue };
         if i != 0 {
-<<<<<<< HEAD
-            dest.write_all(b" ")?;
-        }
-        dest.write_all(munge(string).as_bytes())?;
-    }
-=======
             buffer.write_all(b" ")?;
         }
         buffer.write_all(munge(string).as_bytes())?;
@@ -100,7 +90,6 @@ fn write_deps_make(
     // Only create the deps file in case of valid output paths.
     let mut dest = dest.open()?;
     dest.write_all(&buffer)?;
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     dest.write_all(b":")?;
 
     for dep in relative_dependencies(world)? {
diff --git a/crates/typst-html/src/lib.rs b/crates/typst-html/src/lib.rs
index 52f40bc9e1..5998c3a608 100644
--- a/crates/typst-html/src/lib.rs
+++ b/crates/typst-html/src/lib.rs
@@ -34,7 +34,6 @@ pub fn module() -> Module {
     Module::new("html", html)
 }
 
-<<<<<<< HEAD
 /// Typstのコンテンツを含むことができるHTML要素。
 ///
 /// TypstのHTMLエクスポートは、ほとんどの要素に対して適切なタグを自動的に生成します。
@@ -51,23 +50,6 @@ pub fn module() -> Module {
 ///
 /// 通常、Typstは`html`、`head`、および`body`タグを生成します。
 /// 代わりにこの関数でそれらを作成した場合、Typstは自身の生成するタグを省略します。
-=======
-/// An HTML element that can contain Typst content.
-///
-/// Typst's HTML export automatically generates the appropriate tags for most
-/// elements. However, sometimes, it is desirable to retain more control. For
-/// example, when using Typst to generate your blog, you could use this function
-/// to wrap each article in an `<article>` tag.
-///
-/// Typst is aware of what is valid HTML. A tag and its attributes must form
-/// syntactically valid HTML. Some tags, like `meta` do not accept content.
-/// Hence, you must not provide a body for them. We may add more checks in the
-/// future, so be sure that you are generating valid HTML when using this
-/// function.
-///
-/// Normally, Typst will generate `html`, `head`, and `body` tags for you. If
-/// you instead create them with this function, Typst will omit its own tags.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 ///
 /// ```typ
 /// #html.elem("div", attrs: (style: "background: aqua"))[
@@ -76,7 +58,6 @@ pub fn module() -> Module {
 /// ```
 #[elem(name = "elem")]
 pub struct HtmlElem {
-<<<<<<< HEAD
     /// 要素のタグ。
     #[required]
     pub tag: HtmlTag,
@@ -87,18 +68,6 @@ pub struct HtmlElem {
     /// HTML要素の内容。
     ///
     /// 本文には任意のTypstコンテンツを指定できます。
-=======
-    /// The element's tag.
-    #[required]
-    pub tag: HtmlTag,
-
-    /// The element's HTML attributes.
-    pub attrs: HtmlAttrs,
-
-    /// The contents of the HTML element.
-    ///
-    /// The body can be arbitrary Typst content.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     #[positional]
     pub body: Option<Content>,
 
@@ -107,7 +76,6 @@ pub struct HtmlElem {
     #[synthesized]
     pub parent: Location,
 
-<<<<<<< HEAD
     /// 役割は、最上位のスタイル設定されたHTML要素に適用されるべきですが、
     /// その子孫には適用されません。スタイルセットルールが今後追加されて、
     /// サブツリーではなく特定の要素に適用される場合は、
@@ -120,19 +88,6 @@ pub struct HtmlElem {
     /// 意図せずに付与されてしまう傾向があります。
     /// これは多少のハックですが、`role`プロパティは純粋に内部的なものであり、
     /// その使用方法は私たちが制御しているため、十分です。
-=======
-    /// A role that should be applied to the top-level styled HTML element, but
-    /// not its descendants. If we ever get set rules that apply to a specific
-    /// element instead of a subtree, they could supplant this. If we need the
-    /// same mechanism for things like `class`, this could potentially also be
-    /// extended to arbitrary attributes. It's minimal for now.
-    ///
-    /// This is ignored for `<p>` elements as it otherwise tends to
-    /// unintentionally attach to paragraphs resulting from grouping of a single
-    /// element instead of attaching to that element. This is a bit of a hack,
-    /// but good enough for now as the `role` property is purely internal and
-    /// we control what it is used for.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     #[internal]
     #[ghost]
     pub role: Option<EcoString>,
@@ -173,7 +128,6 @@ impl HtmlElem {
     }
 }
 
-<<<<<<< HEAD
 /// コンテンツをインラインSVGとしてレイアウトする要素。
 ///
 /// TypstのコンテンツにはHTMLへの変換に不適切なものがあります。
@@ -186,21 +140,6 @@ impl HtmlElem {
 #[elem]
 pub struct FrameElem {
     /// レイアウト対象のコンテンツ。
-=======
-/// An element that lays out its content as an inline SVG.
-///
-/// Sometimes, converting Typst content to HTML is not desirable. This can be
-/// the case for plots and other content that relies on positioning and styling
-/// to convey its message.
-///
-/// This function allows you to use the Typst layout engine that would also be
-/// used for PDF, SVG, and PNG export to render a part of your document exactly
-/// how it would appear when exported in one of these formats. It embeds the
-/// content as an inline SVG.
-#[elem]
-pub struct FrameElem {
-    /// The content that shall be laid out.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     #[positional]
     #[required]
     pub body: Content,
diff --git a/crates/typst-html/src/rules.rs b/crates/typst-html/src/rules.rs
index 3ef2aa0442..06dd0584b1 100644
--- a/crates/typst-html/src/rules.rs
+++ b/crates/typst-html/src/rules.rs
@@ -8,11 +8,7 @@ use typst_library::foundations::{
     Content, Context, NativeElement, NativeRuleMap, ShowFn, Smart, StyleChain, Target,
 };
 use typst_library::introspection::Counter;
-<<<<<<< HEAD
-use typst_library::layout::resolve::{Cell, CellGrid, Entry};
-=======
 use typst_library::layout::resolve::{Cell, CellGrid, Entry, Header};
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 use typst_library::layout::{
     BlockBody, BlockElem, BoxElem, HElem, OuterVAlignment, Sizing,
 };
@@ -567,12 +563,6 @@ fn show_cellgrid(grid: &CellGrid, styles: StyleChain) -> Content {
     // TODO(subfooters): similarly to headers, take consecutive footers from
     // the end for 'tfoot'.
     let footer = grid.footer.as_ref().map(|ft| {
-<<<<<<< HEAD
-        let rows = rows.drain(ft.start..);
-        elem(tag::tfoot, Content::sequence(rows.map(|row| tr(tag::td, row))))
-    });
-
-=======
         // Convert from gutter to non-gutter coordinates. Use ceil as it might
         // include the previous gutter row
         // (cf. typst-library/layout/grid/resolve.rs).
@@ -592,7 +582,6 @@ fn show_cellgrid(grid: &CellGrid, styles: StyleChain) -> Content {
         }
     };
 
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     // Store all consecutive headers at the start in 'thead'. All remaining
     // headers are just 'th' rows across the table body.
     let mut consecutive_header_end = 0;
@@ -600,25 +589,16 @@ fn show_cellgrid(grid: &CellGrid, styles: StyleChain) -> Content {
         .headers
         .iter()
         .take_while(|hd| {
-<<<<<<< HEAD
-            let is_consecutive = hd.range.start == consecutive_header_end;
-            consecutive_header_end = hd.range.end;
-=======
             let range = header_range(hd);
             let is_consecutive = range.start == consecutive_header_end;
             consecutive_header_end = range.end;
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
             is_consecutive
         })
         .count();
 
     let (y_offset, header) = if first_mid_table_header > 0 {
         let removed_header_rows =
-<<<<<<< HEAD
-            grid.headers.get(first_mid_table_header - 1).unwrap().range.end;
-=======
             header_range(grid.headers.get(first_mid_table_header - 1).unwrap()).end;
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
         let rows = rows.drain(..removed_header_rows);
 
         (
@@ -637,18 +617,11 @@ fn show_cellgrid(grid: &CellGrid, styles: StyleChain) -> Content {
     let mut body =
         Content::sequence(rows.into_iter().enumerate().map(|(relative_y, row)| {
             let y = relative_y + y_offset;
-<<<<<<< HEAD
-            if let Some(current_header) =
-                grid.headers.get(next_header).filter(|h| h.range.contains(&y))
-            {
-                if y + 1 == current_header.range.end {
-=======
             if let Some(current_header_range) =
                 grid.headers.get(next_header).map(|h| header_range(h))
                 && current_header_range.contains(&y)
             {
                 if y + 1 == current_header_range.end {
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
                     next_header += 1;
                 }
 
diff --git a/crates/typst-layout/src/inline/line.rs b/crates/typst-layout/src/inline/line.rs
index 8850d304c6..f4d93517f1 100644
--- a/crates/typst-layout/src/inline/line.rs
+++ b/crates/typst-layout/src/inline/line.rs
@@ -222,15 +222,9 @@ fn collect_items<'a>(
 
     // Add fallback text to expand the line height, if necessary.
     if !items.iter().any(|item| matches!(item, Item::Text(_)))
-<<<<<<< HEAD
-        && let Some(fallback) = fallback
-    {
-        items.push(fallback, LogicalIndex::FALLBACK_TEXT);
-=======
         && let Some((idx, fallback)) = fallback
     {
         items.push(fallback, idx);
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     }
 }
 
@@ -293,11 +287,7 @@ fn collect_range<'a>(
     range: Range,
     trim: &Trim,
     items: &mut Items<'a>,
-<<<<<<< HEAD
-    fallback: &mut Option<ItemEntry<'a>>,
-=======
     fallback: &mut Option<(LogicalIndex, ItemEntry<'a>)>,
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 ) {
     for (i, (subrange, item)) in p.slice(range.clone()) {
         let idx = LogicalIndex::from_item_index(i);
@@ -320,11 +310,7 @@ fn collect_range<'a>(
             // When there is no text, still keep this as a fallback item, which
             // we can use to force a non-zero line-height when the line doesn't
             // contain any other text.
-<<<<<<< HEAD
-            *fallback = Some(ItemEntry::from(Item::Text(shaped.empty())));
-=======
             *fallback = Some((idx, ItemEntry::from(Item::Text(shaped.empty()))));
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
             continue;
         }
 
@@ -796,10 +782,6 @@ pub struct LogicalIndex(usize);
 
 impl LogicalIndex {
     const START_HYPHEN: Self = Self(0);
-<<<<<<< HEAD
-    const FALLBACK_TEXT: Self = Self(usize::MAX - 1);
-=======
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     const END_HYPHEN: Self = Self(usize::MAX);
 
     /// Create a logical index from the index of an item in the [`p.items`](Preparation::items).
diff --git a/crates/typst-layout/src/inline/shaping.rs b/crates/typst-layout/src/inline/shaping.rs
index 4fc42a4e6f..7346c54d85 100644
--- a/crates/typst-layout/src/inline/shaping.rs
+++ b/crates/typst-layout/src/inline/shaping.rs
@@ -1100,19 +1100,6 @@ fn determine_shift(
             // "subs"/"sups" to the feature list if supported by the font.
             // In case of a problem, we just early exit
             let gsub = font.rusty().tables().gsub?;
-<<<<<<< HEAD
-            let subtable_index =
-                gsub.features.find(settings.kind.feature())?.lookup_indices.get(0)?;
-            let coverage = gsub
-                .lookups
-                .get(subtable_index)?
-                .subtables
-                .get::<SubstitutionSubtable>(0)?
-                .coverage();
-            text.chars()
-                .all(|c| {
-                    font.rusty().glyph_index(c).is_some_and(|i| coverage.contains(i))
-=======
             let lookups = gsub.features.find(settings.kind.feature())?.lookup_indices;
             text.chars()
                 .all(|c| {
@@ -1124,7 +1111,6 @@ fn determine_shift(
                             lookup.subtables.into_iter::<SubstitutionSubtable>()
                         })
                         .any(|subtable| subtable.coverage().contains(i))
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
                 })
                 .then(|| {
                     // If we can use the OpenType feature, we can keep the text
diff --git a/crates/typst-layout/src/math/fragment.rs b/crates/typst-layout/src/math/fragment.rs
index 6751c1dc64..43be9ca82a 100644
--- a/crates/typst-layout/src/math/fragment.rs
+++ b/crates/typst-layout/src/math/fragment.rs
@@ -839,9 +839,6 @@ fn assemble(
     }
 
     match axis {
-<<<<<<< HEAD
-        Axis::X => base.size.x = full,
-=======
         Axis::X => {
             base.size.x = full;
             let (ascent, descent) = glyphs
@@ -852,7 +849,6 @@ fn assemble(
             base.baseline = Some(ascent.at(base.item.size));
             base.size.y = (ascent + descent).at(base.item.size);
         }
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
         Axis::Y => {
             base.baseline = None;
             base.size.y = full;
diff --git a/crates/typst-layout/src/math/mat.rs b/crates/typst-layout/src/math/mat.rs
index d623329305..92e7316288 100644
--- a/crates/typst-layout/src/math/mat.rs
+++ b/crates/typst-layout/src/math/mat.rs
@@ -7,10 +7,7 @@ use typst_library::math::{Augment, AugmentOffsets, CasesElem, MatElem, VecElem};
 use typst_library::text::TextElem;
 use typst_library::visualize::{FillRule, FixedStroke, Geometry, LineCap, Shape};
 use typst_syntax::Span;
-<<<<<<< HEAD
-=======
 use unicode_math_class::MathClass;
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 
 use super::{
     AlignmentResult, DELIM_SHORT_FALL, FrameFragment, GlyphFragment, LeftRightAlternator,
@@ -352,10 +349,7 @@ fn layout_delimiters(
             ctx.layout_into_fragment(&SymbolElem::packed(left_c).spanned(span), styles)?;
         left.stretch_vertical(ctx, target, short_fall);
         left.center_on_axis();
-<<<<<<< HEAD
-=======
         left.set_class(MathClass::Opening);
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
         ctx.push(left);
     }
 
@@ -366,10 +360,7 @@ fn layout_delimiters(
             ctx.layout_into_fragment(&SymbolElem::packed(right_c).spanned(span), styles)?;
         right.stretch_vertical(ctx, target, short_fall);
         right.center_on_axis();
-<<<<<<< HEAD
-=======
         right.set_class(MathClass::Closing);
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
         ctx.push(right);
     }
 
diff --git a/crates/typst-layout/src/math/text.rs b/crates/typst-layout/src/math/text.rs
index 62913456fc..66a718c4ca 100644
--- a/crates/typst-layout/src/math/text.rs
+++ b/crates/typst-layout/src/math/text.rs
@@ -97,11 +97,6 @@ fn layout_inline_text(
             .chars()
             .flat_map(|c| to_style(c, MathStyle::select(c, variant, bold, italic)))
             .collect();
-<<<<<<< HEAD
-
-        let spaced = styled_text.graphemes(true).nth(1).is_some();
-=======
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
         let elem = TextElem::packed(styled_text).spanned(span);
 
         // There isn't a natural width for a paragraph in a math environment;
@@ -121,11 +116,7 @@ fn layout_inline_text(
         Ok(FrameFragment::new(styles, frame)
             .with_class(MathClass::Alphabetic)
             .with_text_like(true)
-<<<<<<< HEAD
-            .with_spaced(spaced))
-=======
             .with_spaced(true))
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     }
 }
 
diff --git a/crates/typst-library/src/diag.rs b/crates/typst-library/src/diag.rs
index 0e61342188..fe9026f348 100644
--- a/crates/typst-library/src/diag.rs
+++ b/crates/typst-library/src/diag.rs
@@ -1,9 +1,6 @@
 //! Diagnostics.
 
-<<<<<<< HEAD
-=======
 use std::backtrace::{Backtrace, BacktraceStatus};
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 use std::fmt::{self, Display, Formatter, Write as _};
 use std::io;
 use std::path::{Path, PathBuf};
@@ -872,8 +869,6 @@ pub fn format_xml_like_error(format: &str, error: roxmltree::Error) -> LoadError
 
     LoadError { pos: pos.into(), message }
 }
-<<<<<<< HEAD
-=======
 
 /// Asserts a condition, generating an internal compiler error with the provided
 /// message on failure.
@@ -926,4 +921,3 @@ fn internal_error(msg: &str) -> HintedString {
 
     error
 }
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
diff --git a/crates/typst-library/src/foundations/args.rs b/crates/typst-library/src/foundations/args.rs
index 0d10a62865..7928830cac 100644
--- a/crates/typst-library/src/foundations/args.rs
+++ b/crates/typst-library/src/foundations/args.rs
@@ -9,21 +9,11 @@ use crate::foundations::{
     Array, Dict, FromValue, IntoValue, Repr, Str, Value, cast, func, repr, scope, ty,
 };
 
-<<<<<<< HEAD
 /// 関数に渡された引数。
 ///
 /// # 引数シンク
 /// 組み込み関数と同様に、カスタム関数も可変長引数を受け取れます。
 /// 余分にある引数を全てまとめて受け取る_引数シンク_（キッチンシンクのようにさまざまなものが流れ込む先）は、`..sink`の形で指定できます。このとき生成される`sink`の値は`arguments`型になります。この型は、位置引数と名前付き引数の両方にアクセスするためのメソッドを提供しています。
-=======
-/// Captured arguments to a function.
-///
-/// # Argument Sinks
-/// Like built-in functions, custom functions can also take a variable number of
-/// arguments. You can specify an _argument sink_ which collects all excess
-/// arguments as `..sink`. The resulting `sink` value is of the `arguments`
-/// type. It exposes methods to access the positional and named arguments.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 ///
 /// ```example
 /// #let format(title, ..authors) = {
@@ -37,14 +27,8 @@ use crate::foundations::{
 /// #format("ArtosFlow", "Jane", "Joe")
 /// ```
 ///
-<<<<<<< HEAD
 /// # 引数の展開
 /// 引数シンクとは逆に、`..spread`演算子を使うと、関数呼び出しにおいて引数や配列、辞書を展開して渡せます。
-=======
-/// # Spreading
-/// Inversely to an argument sink, you can _spread_ arguments, arrays and
-/// dictionaries into a function call with the `..spread` operator:
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 ///
 /// ```example
 /// #let array = (2, 3, 5)
@@ -56,23 +40,14 @@ use crate::foundations::{
 #[derive(Clone, Hash)]
 #[allow(clippy::derived_hash_with_manual_eq)]
 pub struct Args {
-<<<<<<< HEAD
     /// 関数呼び出し箇所のスパン。これは引数リスト自体のスパンではなく、関数呼び出し全体のものです。
-=======
-    /// The callsite span for the function. This is not the span of the argument
-    /// list itself, but of the whole function call.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     pub span: Span,
     /// The positional and named arguments.
     pub items: EcoVec<Arg>,
 }
 
 impl Args {
-<<<<<<< HEAD
     /// スパンと値から位置引数を作成します。
-=======
-    /// Create positional arguments from a span and values.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     pub fn new<T: IntoValue>(span: Span, values: impl IntoIterator<Item = T>) -> Self {
         let items = values
             .into_iter()
@@ -85,11 +60,7 @@ impl Args {
         Self { span, items }
     }
 
-<<<<<<< HEAD
     /// 引数にスパンがアタッチされていない場合はアタッチします。
-=======
-    /// Attach a span to these arguments if they don't already have one.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     pub fn spanned(mut self, span: Span) -> Self {
         if self.span.is_detached() {
             self.span = span;
@@ -97,20 +68,12 @@ impl Args {
         self
     }
 
-<<<<<<< HEAD
     /// 残りの位置引数の個数を返します。
-=======
-    /// Returns the number of remaining positional arguments.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     pub fn remaining(&self) -> usize {
         self.items.iter().filter(|slot| slot.name.is_none()).count()
     }
 
-<<<<<<< HEAD
     /// 指定したインデックスに位置引数を挿入します。
-=======
-    /// Insert a positional argument at a specific index.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     pub fn insert(&mut self, index: usize, span: Span, value: Value) {
         self.items.insert(
             index,
@@ -122,11 +85,7 @@ impl Args {
         )
     }
 
-<<<<<<< HEAD
     /// 位置引数をプッシュします。
-=======
-    /// Push a positional argument.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     pub fn push(&mut self, span: Span, value: Value) {
         self.items.push(Arg {
             span: self.span,
@@ -135,11 +94,7 @@ impl Args {
         })
     }
 
-<<<<<<< HEAD
     /// 最初の位置引数がある場合、それを取り出してキャストします。
-=======
-    /// Consume and cast the first positional argument if there is one.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     pub fn eat<T>(&mut self) -> SourceResult<Option<T>>
     where
         T: FromValue<Spanned<Value>>,
@@ -154,11 +109,7 @@ impl Args {
         Ok(None)
     }
 
-<<<<<<< HEAD
     /// 可能ならn個の位置引数を取り出します。
-=======
-    /// Consume n positional arguments if possible.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     pub fn consume(&mut self, n: usize) -> SourceResult<Vec<Arg>> {
         let mut list = vec![];
 
@@ -178,16 +129,9 @@ impl Args {
         Ok(list)
     }
 
-<<<<<<< HEAD
     /// 最初の位置引数を取り出してキャストします。
     ///
     /// 位置引数が残っていなければ、`missing argument: {what}`エラーを返します。
-=======
-    /// Consume and cast the first positional argument.
-    ///
-    /// Returns a `missing argument: {what}` error if no positional argument is
-    /// left.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     pub fn expect<T>(&mut self, what: &str) -> SourceResult<T>
     where
         T: FromValue<Spanned<Value>>,
@@ -198,11 +142,7 @@ impl Args {
         }
     }
 
-<<<<<<< HEAD
     /// 引数が足りない場合のエラーメッセージ。
-=======
-    /// The error message for missing arguments.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     fn missing_argument(&self, what: &str) -> SourceDiagnostic {
         for item in &self.items {
             let Some(name) = item.name.as_deref() else { continue };
@@ -350,15 +290,9 @@ impl Args {
 
 #[scope]
 impl Args {
-<<<<<<< HEAD
     /// 展開可能な引数をその場で生成します。
     ///
     /// この関数は、`{let args(..sink) = sink}`のように動作します。
-=======
-    /// Construct spreadable arguments in place.
-    ///
-    /// This function behaves like `{let args(..sink) = sink}`.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     ///
     /// ```example
     /// #let args = arguments(stroke: red, inset: 1em, [Body])
@@ -367,11 +301,7 @@ impl Args {
     #[func(constructor)]
     pub fn construct(
         args: &mut Args,
-<<<<<<< HEAD
         /// 作成する引数。
-=======
-        /// The arguments to construct.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
         #[external]
         #[variadic]
         arguments: Vec<Value>,
@@ -379,7 +309,6 @@ impl Args {
         args.take()
     }
 
-<<<<<<< HEAD
     /// 指定したインデックスの位置引数、または指定した名前の名前付き引数を返します。
     ///
     /// キーが[整数型]($int)の場合、それはまず[`pos`]($arguments.pos)メソッドを呼んでから、次に[`array.at`]を呼ぶのと同等です。キーが[文字列型]($str)である場合、まず[`named`]($arguments.named)メソッドを呼び、次に[`dictionary.at`]を呼ぶのと同等です。
@@ -389,21 +318,6 @@ impl Args {
         /// 取得する引数のインデックスまたは名前。
         key: ArgumentKey,
         /// キーが無効な場合に返すデフォルト値。
-=======
-    /// Returns the positional argument at the specified index, or the named
-    /// argument with the specified name.
-    ///
-    /// If the key is an [integer]($int), this is equivalent to first calling
-    /// [`pos`]($arguments.pos) and then [`array.at`]. If it is a [string]($str),
-    /// this is equivalent to first calling [`named`]($arguments.named) and then
-    /// [`dictionary.at`].
-    #[func]
-    pub fn at(
-        &self,
-        /// The index or name of the argument to get.
-        key: ArgumentKey,
-        /// A default value to return if the key is invalid.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
         #[named]
         default: Option<Value>,
     ) -> StrResult<Value> {
@@ -413,11 +327,7 @@ impl Args {
             .ok_or_else(|| missing_key_no_default(key))
     }
 
-<<<<<<< HEAD
     /// 渡された位置引数を配列の形で返します。
-=======
-    /// Returns the captured positional arguments as an array.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     #[func(name = "pos", title = "Positional")]
     pub fn to_pos(&self) -> Array {
         self.items
@@ -427,11 +337,7 @@ impl Args {
             .collect()
     }
 
-<<<<<<< HEAD
     /// 渡された名前付き引数を辞書の形で返します。
-=======
-    /// Returns the captured named arguments as a dictionary.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     #[func(name = "named")]
     pub fn to_named(&self) -> Dict {
         self.items
diff --git a/crates/typst-library/src/foundations/array.rs b/crates/typst-library/src/foundations/array.rs
index 105342915d..0c2e2f5326 100644
--- a/crates/typst-library/src/foundations/array.rs
+++ b/crates/typst-library/src/foundations/array.rs
@@ -720,10 +720,7 @@ impl Array {
         last: Option<Value>,
         /// What to return if the array is empty.
         #[named]
-<<<<<<< HEAD
-=======
         #[default]
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
         default: Option<Value>,
     ) -> StrResult<Value> {
         let len = self.0.len();
@@ -894,13 +891,10 @@ impl Array {
         #[named]
         by: Option<Func>,
     ) -> SourceResult<Array> {
-<<<<<<< HEAD
-=======
         // We use `glidesort` instead of the standard library sorting algorithm
         // to prevent panics in case the comparison function does not define a
         // valid order (see https://github.com/typst/typst/pull/5627 and
         // https://github.com/typst/typst/issues/6285).
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
         match by {
             Some(by) => {
                 let mut are_in_order = |mut x, mut y| {
@@ -921,14 +915,7 @@ impl Array {
                         }
                     }
                 };
-<<<<<<< HEAD
-                // If a comparison function is provided, we use `glidesort`
-                // instead of the standard library sorting algorithm to prevent
-                // panics in case the comparison function does not define a
-                // valid order (see https://github.com/typst/typst/pull/5627).
-=======
-
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
+
                 let mut result = Ok(());
                 let mut vec = self.0.into_iter().enumerate().collect::<Vec<_>>();
                 glidesort::sort_by(&mut vec, |(i, x), (j, y)| {
@@ -981,19 +968,10 @@ impl Array {
                     Some(f) => f.call(engine, context, [x]),
                     None => Ok(x),
                 };
-<<<<<<< HEAD
-                // If no comparison function is provided, we know the order is
-                // valid, so we can use the standard library sort and prevent an
-                // extra allocation.
-                let mut result = Ok(());
-                let mut vec = self.0;
-                vec.make_mut().sort_by(|a, b| {
-=======
 
                 let mut result = Ok(());
                 let mut vec = self.0;
                 glidesort::sort_by(vec.make_mut(), |a, b| {
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
                     match (key_of(a.clone()), key_of(b.clone())) {
                         (Ok(a), Ok(b)) => ops::compare(&a, &b).unwrap_or_else(|err| {
                             if result.is_ok() {
diff --git a/crates/typst-library/src/foundations/calc.rs b/crates/typst-library/src/foundations/calc.rs
index 9f52cfbb92..e7a5955eff 100644
--- a/crates/typst-library/src/foundations/calc.rs
+++ b/crates/typst-library/src/foundations/calc.rs
@@ -58,11 +58,7 @@ pub fn module() -> Module {
     Module::new("calc", scope)
 }
 
-<<<<<<< HEAD
 /// 絶対値。
-=======
-/// Calculates the absolute value of a numeric value.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 ///
 /// ```example
 /// #calc.abs(-5) \
@@ -72,11 +68,7 @@ pub fn module() -> Module {
 /// ```
 #[func(title = "Absolute")]
 pub fn abs(
-<<<<<<< HEAD
     /// 絶対値を計算する値。
-=======
-    /// The value whose absolute value to calculate.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     value: ToAbs,
 ) -> Value {
     value.0
@@ -97,11 +89,7 @@ cast! {
     v: Decimal => Self(Value::Decimal(v.abs()))
 }
 
-<<<<<<< HEAD
 /// 冪乗。
-=======
-/// Raises a value to some exponent.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 ///
 /// ```example
 /// #calc.pow(2, 3) \
@@ -110,19 +98,11 @@ cast! {
 #[func(title = "Power")]
 pub fn pow(
     span: Span,
-<<<<<<< HEAD
     /// 冪乗の底（てい）。
     ///
     /// 値が[`decimal`]の場合、指数は[整数]($int)でなければなりません。
     base: DecNum,
     /// 冪乗の指数。
-=======
-    /// The base of the power.
-    ///
-    /// If this is a [`decimal`], the exponent can only be an [integer]($int).
-    base: DecNum,
-    /// The exponent of the power.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     exponent: Spanned<Num>,
 ) -> SourceResult<DecNum> {
     match exponent.v {
@@ -171,11 +151,7 @@ pub fn pow(
     }
 }
 
-<<<<<<< HEAD
 /// eの冪乗。
-=======
-/// Raises a value to some exponent of e.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 ///
 /// ```example
 /// #calc.exp(1)
@@ -183,11 +159,7 @@ pub fn pow(
 #[func(title = "Exponential")]
 pub fn exp(
     span: Span,
-<<<<<<< HEAD
     /// 冪乗の指数。
-=======
-    /// The exponent of the power.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     exponent: Spanned<Num>,
 ) -> SourceResult<f64> {
     match exponent.v {
@@ -208,11 +180,7 @@ pub fn exp(
     Ok(result)
 }
 
-<<<<<<< HEAD
 /// 平方根。
-=======
-/// Calculates the square root of a number.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 ///
 /// ```example
 /// #calc.sqrt(16) \
@@ -220,11 +188,7 @@ pub fn exp(
 /// ```
 #[func(title = "Square Root")]
 pub fn sqrt(
-<<<<<<< HEAD
     /// 平方根を計算する数値。負の値は取れません。
-=======
-    /// The number whose square root to calculate. Must be non-negative.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     value: Spanned<Num>,
 ) -> SourceResult<f64> {
     if value.v.float() < 0.0 {
@@ -233,15 +197,9 @@ pub fn sqrt(
     Ok(value.v.float().sqrt())
 }
 
-<<<<<<< HEAD
 /// n乗根。
 ///
 /// 負の値の場合、nは奇数でなければなりません。
-=======
-/// Calculates the real nth root of a number.
-///
-/// If the number is negative, then n must be odd.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 ///
 /// ```example
 /// #calc.root(16.0, 4) \
@@ -249,15 +207,9 @@ pub fn sqrt(
 /// ```
 #[func]
 pub fn root(
-<<<<<<< HEAD
     /// 根を取る対象の式。
     radicand: f64,
     /// 被開方数の何乗根を取るか。
-=======
-    /// The expression to take the root of.
-    radicand: f64,
-    /// Which root of the radicand to take.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     index: Spanned<i64>,
 ) -> SourceResult<f64> {
     if index.v == 0 {
@@ -276,16 +228,9 @@ pub fn root(
     }
 }
 
-<<<<<<< HEAD
 /// サイン（正弦）の計算。
 ///
 /// 整数または浮動小数点数で呼び出された場合、それらはラジアンとして解釈されます。
-=======
-/// Calculates the sine of an angle.
-///
-/// When called with an integer or a float, they will be interpreted as
-/// radians.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 ///
 /// ```example
 /// #calc.sin(1.5) \
@@ -293,11 +238,7 @@ pub fn root(
 /// ```
 #[func(title = "Sine")]
 pub fn sin(
-<<<<<<< HEAD
     /// サインを計算する角度。
-=======
-    /// The angle whose sine to calculate.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     angle: AngleLike,
 ) -> f64 {
     match angle {
@@ -307,16 +248,9 @@ pub fn sin(
     }
 }
 
-<<<<<<< HEAD
 /// コサイン（余弦）の計算。
 ///
 /// 整数または浮動小数点数で呼び出された場合、それらはラジアンとして解釈されます。
-=======
-/// Calculates the cosine of an angle.
-///
-/// When called with an integer or a float, they will be interpreted as
-/// radians.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 ///
 /// ```example
 /// #calc.cos(1.5) \
@@ -324,11 +258,7 @@ pub fn sin(
 /// ```
 #[func(title = "Cosine")]
 pub fn cos(
-<<<<<<< HEAD
     /// コサインを計算する角度。
-=======
-    /// The angle whose cosine to calculate.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     angle: AngleLike,
 ) -> f64 {
     match angle {
@@ -338,16 +268,9 @@ pub fn cos(
     }
 }
 
-<<<<<<< HEAD
 /// タンジェント（正接）の計算。
 ///
 /// 整数または浮動小数点数に対して呼び出された場合、それらはラジアンとして解釈されます。
-=======
-/// Calculates the tangent of an angle.
-///
-/// When called with an integer or a float, they will be interpreted as
-/// radians.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 ///
 /// ```example
 /// #calc.tan(1.5) \
@@ -355,11 +278,7 @@ pub fn cos(
 /// ```
 #[func(title = "Tangent")]
 pub fn tan(
-<<<<<<< HEAD
     /// タンジェントを計算する角度。
-=======
-    /// The angle whose tangent to calculate.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     angle: AngleLike,
 ) -> f64 {
     match angle {
@@ -369,11 +288,7 @@ pub fn tan(
     }
 }
 
-<<<<<<< HEAD
 /// アークサイン（逆正弦）の計算。
-=======
-/// Calculates the arcsine of a number.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 ///
 /// ```example
 /// #calc.asin(0) \
@@ -381,11 +296,7 @@ pub fn tan(
 /// ```
 #[func(title = "Arcsine")]
 pub fn asin(
-<<<<<<< HEAD
     /// アークサインを計算する値。値は-1から1の間でなければなりません。
-=======
-    /// The number whose arcsine to calculate. Must be between -1 and 1.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     value: Spanned<Num>,
 ) -> SourceResult<Angle> {
     let val = value.v.float();
@@ -395,11 +306,7 @@ pub fn asin(
     Ok(Angle::rad(val.asin()))
 }
 
-<<<<<<< HEAD
 /// アークコサイン（逆余弦）の計算。
-=======
-/// Calculates the arccosine of a number.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 ///
 /// ```example
 /// #calc.acos(0) \
@@ -407,11 +314,7 @@ pub fn asin(
 /// ```
 #[func(title = "Arccosine")]
 pub fn acos(
-<<<<<<< HEAD
     /// アークコサインを計算する値。値は-1から1の間でなければなりません。
-=======
-    /// The number whose arccosine to calculate. Must be between -1 and 1.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     value: Spanned<Num>,
 ) -> SourceResult<Angle> {
     let val = value.v.float();
@@ -421,11 +324,7 @@ pub fn acos(
     Ok(Angle::rad(val.acos()))
 }
 
-<<<<<<< HEAD
 /// アークタンジェント（逆正接）の計算。
-=======
-/// Calculates the arctangent of a number.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 ///
 /// ```example
 /// #calc.atan(0) \
@@ -433,25 +332,15 @@ pub fn acos(
 /// ```
 #[func(title = "Arctangent")]
 pub fn atan(
-<<<<<<< HEAD
     /// アークタンジェントを計算する値。
-=======
-    /// The number whose arctangent to calculate.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     value: Num,
 ) -> Angle {
     Angle::rad(value.float().atan())
 }
 
-<<<<<<< HEAD
 /// 四象限アークタンジェントの計算。
 ///
 /// 引数の順序は`(y, x)`ではなく`(x, y)`です。
-=======
-/// Calculates the four-quadrant arctangent of a coordinate.
-///
-/// The arguments are `(x, y)`, not `(y, x)`.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 ///
 /// ```example
 /// #calc.atan2(1, 1) \
@@ -459,25 +348,15 @@ pub fn atan(
 /// ```
 #[func(title = "Four-quadrant Arctangent")]
 pub fn atan2(
-<<<<<<< HEAD
     /// X座標。
     x: Num,
     /// Y座標。
-=======
-    /// The X coordinate.
-    x: Num,
-    /// The Y coordinate.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     y: Num,
 ) -> Angle {
     Angle::rad(f64::atan2(y.float(), x.float()))
 }
 
-<<<<<<< HEAD
 /// ハイパーボリックサイン（双曲線正弦）を計算。
-=======
-/// Calculates the hyperbolic sine of a hyperbolic angle.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 ///
 /// ```example
 /// #calc.sinh(0) \
@@ -485,21 +364,13 @@ pub fn atan2(
 /// ```
 #[func(title = "Hyperbolic Sine")]
 pub fn sinh(
-<<<<<<< HEAD
     /// ハイパーボリックサインを計算する双曲角。
-=======
-    /// The hyperbolic angle whose hyperbolic sine to calculate.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     value: f64,
 ) -> f64 {
     value.sinh()
 }
 
-<<<<<<< HEAD
 /// ハイパーボリックコサイン（双曲線余弦）を計算。
-=======
-/// Calculates the hyperbolic cosine of a hyperbolic angle.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 ///
 /// ```example
 /// #calc.cosh(0) \
@@ -507,21 +378,13 @@ pub fn sinh(
 /// ```
 #[func(title = "Hyperbolic Cosine")]
 pub fn cosh(
-<<<<<<< HEAD
     /// ハイパーボリックコサインを計算する双曲角。
-=======
-    /// The hyperbolic angle whose hyperbolic cosine to calculate.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     value: f64,
 ) -> f64 {
     value.cosh()
 }
 
-<<<<<<< HEAD
 /// ハイパーボリックタンジェント（双曲線正接）を計算。
-=======
-/// Calculates the hyperbolic tangent of a hyperbolic angle.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 ///
 /// ```example
 /// #calc.tanh(0) \
@@ -529,25 +392,15 @@ pub fn cosh(
 /// ```
 #[func(title = "Hyperbolic Tangent")]
 pub fn tanh(
-<<<<<<< HEAD
     /// ハイパーボリックタンジェントを計算する双曲角。
-=======
-    /// The hyperbolic angle whose hyperbolic tangent to calculate.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     value: f64,
 ) -> f64 {
     value.tanh()
 }
 
-<<<<<<< HEAD
 /// 数値の対数。
 ///
 /// 底（てい）が指定されていない場合、対数は10を底として計算されます。
-=======
-/// Calculates the logarithm of a number.
-///
-/// If the base is not specified, the logarithm is calculated in base 10.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 ///
 /// ```example
 /// #calc.log(100)
@@ -555,15 +408,9 @@ pub fn tanh(
 #[func(title = "Logarithm")]
 pub fn log(
     span: Span,
-<<<<<<< HEAD
     /// 対数を計算する数値。正の値（0を除く）である必要があります。
     value: Spanned<Num>,
     /// 対数の底（てい）。ゼロであってはなりません。
-=======
-    /// The number whose logarithm to calculate. Must be strictly positive.
-    value: Spanned<Num>,
-    /// The base of the logarithm. May not be zero.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     #[named]
     #[default(Spanned::new(10.0, Span::detached()))]
     base: Spanned<f64>,
@@ -594,11 +441,7 @@ pub fn log(
     Ok(result)
 }
 
-<<<<<<< HEAD
 /// 数値の自然対数。
-=======
-/// Calculates the natural logarithm of a number.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 ///
 /// ```example
 /// #calc.ln(calc.e)
@@ -606,11 +449,7 @@ pub fn log(
 #[func(title = "Natural Logarithm")]
 pub fn ln(
     span: Span,
-<<<<<<< HEAD
     /// 対数を計算する数値。正の値（0を除く）である必要があります。
-=======
-    /// The number whose logarithm to calculate. Must be strictly positive.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     value: Spanned<Num>,
 ) -> SourceResult<f64> {
     let number = value.v.float();
@@ -626,37 +465,22 @@ pub fn ln(
     Ok(result)
 }
 
-<<<<<<< HEAD
 /// 数値の階乗。
-=======
-/// Calculates the factorial of a number.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 ///
 /// ```example
 /// #calc.fact(5)
 /// ```
 #[func(title = "Factorial")]
 pub fn fact(
-<<<<<<< HEAD
     /// 階乗を計算する数値。0または正の値である必要があります。
-=======
-    /// The number whose factorial to calculate. Must be non-negative.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     number: u64,
 ) -> StrResult<i64> {
     Ok(fact_impl(1, number).ok_or_else(too_large)?)
 }
 
-<<<<<<< HEAD
 /// 順列の計算。
 ///
 /// 順列、つまり、`n`個の項目から`k`個を、順序を区別して選択する組み合わせの数を返します。
-=======
-/// Calculates a permutation.
-///
-/// Returns the `k`-permutation of `n`, or the number of ways to choose `k`
-/// items from a set of `n` with regard to order.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 ///
 /// ```example
 /// $ "perm"(n, k) &= n!/((n - k)!) \
@@ -664,15 +488,9 @@ pub fn fact(
 /// ```
 #[func(title = "Permutation")]
 pub fn perm(
-<<<<<<< HEAD
     /// 基数。0または正の値である必要があります。
     base: u64,
     /// 順列の数。0または正の値である必要があります。
-=======
-    /// The base number. Must be non-negative.
-    base: u64,
-    /// The number of permutations. Must be non-negative.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     numbers: u64,
 ) -> StrResult<i64> {
     // By convention.
@@ -700,31 +518,18 @@ fn fact_impl(start: u64, end: u64) -> Option<i64> {
     count.try_into().ok()
 }
 
-<<<<<<< HEAD
 /// 二項係数の計算。
 ///
 /// `n`個の項目から`k`個を順序を区別せず選択する組み合わせの数を返します。
-=======
-/// Calculates a binomial coefficient.
-///
-/// Returns the `k`-combination of `n`, or the number of ways to choose `k`
-/// items from a set of `n` without regard to order.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 ///
 /// ```example
 /// #calc.binom(10, 5)
 /// ```
 #[func(title = "Binomial")]
 pub fn binom(
-<<<<<<< HEAD
     /// 上側の係数。0または正の値である必要があります。
     n: u64,
     /// 下側の係数。0または正の値である必要があります。
-=======
-    /// The upper coefficient. Must be non-negative.
-    n: u64,
-    /// The lower coefficient. Must be non-negative.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     k: u64,
 ) -> StrResult<i64> {
     Ok(binom_impl(n, k).ok_or_else(too_large)?)
@@ -752,42 +557,20 @@ fn binom_impl(n: u64, k: u64) -> Option<i64> {
     result.try_into().ok()
 }
 
-<<<<<<< HEAD
 /// 2つの整数値の最大公約数。
-=======
-/// Calculates the greatest common divisor of two integers.
 ///
 /// This will error if the result of integer division would be larger than the
 /// maximum 64-bit signed integer.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 ///
 /// ```example
 /// #calc.gcd(7, 42)
 /// ```
 #[func(title = "Greatest Common Divisor")]
 pub fn gcd(
-<<<<<<< HEAD
     /// 1つ目の整数値。
     a: i64,
     /// 2つ目の整数値。
     b: i64,
-) -> i64 {
-    let (mut a, mut b) = (a, b);
-    while b != 0 {
-        let temp = b;
-        b = a % b;
-        a = temp;
-    }
-
-    a.abs()
-}
-
-/// 2つの整数値の最小公倍数。
-=======
-    /// The first integer.
-    a: i64,
-    /// The second integer.
-    b: i64,
 ) -> StrResult<i64> {
     let (mut a, mut b) = (a, b);
     while b != 0 {
@@ -799,54 +582,33 @@ pub fn gcd(
     Ok(a.abs())
 }
 
-/// Calculates the least common multiple of two integers.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
+/// 2つの整数値の最小公倍数。
 ///
 /// ```example
 /// #calc.lcm(96, 13)
 /// ```
 #[func(title = "Least Common Multiple")]
 pub fn lcm(
-<<<<<<< HEAD
     /// 1つ目の整数値。
     a: i64,
     /// 2つ目の整数値。
-=======
-    /// The first integer.
-    a: i64,
-    /// The second integer.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     b: i64,
 ) -> StrResult<i64> {
     if a == b {
         return Ok(a.abs());
     }
 
-<<<<<<< HEAD
-    Ok(a.checked_div(gcd(a, b))
-=======
     Ok(a.checked_div(gcd(a, b)?)
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
         .and_then(|gcd| gcd.checked_mul(b))
         .map(|v| v.abs())
         .ok_or_else(too_large)?)
 }
 
-<<<<<<< HEAD
 /// 数値を最も近い整数値に切り捨て。
 ///
 /// もしその値がすでに整数であれば、そのまま返されます。
 ///
 /// この関数は常に[整数値]($int)を返し、結果となる[`float`]や[`decimal`]が64ビット符号付き整数の最大値より大きい、または最小値より小さい場合はエラーとなります。
-=======
-/// Rounds a number down to the nearest integer.
-///
-/// If the number is already an integer, it is returned unchanged.
-///
-/// Note that this function will always return an [integer]($int), and will
-/// error if the resulting [`float`] or [`decimal`] is larger than the maximum
-/// 64-bit signed integer or smaller than the minimum for that type.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 ///
 /// ```example
 /// #calc.floor(500.1)
@@ -856,11 +618,7 @@ pub fn lcm(
 /// ```
 #[func]
 pub fn floor(
-<<<<<<< HEAD
     /// 切り下げる数値。
-=======
-    /// The number to round down.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     value: DecNum,
 ) -> StrResult<i64> {
     match value {
@@ -871,21 +629,11 @@ pub fn floor(
     }
 }
 
-<<<<<<< HEAD
 /// 数値を最も近い整数値に切り上げ。
 ///
 /// もしその値がすでに整数であれば、そのまま返されます。
 ///
 /// この関数は常に[整数値]($int)を返し、結果となる[`float`]や[`decimal`]が64ビット符号付き整数の最大値より大きい、または最小値より小さい場合はエラーとなります。
-=======
-/// Rounds a number up to the nearest integer.
-///
-/// If the number is already an integer, it is returned unchanged.
-///
-/// Note that this function will always return an [integer]($int), and will
-/// error if the resulting [`float`] or [`decimal`] is larger than the maximum
-/// 64-bit signed integer or smaller than the minimum for that type.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 ///
 /// ```example
 /// #calc.ceil(500.1)
@@ -895,11 +643,7 @@ pub fn floor(
 /// ```
 #[func]
 pub fn ceil(
-<<<<<<< HEAD
     /// 切り上げる数値。
-=======
-    /// The number to round up.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     value: DecNum,
 ) -> StrResult<i64> {
     match value {
@@ -910,21 +654,11 @@ pub fn ceil(
     }
 }
 
-<<<<<<< HEAD
 /// 数値の整数部分を切り出し。
 ///
 /// もしその値がすでに整数であれば、そのまま返されます。
 ///
 /// この関数は常に[整数値]($int)を返し、結果となる[`float`]や[`decimal`]が64ビット符号付き整数の最大値より大きい、または最小値より小さい場合はエラーとなります。
-=======
-/// Returns the integer part of a number.
-///
-/// If the number is already an integer, it is returned unchanged.
-///
-/// Note that this function will always return an [integer]($int), and will
-/// error if the resulting [`float`] or [`decimal`] is larger than the maximum
-/// 64-bit signed integer or smaller than the minimum for that type.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 ///
 /// ```example
 /// #calc.trunc(15.9)
@@ -934,11 +668,7 @@ pub fn ceil(
 /// ```
 #[func(title = "Truncate")]
 pub fn trunc(
-<<<<<<< HEAD
     /// 整数部分を切り出す数値。
-=======
-    /// The number to truncate.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     value: DecNum,
 ) -> StrResult<i64> {
     match value {
@@ -949,15 +679,9 @@ pub fn trunc(
     }
 }
 
-<<<<<<< HEAD
 /// 数値の小数部分を切り出し。
 ///
 /// もしその値が整数であれば、`0`を返します。
-=======
-/// Returns the fractional part of a number.
-///
-/// If the number is an integer, returns `0`.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 ///
 /// ```example
 /// #calc.fract(-3.1)
@@ -966,11 +690,7 @@ pub fn trunc(
 /// ```
 #[func(title = "Fractional")]
 pub fn fract(
-<<<<<<< HEAD
     /// 小数部分を切り出す数値。
-=======
-    /// The number to truncate.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     value: DecNum,
 ) -> DecNum {
     match value {
@@ -980,7 +700,6 @@ pub fn fract(
     }
 }
 
-<<<<<<< HEAD
 /// 数値を四捨五入します。
 ///
 /// オプションで、小数点以下の桁数も指定できます。
@@ -991,28 +710,6 @@ pub fn fract(
 /// 関数の出力を明示的に[`int`]にもできますが、その`float`や`decimal`が64ビット符号付き整数の最大値より大きい場合、または最小値より小さい場合はエラーとなることに注意してください。
 ///
 /// さらに、この関数は、整数や`decimal`の最大値または最小値を超えて丸めようとするとエラーになる場合があります。数値が`float`の場合、そのような試みは、最大値や最小値に対してそれぞれ`{float.inf}`と`{-float.inf}`を返します。
-=======
-/// Rounds a number to the nearest integer.
-///
-/// Half-integers are rounded away from zero.
-///
-/// Optionally, a number of decimal places can be specified. If negative, its
-/// absolute value will indicate the amount of significant integer digits to
-/// remove before the decimal point.
-///
-/// Note that this function will return the same type as the operand. That is,
-/// applying `round` to a [`float`] will return a `float`, and to a [`decimal`],
-/// another `decimal`. You may explicitly convert the output of this function to
-/// an integer with [`int`], but note that such a conversion will error if the
-/// `float` or `decimal` is larger than the maximum 64-bit signed integer or
-/// smaller than the minimum integer.
-///
-/// In addition, this function can error if there is an attempt to round beyond
-/// the maximum or minimum integer or `decimal`. If the number is a `float`,
-/// such an attempt will cause `{float.inf}` or `{-float.inf}` to be returned
-/// for maximum and minimum respectively.
-///
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 /// ```example
 /// #calc.round(3.1415, digits: 2)
 /// #assert(calc.round(3) == 3)
@@ -1029,20 +726,11 @@ pub fn fract(
 /// ```
 #[func]
 pub fn round(
-<<<<<<< HEAD
     /// 四捨五入する数値。
     value: DecNum,
     /// 正の値の場合、小数点以下の桁数。
     ///
     /// 負の値の場合、小数点より左側で切り捨てる有効整数桁数。
-=======
-    /// The number to round.
-    value: DecNum,
-    /// If positive, the number of decimal places.
-    ///
-    /// If negative, the number of significant integer digits that should be
-    /// removed before the decimal point.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     #[named]
     #[default(0)]
     digits: i64,
@@ -1061,11 +749,7 @@ pub fn round(
     }
 }
 
-<<<<<<< HEAD
 /// 数値を最小値と最大値の間にクランプ。
-=======
-/// Clamps a number between a minimum and maximum value.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 ///
 /// ```example
 /// #calc.clamp(5, 0, 4)
@@ -1077,19 +761,11 @@ pub fn round(
 #[func]
 pub fn clamp(
     span: Span,
-<<<<<<< HEAD
     /// クランプする数値。
     value: DecNum,
     /// 最小値（この値を含む）。
     min: DecNum,
     /// 最大値（この値を含む）。
-=======
-    /// The number to clamp.
-    value: DecNum,
-    /// The inclusive minimum value.
-    min: DecNum,
-    /// The inclusive maximum value.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     max: Spanned<DecNum>,
 ) -> SourceResult<DecNum> {
     // Ignore if there are incompatible types (decimal and float) since that
@@ -1108,11 +784,7 @@ pub fn clamp(
         .at(span)
 }
 
-<<<<<<< HEAD
 /// 一連の値の最小値を決定。
-=======
-/// Determines the minimum of a sequence of values.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 ///
 /// ```example
 /// #calc.min(1, -3, -5, 20, 3, 6) \
@@ -1121,23 +793,14 @@ pub fn clamp(
 #[func(title = "Minimum")]
 pub fn min(
     span: Span,
-<<<<<<< HEAD
     /// 最小値を抽出する一連の値。空であってはなりません。
-=======
-    /// The sequence of values from which to extract the minimum.
-    /// Must not be empty.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     #[variadic]
     values: Vec<Spanned<Value>>,
 ) -> SourceResult<Value> {
     minmax(span, values, Ordering::Less)
 }
 
-<<<<<<< HEAD
 /// 一連の値の最大値を決定。
-=======
-/// Determines the maximum of a sequence of values.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 ///
 /// ```example
 /// #calc.max(1, -3, -5, 20, 3, 6) \
@@ -1146,12 +809,7 @@ pub fn min(
 #[func(title = "Maximum")]
 pub fn max(
     span: Span,
-<<<<<<< HEAD
     ///  最大値を抽出する一連の値。空であってはなりません。
-=======
-    /// The sequence of values from which to extract the maximum.
-    /// Must not be empty.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     #[variadic]
     values: Vec<Spanned<Value>>,
 ) -> SourceResult<Value> {
@@ -1179,11 +837,7 @@ fn minmax(
     Ok(extremum)
 }
 
-<<<<<<< HEAD
 /// 整数値が偶数かどうかを判定。
-=======
-/// Determines whether an integer is even.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 ///
 /// ```example
 /// #calc.even(4) \
@@ -1192,21 +846,13 @@ fn minmax(
 /// ```
 #[func]
 pub fn even(
-<<<<<<< HEAD
     /// 偶数かどうかをチェックする数値。
-=======
-    /// The number to check for evenness.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     value: i64,
 ) -> bool {
     value % 2 == 0
 }
 
-<<<<<<< HEAD
 /// 整数値が奇数かどうかを判断。
-=======
-/// Determines whether an integer is odd.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 ///
 /// ```example
 /// #calc.odd(4) \
@@ -1215,31 +861,17 @@ pub fn even(
 /// ```
 #[func]
 pub fn odd(
-<<<<<<< HEAD
     /// 奇数かどうかをチェックする数値。
-=======
-    /// The number to check for oddness.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     value: i64,
 ) -> bool {
     value % 2 != 0
 }
 
-<<<<<<< HEAD
 /// 2つの数値の剰余を計算。
 ///
 /// `calc.rem(x, y)`の値は常に`x`と同じ符号を持ち、`y`よりも小さい絶対値になります。
 ///
 /// [`decimal`]が入力され、被除数が除数に比べて絶対値が小さすぎる場合はエラーになることがあります。
-=======
-/// Calculates the remainder of two numbers.
-///
-/// The value `calc.rem(x, y)` always has the same sign as `x`, and is smaller
-/// in magnitude than `y`.
-///
-/// This can error if given a [`decimal`] input and the dividend is too small in
-/// magnitude compared to the divisor.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 ///
 /// ```example
 /// #calc.rem(7, 3) \
@@ -1251,15 +883,9 @@ pub fn odd(
 #[func(title = "Remainder")]
 pub fn rem(
     span: Span,
-<<<<<<< HEAD
     /// 剰余の被除数。
     dividend: DecNum,
     /// 剰余の除数。
-=======
-    /// The dividend of the remainder.
-    dividend: DecNum,
-    /// The divisor of the remainder.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     divisor: Spanned<DecNum>,
 ) -> SourceResult<DecNum> {
     if divisor.v.is_zero() {
@@ -1269,13 +895,9 @@ pub fn rem(
     dividend
         .apply2(
             divisor.v,
-<<<<<<< HEAD
-            |a, b| Some(DecNum::Int(a % b)),
-=======
             // `checked_rem` can only overflow on `i64::MIN % -1` which is
             // mathematically zero.
             |a, b| Some(DecNum::Int(a.checked_rem(b).unwrap_or(0))),
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
             |a, b| Some(DecNum::Float(a % b)),
             |a, b| a.checked_rem(b).map(DecNum::Decimal),
         )
@@ -1285,20 +907,12 @@ pub fn rem(
         .at(span)
 }
 
-<<<<<<< HEAD
 /// 2つの数値のユークリッド除算。
 ///
 /// この計算の結果は、商を被除数が除数の`{n}`倍以上になる整数`{n}`へ丸めた値です。
-=======
-/// Performs euclidean division of two numbers.
-///
-/// The result of this computation is that of a division rounded to the integer
-/// `{n}` such that the dividend is greater than or equal to `{n}` times
-/// the divisor.
 ///
 /// This can error if the resulting number is larger than the maximum value or
 /// smaller than the minimum value for its type.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 ///
 /// ```example
 /// #calc.div-euclid(7, 3) \
@@ -1311,15 +925,9 @@ pub fn rem(
 #[func(title = "Euclidean Division")]
 pub fn div_euclid(
     span: Span,
-<<<<<<< HEAD
     /// 除算の被除数。
     dividend: DecNum,
     /// 除算の除数。
-=======
-    /// The dividend of the division.
-    dividend: DecNum,
-    /// The divisor of the division.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     divisor: Spanned<DecNum>,
 ) -> SourceResult<DecNum> {
     if divisor.v.is_zero() {
@@ -1329,11 +937,7 @@ pub fn div_euclid(
     dividend
         .apply2(
             divisor.v,
-<<<<<<< HEAD
-            |a, b| Some(DecNum::Int(a.div_euclid(b))),
-=======
             |a, b| a.checked_div_euclid(b).map(DecNum::Int),
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
             |a, b| Some(DecNum::Float(a.div_euclid(b))),
             |a, b| a.checked_div_euclid(b).map(DecNum::Decimal),
         )
@@ -1343,24 +947,12 @@ pub fn div_euclid(
         .at(span)
 }
 
-<<<<<<< HEAD
 /// 除算の最小の非負剰余を計算。
 ///
 /// 警告：浮動小数点数の丸め誤差により、被除数が除数よりも極端に小さく、かつ負の値である場合、剰余が除数の絶対値と等しくなる可能性があります。
 /// これは浮動小数点数の入力にのみ当てはまります。
 ///
 /// また、[`decimal`]を入力した場合、被除数が除数に比べて桁違いに小さい場合はエラーとなることがあります。
-=======
-/// This calculates the least nonnegative remainder of a division.
-///
-/// Warning: Due to a floating point round-off error, the remainder may equal
-/// the absolute value of the divisor if the dividend is much smaller in
-/// magnitude than the divisor and the dividend is negative. This only applies
-/// for floating point inputs.
-///
-/// In addition, this can error if given a [`decimal`] input and the dividend is
-/// too small in magnitude compared to the divisor.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 ///
 /// ```example
 /// #calc.rem-euclid(7, 3) \
@@ -1373,15 +965,9 @@ pub fn div_euclid(
 #[func(title = "Euclidean Remainder", keywords = ["modulo", "modulus"])]
 pub fn rem_euclid(
     span: Span,
-<<<<<<< HEAD
     /// 剰余の被除数。
     dividend: DecNum,
     /// 剰余の除数。
-=======
-    /// The dividend of the remainder.
-    dividend: DecNum,
-    /// The divisor of the remainder.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     divisor: Spanned<DecNum>,
 ) -> SourceResult<DecNum> {
     if divisor.v.is_zero() {
@@ -1391,13 +977,9 @@ pub fn rem_euclid(
     dividend
         .apply2(
             divisor.v,
-<<<<<<< HEAD
-            |a, b| Some(DecNum::Int(a.rem_euclid(b))),
-=======
             // `checked_rem_euclid` can only overflow on `i64::MIN % -1` which
             // is mathematically zero.
             |a, b| Some(DecNum::Int(a.checked_rem_euclid(b).unwrap_or(0))),
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
             |a, b| Some(DecNum::Float(a.rem_euclid(b))),
             |a, b| a.checked_rem_euclid(b).map(DecNum::Decimal),
         )
@@ -1407,17 +989,11 @@ pub fn rem_euclid(
         .at(span)
 }
 
-<<<<<<< HEAD
 /// 2つの数値の商（切り捨て除算）を計算します。
 ///
-/// この関数は常に[整数値]($int)を返し、結果となる[`float`]や[`decimal`]が64ビット符号付き整数の最大値より大きい、または最小値より小さい場合はエラーとなることに注意してください。
-=======
-/// Calculates the quotient (floored division) of two numbers.
-///
 /// Note that this function will always return an [integer]($int), and will
 /// error if the resulting number is larger than the maximum 64-bit signed
 /// integer or smaller than the minimum for that type.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 ///
 /// ```example
 /// $ "quo"(a, b) &= floor(a/b) \
@@ -1427,15 +1003,9 @@ pub fn rem_euclid(
 #[func(title = "Quotient")]
 pub fn quo(
     span: Span,
-<<<<<<< HEAD
     /// 商の被除数。
     dividend: DecNum,
     /// 商の除数。
-=======
-    /// The dividend of the quotient.
-    dividend: DecNum,
-    /// The divisor of the quotient.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     divisor: Spanned<DecNum>,
 ) -> SourceResult<i64> {
     if divisor.v.is_zero() {
@@ -1445,11 +1015,7 @@ pub fn quo(
     let divided = dividend
         .apply2(
             divisor.v,
-<<<<<<< HEAD
-            |a, b| Some(DecNum::Int(a / b)),
-=======
             |a, b| a.checked_div(b).map(DecNum::Int),
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
             |a, b| Some(DecNum::Float(a / b)),
             |a, b| a.checked_div(b).map(DecNum::Decimal),
         )
@@ -1461,11 +1027,7 @@ pub fn quo(
     floor(divided).at(span)
 }
 
-<<<<<<< HEAD
 /// 一連の値のpノルムを計算。
-=======
-/// Calculates the p-norm of a sequence of values.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 ///
 /// ```example
 /// #calc.norm(1, 2, -3, 0.5) \
@@ -1473,20 +1035,11 @@ pub fn quo(
 /// ```
 #[func(title = "𝑝-Norm")]
 pub fn norm(
-<<<<<<< HEAD
     /// pノルムを計算するための`p`の値。
     #[named]
     #[default(Spanned::new(2.0, Span::detached()))]
     p: Spanned<f64>,
     /// pノルムを計算する一連の値。空の場合、`0.0`を返します。
-=======
-    /// The p value to calculate the p-norm of.
-    #[named]
-    #[default(Spanned::new(2.0, Span::detached()))]
-    p: Spanned<f64>,
-    /// The sequence of values from which to calculate the p-norm.
-    /// Returns `0.0` if empty.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     #[variadic]
     values: Vec<f64>,
 ) -> SourceResult<f64> {
diff --git a/crates/typst-library/src/foundations/cast.rs b/crates/typst-library/src/foundations/cast.rs
index cc857f51fe..6677a0bd65 100644
--- a/crates/typst-library/src/foundations/cast.rs
+++ b/crates/typst-library/src/foundations/cast.rs
@@ -498,7 +498,6 @@ cast! {
         MathClass::Vary => "vary",
         MathClass::Special => "special",
     }),
-<<<<<<< HEAD
     /// 特別でない要素のデフォルトクラス。
     "normal" => MathClass::Normal,
     /// カンマなどの句読点。
@@ -518,27 +517,6 @@ cast! {
     /// `times`のような二項演算子。
     "binary" => MathClass::Binary,
     /// `+`のような単項と二項のどちらにもなる演算子。
-=======
-    /// The default class for non-special things.
-    "normal" => MathClass::Normal,
-    /// Punctuation, e.g. a comma.
-    "punctuation" => MathClass::Punctuation,
-    /// An opening delimiter, e.g. `(`.
-    "opening" => MathClass::Opening,
-    /// A closing delimiter, e.g. `)`.
-    "closing" => MathClass::Closing,
-    /// A delimiter that is the same on both sides, e.g. `|`.
-    "fence" => MathClass::Fence,
-    /// A large operator like `sum`.
-    "large" => MathClass::Large,
-    /// A relation like `=` or `prec`.
-    "relation" => MathClass::Relation,
-    /// A unary operator like `not`.
-    "unary" => MathClass::Unary,
-    /// A binary operator like `times`.
-    "binary" => MathClass::Binary,
-    /// An operator that can be both unary or binary like `+`.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     "vary" => MathClass::Vary,
 }
 
diff --git a/crates/typst-library/src/foundations/content/mod.rs b/crates/typst-library/src/foundations/content/mod.rs
index e60aa53254..55df0d2237 100644
--- a/crates/typst-library/src/foundations/content/mod.rs
+++ b/crates/typst-library/src/foundations/content/mod.rs
@@ -35,18 +35,9 @@ use crate::model::{Destination, EmphElem, LinkElem, LinkMarker, StrongElem};
 use crate::pdf::{ArtifactElem, ArtifactKind};
 use crate::text::UnderlineElem;
 
-<<<<<<< HEAD
 /// 文書のコンテンツ。
 ///
 /// この型は、Typstの中心となるものです。Typstの全てのマークアップやほとんどの[関数]($function)はコンテンツを生成します。コンテンツ値は角括弧でマークアップを囲むことで作成できます。これは、コンテンツを関数に渡す際にも使われる方法です。
-=======
-/// A piece of document content.
-///
-/// This type is at the heart of Typst. All markup you write and most
-/// [functions]($function) you call produce content values. You can create a
-/// content value by enclosing markup in square brackets. This is also how you
-/// pass content to functions.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 ///
 /// # Example
 /// ```example
@@ -54,7 +45,6 @@ use crate::text::UnderlineElem;
 /// #type([*Hello!*])
 /// ```
 ///
-<<<<<<< HEAD
 /// コンテンツは`+`演算子で追加したり、[結合]($scripting/#blocks)したり、整数と乗算したりできます。コンテンツが期待される場所であれば、[文字列]($str)や`{none}`も渡せます。
 ///
 /// # Representation
@@ -70,38 +60,6 @@ use crate::text::UnderlineElem;
 ///
 /// ウェブアプリでは、コンテンツ変数にマウスカーソルを合わせると、そのコンテンツが正確にどの要素で構成されているか、そしてどのようなフィールドを持っているかを確認できます。
 /// または、[`repr`]関数の出力を調べることでも確認できます。
-=======
-/// Content can be added with the `+` operator,
-/// [joined together]($scripting/#blocks) and multiplied with integers. Wherever
-/// content is expected, you can also pass a [string]($str) or `{none}`.
-///
-/// # Representation
-/// Content consists of elements with fields. When constructing an element with
-/// its _element function,_ you provide these fields as arguments and when you
-/// have a content value, you can access its fields with [field access
-/// syntax]($scripting/#field-access).
-///
-/// Some fields are required: These must be provided when constructing an
-/// element and as a consequence, they are always available through field access
-/// on content of that type. Required fields are marked as such in the
-/// documentation.
-///
-/// Most fields are optional: Like required fields, they can be passed to the
-/// element function to configure them for a single element. However, these can
-/// also be configured with [set rules]($styling/#set-rules) to apply them to
-/// all elements within a scope. Optional fields are only available with field
-/// access syntax when they were explicitly passed to the element function, not
-/// when they result from a set rule.
-///
-/// Each element has a default appearance. However, you can also completely
-/// customize its appearance with a [show rule]($styling/#show-rules). The show
-/// rule is passed the element. It can access the element's field and produce
-/// arbitrary content from it.
-///
-/// In the web app, you can hover over a content variable to see exactly which
-/// elements the content is composed of and what fields they have.
-/// Alternatively, you can inspect the output of the [`repr`] function.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 #[ty(scope, cast)]
 #[derive(Clone, PartialEq, Hash)]
 #[repr(transparent)]
@@ -533,36 +491,20 @@ impl Content {
 
 #[scope]
 impl Content {
-<<<<<<< HEAD
     /// コンテンツの要素関数。
     /// この関数を用いると、当該コンテンツに含まれる要素を生成できます。
     /// この関数は、その要素に対するsetルールやshowルール内でも使用できます。
     /// グローバル関数と比較することで、特定の種類の要素を持っているかを確認できます。
-=======
-    /// The content's element function. This function can be used to create the element
-    /// contained in this content. It can be used in set and show rules for the
-    /// element. Can be compared with global functions to check whether you have
-    /// a specific
-    /// kind of element.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     #[func]
     pub fn func(&self) -> Element {
         self.elem()
     }
 
-<<<<<<< HEAD
     /// コンテンツが特定のフィールドを持つかどうか。
     #[func]
     pub fn has(
         &self,
         /// 調べるフィールド。
-=======
-    /// Whether the content has the specified field.
-    #[func]
-    pub fn has(
-        &self,
-        /// The field to look for.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
         field: Str,
     ) -> bool {
         if field.as_str() == "label" {
@@ -579,7 +521,6 @@ impl Content {
         }
     }
 
-<<<<<<< HEAD
     /// コンテンツ内の指定されたフィールドにアクセスします。そのフィールドが存在しない場合はデフォルト値が返されますが、デフォルト値が指定されていない場合はエラーになります。
     #[func]
     pub fn at(
@@ -587,17 +528,6 @@ impl Content {
         /// アクセスするフィールド。
         field: Str,
         /// フィールドが存在しない場合のデフォルト値。
-=======
-    /// Access the specified field on the content. Returns the default value if
-    /// the field does not exist or fails with an error if no default value was
-    /// specified.
-    #[func]
-    pub fn at(
-        &self,
-        /// The field to access.
-        field: Str,
-        /// A default value to return if the field does not exist.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
         #[named]
         default: Option<Value>,
     ) -> StrResult<Value> {
@@ -606,11 +536,7 @@ impl Content {
             .map_err(|e| e.message_no_default(self, &field))
     }
 
-<<<<<<< HEAD
     /// このcontentのフィールドを返します。
-=======
-    /// Returns the fields of this content.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     ///
     /// ```example
     /// #rect(
@@ -632,14 +558,7 @@ impl Content {
         dict
     }
 
-<<<<<<< HEAD
     /// コンテンツの位置。これは、[クエリ]($query)によって返されたコンテンツ、または[showルール]($reference/styling/#show-rules)によって提供されたコンテンツに対してのみ利用できます。それ以外のコンテンツでは、`{none}`になります。取得された位置情報は、[カウンター]($counter)、[状態]($state)、[クエリ]($query)と一緒に使用できます。
-=======
-    /// The location of the content. This is only available on content returned
-    /// by [query] or provided by a [show rule]($reference/styling/#show-rules),
-    /// for other content it will be `{none}`. The resulting location can be
-    /// used with [counters]($counter), [state] and [queries]($query).
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     #[func]
     pub fn location(&self) -> Option<Location> {
         self.0.meta().location
diff --git a/crates/typst-library/src/foundations/datetime.rs b/crates/typst-library/src/foundations/datetime.rs
index 21b1fcfd15..a6181b248c 100644
--- a/crates/typst-library/src/foundations/datetime.rs
+++ b/crates/typst-library/src/foundations/datetime.rs
@@ -14,20 +14,11 @@ use crate::foundations::{
     Dict, Duration, Repr, Smart, Str, Value, cast, func, repr, scope, ty,
 };
 
-<<<<<<< HEAD
 /// 日付、時刻、またはその両方を表します。
 ///
 /// この型のコンストラクタ関数を使ってカスタム日時を指定するか、[`datetime.today`]($datetime.today)を使って現在の日付を取得することで作成できます。
 ///
 /// # 例
-=======
-/// Represents a date, a time, or a combination of both.
-///
-/// Can be created by either specifying a custom datetime using this type's
-/// constructor function or getting the current date with [`datetime.today`].
-///
-/// # Example
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 /// ```example
 /// #let date = datetime(
 ///   year: 2020,
@@ -52,13 +43,8 @@ use crate::foundations::{
 /// )
 /// ```
 ///
-<<<<<<< HEAD
 /// # DatetimeとDuration
 /// 2つのdatetimeの差を取ることで、[duration]を取得できます。
-=======
-/// # Datetime and Duration
-/// You can get a [duration] by subtracting two datetime:
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 /// ```example
 /// #let first-of-march = datetime(day: 1, month: 3, year: 2024)
 /// #let first-of-jan = datetime(day: 1, month: 1, year: 2024)
@@ -66,12 +52,7 @@ use crate::foundations::{
 /// #distance.hours()
 /// ```
 ///
-<<<<<<< HEAD
 /// datetimeとdurationを加減算することで、新しい日時（オフセットされたdatetime）も取得できます。
-=======
-/// You can also add/subtract a datetime and a duration to retrieve a new,
-/// offset datetime:
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 /// ```example
 /// #let date = datetime(day: 1, month: 3, year: 2024)
 /// #let two-days = duration(days: 2)
@@ -83,7 +64,6 @@ use crate::foundations::{
 /// #two-days-later.display()
 /// ```
 ///
-<<<<<<< HEAD
 /// # フォーマット
 /// [`display`]($datetime.display)メソッドを使うことで、日時をカスタマイズして表示するフォーマットを指定できます。日時のフォーマットは、_コンポーネント_に_修飾子_を組み合わせることで指定します。
 /// コンポーネントは、日時の中の特定の部分（例えば年や月など）を表します。そして修飾子を使うことで、そのコンポーネントをどのように表示するかを細かく設定できます。
@@ -121,74 +101,6 @@ use crate::foundations::{
 ///   - `padding`: 秒表示のパディングは`zero`（ゼロ）、`space`（空白）、`none`（なし）が指定できます。
 ///
 /// 全てのコンポーネントが常に使用できるとは限らない点には注意してください。例えば、`{datetime(year: 2023, month: 10, day: 13)}`のようにして新しい`datetime`を作成すると、内部的には日付のみが保持されるため、`hour`や`minute`のようなコンポーネントは使用できません。それらは特定の時刻が指定された`datetime`でのみ動作します。
-=======
-/// # Format
-/// You can specify a customized formatting using the
-/// [`display`]($datetime.display) method. The format of a datetime is
-/// specified by providing _components_ with a specified number of _modifiers_.
-/// A component represents a certain part of the datetime that you want to
-/// display, and with the help of modifiers you can define how you want to
-/// display that component. In order to display a component, you wrap the name
-/// of the component in square brackets (e.g. `[[year]]` will display the year).
-/// In order to add modifiers, you add a space after the component name followed
-/// by the name of the modifier, a colon and the value of the modifier (e.g.
-/// `[[month repr:short]]` will display the short representation of the month).
-///
-/// The possible combination of components and their respective modifiers is as
-/// follows:
-///
-/// - `year`: Displays the year of the datetime.
-///   - `padding`: Can be either `zero`, `space` or `none`. Specifies how the
-///     year is padded.
-///   - `repr` Can be either `full` in which case the full year is displayed or
-///     `last_two` in which case only the last two digits are displayed.
-///   - `sign`: Can be either `automatic` or `mandatory`. Specifies when the
-///     sign should be displayed.
-/// - `month`: Displays the month of the datetime.
-///   - `padding`: Can be either `zero`, `space` or `none`. Specifies how the
-///     month is padded.
-///   - `repr`: Can be either `numerical`, `long` or `short`. Specifies if the
-///     month should be displayed as a number or a word. Unfortunately, when
-///     choosing the word representation, it can currently only display the
-///     English version. In the future, it is planned to support localization.
-/// - `day`: Displays the day of the datetime.
-///   - `padding`: Can be either `zero`, `space` or `none`. Specifies how the
-///     day is padded.
-/// - `week_number`: Displays the week number of the datetime.
-///   - `padding`: Can be either `zero`, `space` or `none`. Specifies how the
-///     week number is padded.
-///   - `repr`: Can be either `ISO`, `sunday` or `monday`. In the case of `ISO`,
-///      week numbers are between 1 and 53, while the other ones are between 0
-///      and 53.
-/// - `weekday`: Displays the weekday of the date.
-///   - `repr` Can be either `long`, `short`, `sunday` or `monday`. In the case
-///     of `long` and `short`, the corresponding English name will be displayed
-///     (same as for the month, other languages are currently not supported). In
-///     the case of `sunday` and `monday`, the numerical value will be displayed
-///     (assuming Sunday and Monday as the first day of the week, respectively).
-///   - `one_indexed`: Can be either `true` or `false`. Defines whether the
-///     numerical representation of the week starts with 0 or 1.
-/// - `hour`: Displays the hour of the date.
-///   - `padding`: Can be either `zero`, `space` or `none`. Specifies how the
-///     hour is padded.
-///   - `repr`: Can be either `24` or `12`. Changes whether the hour is
-///     displayed in the 24-hour or 12-hour format.
-/// - `period`: The AM/PM part of the hour
-///   - `case`: Can be `lower` to display it in lower case and `upper` to
-///     display it in upper case.
-/// - `minute`: Displays the minute of the date.
-///   - `padding`: Can be either `zero`, `space` or `none`. Specifies how the
-///     minute is padded.
-/// - `second`: Displays the second of the date.
-///   - `padding`: Can be either `zero`, `space` or `none`. Specifies how the
-///     second is padded.
-///
-/// Keep in mind that not always all components can be used. For example, if you
-/// create a new datetime with `{datetime(year: 2023, month: 10, day: 13)}`, it
-/// will be stored as a plain date internally, meaning that you cannot use
-/// components such as `hour` or `minute`, which would only work on datetimes
-/// that have a specified time.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 #[ty(scope, cast)]
 #[derive(Debug, Copy, Clone, PartialEq, Hash)]
 pub enum Datetime {
@@ -289,7 +201,6 @@ impl Datetime {
 
 #[scope]
 impl Datetime {
-<<<<<<< HEAD
     /// 新しいdatetimeを作成。
     ///
     /// 年、月、日、時、分、秒を指定して[datetime]を作成します。
@@ -300,22 +211,6 @@ impl Datetime {
     /// * 年、月、日、時、分、秒の全てを指定した場合、Typstは完全な日時を保持します。
     ///
     /// 保持形式に応じて、[`display`]($datetime.display)メソッドはデフォルトで異なるフォーマットを選択します。
-=======
-    /// Creates a new datetime.
-    ///
-    /// You can specify the [datetime] using a year, month, day, hour, minute,
-    /// and second.
-    ///
-    /// _Note_: Depending on which components of the datetime you specify, Typst
-    /// will store it in one of the following three ways:
-    /// * If you specify year, month and day, Typst will store just a date.
-    /// * If you specify hour, minute and second, Typst will store just a time.
-    /// * If you specify all of year, month, day, hour, minute and second, Typst
-    ///   will store a full datetime.
-    ///
-    /// Depending on how it is stored, the [`display`]($datetime.display) method
-    /// will choose a different formatting by default.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     ///
     /// ```example
     /// #datetime(
@@ -326,7 +221,6 @@ impl Datetime {
     /// ```
     #[func(constructor)]
     pub fn construct(
-<<<<<<< HEAD
         /// `datetime`の年。
         #[named]
         year: Option<i32>,
@@ -343,24 +237,6 @@ impl Datetime {
         #[named]
         minute: Option<u8>,
         /// `datetime`の秒。
-=======
-        /// The year of the datetime.
-        #[named]
-        year: Option<i32>,
-        /// The month of the datetime.
-        #[named]
-        month: Option<Month>,
-        /// The day of the datetime.
-        #[named]
-        day: Option<u8>,
-        /// The hour of the datetime.
-        #[named]
-        hour: Option<u8>,
-        /// The minute of the datetime.
-        #[named]
-        minute: Option<u8>,
-        /// The second of the datetime.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
         #[named]
         second: Option<u8>,
     ) -> StrResult<Datetime> {
@@ -398,17 +274,13 @@ impl Datetime {
         })
     }
 
-<<<<<<< HEAD
     /// 現在の日付を取得。
-=======
-    /// Returns the current date.
     ///
     /// In the CLI, this can be overridden with the `--creation-timestamp`
     /// argument or by setting the
     /// [`SOURCE_DATE_EPOCH`](https://reproducible-builds.org/specs/source-date-epoch/)
     /// environment variable. In both cases, the value should be given as a UNIX
     /// timestamp.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     ///
     /// ```example
     /// Today's date is
@@ -417,12 +289,7 @@ impl Datetime {
     #[func]
     pub fn today(
         engine: &mut Engine,
-<<<<<<< HEAD
         /// 現在のUTC日時に適用するオフセットです。`{auto}`に設定した場合は、ローカルのオフセットが適用されます。
-=======
-        /// An offset to apply to the current UTC date. If set to `{auto}`, the
-        /// offset will be the local offset.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
         #[named]
         #[default]
         offset: Smart<i64>,
@@ -433,7 +300,6 @@ impl Datetime {
             .ok_or("unable to get the current date")?)
     }
 
-<<<<<<< HEAD
     /// 指定したフォーマットで`datetime`を表示します。
     /// 日付のみ、時刻のみ、または両方が指定されているかによって、デフォルトのフォーマットは異なります。
     /// 日付のみ指定されている場合は`[[year]-[month]-[day]]`になります。
@@ -445,21 +311,6 @@ impl Datetime {
     pub fn display(
         &self,
         /// `datetime`を表示する際に使用するフォーマットです。
-=======
-    /// Displays the datetime in a specified format.
-    ///
-    /// Depending on whether you have defined just a date, a time or both, the
-    /// default format will be different. If you specified a date, it will be
-    /// `[[year]-[month]-[day]]`. If you specified a time, it will be
-    /// `[[hour]:[minute]:[second]]`. In the case of a datetime, it will be
-    /// `[[year]-[month]-[day] [hour]:[minute]:[second]]`.
-    ///
-    /// See the [format syntax]($datetime/#format) for more information.
-    #[func]
-    pub fn display(
-        &self,
-        /// The format used to display the datetime.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
         #[default]
         pattern: Smart<DisplayPattern>,
     ) -> StrResult<EcoString> {
@@ -482,11 +333,7 @@ impl Datetime {
         result.map(EcoString::from).map_err(format_time_format_error)
     }
 
-<<<<<<< HEAD
     /// 年を返します。年が指定されていない場合や、日付を持たない時間の場合は`{none}`になります。
-=======
-    /// The year if it was specified, or `{none}` for times without a date.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     #[func]
     pub fn year(&self) -> Option<i32> {
         match self {
@@ -496,11 +343,7 @@ impl Datetime {
         }
     }
 
-<<<<<<< HEAD
     /// 月を返します。日付を持たない時間の場合は`{none}`になります。
-=======
-    /// The month if it was specified, or `{none}` for times without a date.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     #[func]
     pub fn month(&self) -> Option<u8> {
         match self {
@@ -510,11 +353,7 @@ impl Datetime {
         }
     }
 
-<<<<<<< HEAD
     /// （月曜日を1とする）曜日を返します。日付を持たない時間の場合は`{none}`になります。
-=======
-    /// The weekday (counting Monday as 1) or `{none}` for times without a date.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     #[func]
     pub fn weekday(&self) -> Option<u8> {
         match self {
@@ -524,11 +363,7 @@ impl Datetime {
         }
     }
 
-<<<<<<< HEAD
     /// 日を返します。日付を持たない時間の場合は`{none}`になります。
-=======
-    /// The day if it was specified, or `{none}` for times without a date.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     #[func]
     pub fn day(&self) -> Option<u8> {
         match self {
@@ -538,11 +373,7 @@ impl Datetime {
         }
     }
 
-<<<<<<< HEAD
     /// 時を返します。時刻を持たない日付の場合は`{none}`になります。
-=======
-    /// The hour if it was specified, or `{none}` for dates without a time.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     #[func]
     pub fn hour(&self) -> Option<u8> {
         match self {
@@ -552,11 +383,7 @@ impl Datetime {
         }
     }
 
-<<<<<<< HEAD
     /// 分を返します。時刻を持たない日付の場合は`{none}`になります。
-=======
-    /// The minute if it was specified, or `{none}` for dates without a time.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     #[func]
     pub fn minute(&self) -> Option<u8> {
         match self {
@@ -566,11 +393,7 @@ impl Datetime {
         }
     }
 
-<<<<<<< HEAD
     /// 秒を返します。時刻を持たない日付の場合は`{none}`になります。
-=======
-    /// The second if it was specified, or `{none}` for dates without a time.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     #[func]
     pub fn second(&self) -> Option<u8> {
         match self {
@@ -580,12 +403,8 @@ impl Datetime {
         }
     }
 
-<<<<<<< HEAD
     /// 年の通算日（1年の中での通し番号）を返します。
     /// 日付を持たない時刻の場合は `{none}` になります。
-=======
-    /// The ordinal (day of the year), or `{none}` for times without a date.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     #[func]
     pub fn ordinal(&self) -> Option<u16> {
         match self {
diff --git a/crates/typst-library/src/foundations/func.rs b/crates/typst-library/src/foundations/func.rs
index 274cd679e7..207ad619fe 100644
--- a/crates/typst-library/src/foundations/func.rs
+++ b/crates/typst-library/src/foundations/func.rs
@@ -16,7 +16,6 @@ use crate::foundations::{
     Selector, Type, Value, cast, repr, scope, ty,
 };
 
-<<<<<<< HEAD
 /// 引数値から戻り値への写像。
 ///
 /// 関数名の直後に括弧で囲まれたカンマ区切りの関数の_引数_のリストを書くことにより関数を呼び出せます。
@@ -29,22 +28,6 @@ use crate::foundations::{
 /// 詳細は[数式のドキュメント]($category/math)を参照して下さい。
 ///
 /// # 例
-=======
-/// A mapping from argument values to a return value.
-///
-/// You can call a function by writing a comma-separated list of function
-/// _arguments_ enclosed in parentheses directly after the function name.
-/// Additionally, you can pass any number of trailing content block arguments
-/// to a function _after_ the normal argument list. If the normal argument list
-/// would become empty, it can be omitted. Typst supports positional and named
-/// arguments. The former are identified by position and type, while the latter
-/// are written as `name: value`.
-///
-/// Within math mode, function calls have special behaviour. See the
-/// [math documentation]($category/math) for more details.
-///
-/// # Example
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 /// ```example
 /// // Call a function.
 /// #list([A], [B])
@@ -57,7 +40,6 @@ use crate::foundations::{
 /// #list[A][B]
 /// ```
 ///
-<<<<<<< HEAD
 /// 関数はTypstにおいて基礎となる構成要素です。
 /// Typstはさまざまな組版タスクに応じた関数を提供しています。
 /// さらには、作成されるマークアップの裏側では関数が用いられており、全てのスタイル設定は関数を介して行われます。
@@ -87,49 +69,6 @@ use crate::foundations::{
 /// 意味のある値を何も返さない関数は、代わりに[`none`]を返します。
 /// このような関数について、戻り値の型はドキュメント中で明示的に指定されていません
 /// （この例としては[`array.push`]が該当します）。
-=======
-/// Functions are a fundamental building block of Typst. Typst provides
-/// functions for a variety of typesetting tasks. Moreover, the markup you write
-/// is backed by functions and all styling happens through functions. This
-/// reference lists all available functions and how you can use them. Please
-/// also refer to the documentation about [set]($styling/#set-rules) and
-/// [show]($styling/#show-rules) rules to learn about additional ways you can
-/// work with functions in Typst.
-///
-/// # Element functions
-/// Some functions are associated with _elements_ like [headings]($heading) or
-/// [tables]($table). When called, these create an element of their respective
-/// kind. In contrast to normal functions, they can further be used in [set
-/// rules]($styling/#set-rules), [show rules]($styling/#show-rules), and
-/// [selectors]($selector).
-///
-/// # Function scopes
-/// Functions can hold related definitions in their own scope, similar to a
-/// [module]($scripting/#modules). Examples of this are [`assert.eq`] or
-/// [`list.item`]. However, this feature is currently only available for
-/// built-in functions.
-///
-/// # Defining functions
-/// You can define your own function with a [let binding]($scripting/#bindings)
-/// that has a parameter list after the binding's name. The parameter list can
-/// contain mandatory positional parameters, named parameters with default
-/// values and [argument sinks]($arguments).
-///
-/// The right-hand side of a function binding is the function body, which can be
-/// a block or any other expression. It defines the function's return value and
-/// can depend on the parameters. If the function body is a [code
-/// block]($scripting/#blocks), the return value is the result of joining the
-/// values of each expression in the block.
-///
-/// Within a function body, the `return` keyword can be used to exit early and
-/// optionally specify a return value. If no explicit return value is given, the
-/// body evaluates to the result of joining all expressions preceding the
-/// `return`.
-///
-/// Functions that don't return any meaningful value return [`none`] instead.
-/// The return type of such functions is not explicitly specified in the
-/// documentation. (An example of this is [`array.push`]).
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 ///
 /// ```example
 /// #let alert(body, fill: red) = {
@@ -152,7 +91,6 @@ use crate::foundations::{
 /// ]
 /// ```
 ///
-<<<<<<< HEAD
 /// # 関数のインポート
 /// 関数は、`{import}`を用いてあるファイル（[`module`]($scripting/#modules)）から別のファイルにインポートできます。
 /// 例えば、上記の例にある`alert`関数を`foo.typ`というファイルに定義したとします。
@@ -162,28 +100,12 @@ use crate::foundations::{
 /// 引数リストに続けて `=>` と関数本体を指定することで、バインディングを作らずに無名関数も作成できます。
 /// もし関数の引数が1つだけならば、引数リストの周りに括弧を付ける必要はありません。
 /// 無名関数は主にshowルールで用いると便利ですが、page関数の[`footer`]($page.footer)プロパティのような、関数を引数に取る設定可能プロパティでも便利です。
-=======
-/// # Importing functions
-/// Functions can be imported from one file ([`module`]($scripting/#modules)) into
-/// another using `{import}`. For example, assume that we have defined the `alert`
-/// function from the previous example in a file called `foo.typ`. We can import
-/// it into another file by writing `{import "foo.typ": alert}`.
-///
-/// # Unnamed functions { #unnamed }
-/// You can also create an unnamed function without creating a binding by
-/// specifying a parameter list followed by `=>` and the function body. If your
-/// function has just one parameter, the parentheses around the parameter list
-/// are optional. Unnamed functions are mainly useful for show rules, but also
-/// for settable properties that take functions like the page function's
-/// [`footer`]($page.footer) property.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 ///
 /// ```example
 /// #show "once?": it => [#it #it]
 /// once?
 /// ```
 ///
-<<<<<<< HEAD
 /// # 関数の純粋性に関する注意
 /// Typstにおいて関数は全て_純粋_です。
 /// これは同じ引数からは常に同じ結果が返ってくることを意味します。
@@ -191,16 +113,6 @@ use crate::foundations::{
 ///
 /// 唯一の例外は[`array.push(value)`]($array.push)のような組み込みメソッドです。
 /// これらは呼び出された対象を変更できます。
-=======
-/// # Note on function purity
-/// In Typst, all functions are _pure._ This means that for the same
-/// arguments, they always return the same result. They cannot "remember" things to
-/// produce another value when they are called a second time.
-///
-/// The only exception are built-in methods like
-/// [`array.push(value)`]($array.push). These can modify the values they are
-/// called on.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 #[ty(scope, cast, name = "function")]
 #[derive(Clone, Hash)]
 #[allow(clippy::derived_hash_with_manual_eq)]
@@ -426,20 +338,12 @@ impl Func {
 
 #[scope]
 impl Func {
-<<<<<<< HEAD
     /// 指定した引数を事前に適用した新しい関数を返します。
-=======
-    /// Returns a new function that has the given arguments pre-applied.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     #[func]
     pub fn with(
         self,
         args: &mut Args,
-<<<<<<< HEAD
         /// 関数に適用する引数。
-=======
-        /// The arguments to apply to the function.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
         #[external]
         #[variadic]
         arguments: Vec<Value>,
@@ -451,12 +355,7 @@ impl Func {
         }
     }
 
-<<<<<<< HEAD
     /// この関数に属する要素のうち、与えられた引数と同じ値のフィールドを持つものを絞り込むセレクターを返します。
-=======
-    /// Returns a selector that filters for elements belonging to this function
-    /// whose fields have the values of the given arguments.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     ///
     /// ```example
     /// #show heading.where(level: 2): set text(blue)
@@ -468,11 +367,7 @@ impl Func {
     pub fn where_(
         self,
         args: &mut Args,
-<<<<<<< HEAD
         /// 絞り込むフィールド。
-=======
-        /// The fields to filter for.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
         #[variadic]
         #[external]
         fields: Vec<Value>,
diff --git a/crates/typst-library/src/foundations/selector.rs b/crates/typst-library/src/foundations/selector.rs
index 87727c1a4f..abc5898e09 100644
--- a/crates/typst-library/src/foundations/selector.rs
+++ b/crates/typst-library/src/foundations/selector.rs
@@ -38,11 +38,7 @@ pub use crate::__select_where as select_where;
 /// A filter for selecting elements within the document.
 ///
 /// To construct a selector you can:
-<<<<<<< HEAD
-/// - use an element [function]
-=======
 /// - use an [element function]($function/#element-functions)
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 /// - filter for an element function with [specific fields]($function.where)
 /// - use a [string]($str) or [regular expression]($regex)
 /// - use a [`{<label>}`]($label)
diff --git a/crates/typst-library/src/foundations/str.rs b/crates/typst-library/src/foundations/str.rs
index 0f4fd11c57..fe1b3a7e83 100644
--- a/crates/typst-library/src/foundations/str.rs
+++ b/crates/typst-library/src/foundations/str.rs
@@ -327,10 +327,6 @@ impl Str {
             UnicodeNormalForm::Nfkd => self.nfkd().collect(),
         }
     }
-<<<<<<< HEAD
-=======
-
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     /// Whether the string contains the specified pattern.
     ///
     /// This method also has dedicated syntax: You can write `{"bc" in "abcd"}`
diff --git a/crates/typst-library/src/foundations/symbol.rs b/crates/typst-library/src/foundations/symbol.rs
index 62a38f8f04..26643c6077 100644
--- a/crates/typst-library/src/foundations/symbol.rs
+++ b/crates/typst-library/src/foundations/symbol.rs
@@ -16,7 +16,6 @@ use crate::foundations::{
     elem, func, scope, ty,
 };
 
-<<<<<<< HEAD
 /// Unicode記号。
 ///
 /// Typstは、標準のキーボードで簡単に入力できるよう、よく使われる記号を定義しています。
@@ -26,20 +25,6 @@ use crate::foundations::{
 /// - 絵文字は[`emoji`モジュール]($category/symbols/emoji)に定義されています。
 ///
 /// さらに、この型のコンストラクター関数を用いてカスタム記号を定義できます。
-=======
-/// A Unicode symbol.
-///
-/// Typst defines common symbols so that they can easily be written with
-/// standard keyboards. The symbols are defined in modules, from which they can
-/// be accessed using [field access notation]($scripting/#fields):
-///
-/// - General symbols are defined in the [`sym` module]($category/symbols/sym)
-///   and are accessible without the `sym.` prefix in math mode.
-/// - Emoji are defined in the [`emoji` module]($category/symbols/emoji)
-///
-/// Moreover, you can define custom symbols with this type's constructor
-/// function.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 ///
 /// ```example
 /// #sym.arrow.r \
@@ -48,16 +33,9 @@ use crate::foundations::{
 /// #emoji.face.halo
 /// ```
 ///
-<<<<<<< HEAD
 /// 多くの記号には異なるバリアントがあり、ドット記法で修飾子を付加することで選択できます。
 /// 修飾子の順序は問いません。
 /// 記号モジュールのドキュメントページにアクセスし、記号をクリックすると、利用可能なバリアントを確認できます。
-=======
-/// Many symbols have different variants, which can be selected by appending the
-/// modifiers with dot notation. The order of the modifiers is not relevant.
-/// Visit the documentation pages of the symbol modules and click on a symbol to
-/// see its available variants.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 ///
 /// ```example
 /// $arrow.l$ \
@@ -168,11 +146,7 @@ impl Symbol {
             "○" => Ok(crate::math::accent::circle::func()),
             "→" => Ok(crate::math::accent::arrow::func()),
             "←" => Ok(crate::math::accent::arrow_l::func()),
-<<<<<<< HEAD
-            "↔" => Ok(crate::math::accent::arrow_l_r::func()),
-=======
             "↔" | "↔\u{fe0e}" => Ok(crate::math::accent::arrow_l_r::func()),
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
             "⇀" => Ok(crate::math::accent::harpoon::func()),
             "↼" => Ok(crate::math::accent::harpoon_lt::func()),
             _ => bail!("symbol {self} is not callable"),
@@ -240,11 +214,7 @@ impl Symbol {
 
 #[scope]
 impl Symbol {
-<<<<<<< HEAD
     /// 修飾子付きのカスタム記号を生成します。
-=======
-    /// Create a custom symbol with modifiers.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     ///
     /// ```example
     /// #let envelope = symbol(
@@ -264,21 +234,11 @@ impl Symbol {
     #[func(constructor)]
     pub fn construct(
         span: Span,
-<<<<<<< HEAD
         /// 記号のバリアント。
         ///
         /// 修飾子のないバリアントの場合は単一の文字からなる文字列、それ以外の場合は修飾子と記号を指定する2つの文字列の配列を指定できます。
         /// 各修飾子はドットで区切ります。
         /// 記号を表示する際、Typstは付加された全ての修飾子を含み、それ以外の修飾子の数が最小であるバリアントの中から最初のものを選択します。
-=======
-        /// The variants of the symbol.
-        ///
-        /// Can be a just a string consisting of a single character for the
-        /// modifierless variant or an array with two strings specifying the modifiers
-        /// and the symbol. Individual modifiers should be separated by dots. When
-        /// displaying a symbol, Typst selects the first from the variants that have
-        /// all attached modifiers and the minimum number of other modifiers.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
         #[variadic]
         variants: Vec<Spanned<SymbolVariant>>,
     ) -> SourceResult<Symbol> {
diff --git a/crates/typst-library/src/foundations/version.rs b/crates/typst-library/src/foundations/version.rs
index 52621b1768..39f3cdf9f8 100644
--- a/crates/typst-library/src/foundations/version.rs
+++ b/crates/typst-library/src/foundations/version.rs
@@ -65,19 +65,13 @@ impl Version {
     ///
     /// It can have any number of components (even zero).
     ///
-<<<<<<< HEAD
-    /// ```example
-=======
     /// ```example:"Constructing versions"
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     /// #version() \
     /// #version(1) \
     /// #version(1, 2, 3, 4) \
     /// #version((1, 2, 3, 4)) \
     /// #version((1, 2), 3)
     /// ```
-<<<<<<< HEAD
-=======
     ///
     /// As a practical use case, this allows comparing the current version
     /// ([`{sys.version}`]($version)) to a specific one.
@@ -87,7 +81,6 @@ impl Version {
     /// #(sys.version >= version(0, 14, 0)) \
     /// #(version(3, 2, 0) > version(4, 1, 0))
     /// ```
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     #[func(constructor)]
     pub fn construct(
         /// The components of the version (array arguments are flattened)
diff --git a/crates/typst-library/src/introspection/counter.rs b/crates/typst-library/src/introspection/counter.rs
index c63e27cce7..b8b36614ad 100644
--- a/crates/typst-library/src/introspection/counter.rs
+++ b/crates/typst-library/src/introspection/counter.rs
@@ -21,7 +21,6 @@ use crate::math::EquationElem;
 use crate::model::{FigureElem, FootnoteElem, HeadingElem, Numbering, NumberingPattern};
 use crate::routines::Routines;
 
-<<<<<<< HEAD
 /// ページや要素などの数え上げ。
 ///
 /// counter関数を用いることで、ページや見出し、図表などのカウンターにアクセスしたり、修正を加えたりできます。
@@ -34,23 +33,6 @@ use crate::routines::Routines;
 /// [`get`]($counter.get)関数を用いると、生のカウンター値にアクセスできます。
 /// この関数は[配列]($array)を返します。
 /// カウンターは（節や小節などの見出しでは）複数のレベルを持ち、配列の各アイテムが1つのレベルに対応します。
-=======
-/// Counts through pages, elements, and more.
-///
-/// With the counter function, you can access and modify counters for pages,
-/// headings, figures, and more. Moreover, you can define custom counters for
-/// other things you want to count.
-///
-/// Since counters change throughout the course of the document, their current
-/// value is _contextual._ It is recommended to read the chapter on [context]
-/// before continuing here.
-///
-/// # Accessing a counter { #accessing }
-/// To access the raw value of a counter, we can use the [`get`]($counter.get)
-/// function. This function returns an [array]: Counters can have multiple
-/// levels (in the case of headings for sections, subsections, and so on), and
-/// each item in the array corresponds to one level.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 ///
 /// ```example
 /// #set heading(numbering: "1.")
@@ -60,18 +42,10 @@ use crate::routines::Routines;
 /// #context counter(heading).get()
 /// ```
 ///
-<<<<<<< HEAD
 /// # カウンターの表示 { #displaying }
 /// しばしば、カウンター値をより人間が読みやすい形で表示したいことがあります。
 /// そうするために、カウンターの[`display`]($counter.display)関数を呼び出します。
 /// この関数は現在のカウンター値を取得し、与えられた形式か自動的に推論された[番号付け]($numbering)で整形します。
-=======
-/// # Displaying a counter { #displaying }
-/// Often, we want to display the value of a counter in a more human-readable
-/// way. To do that, we can call the [`display`]($counter.display) function on
-/// the counter. This function retrieves the current counter value and formats
-/// it either with a provided or with an automatically inferred [numbering].
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 ///
 /// ```example
 /// #set heading(numbering: "1.")
@@ -89,7 +63,6 @@ use crate::routines::Routines;
 /// }
 /// ```
 ///
-<<<<<<< HEAD
 /// # カウンターの変更 { #modifying }
 /// `step`および`update`メソッドを用いてカウンターを変更できます。
 ///
@@ -103,23 +76,6 @@ use crate::routines::Routines;
 ///
 /// 見出しのカウンターは見出しが表示される前にインクリメントされます。
 /// そのため、2回目のupdateの後にカウンターが6であったとしても`Analysis`は7になります。
-=======
-/// # Modifying a counter { #modifying }
-/// To modify a counter, you can use the `step` and `update` methods:
-///
-/// - The `step` method increases the value of the counter by one. Because
-///   counters can have multiple levels , it optionally takes a `level`
-///   argument. If given, the counter steps at the given depth.
-///
-/// - The `update` method allows you to arbitrarily modify the counter. In its
-///   basic form, you give it an integer (or an array for multiple levels). For
-///   more flexibility, you can instead also give it a function that receives
-///   the current value and returns a new value.
-///
-/// The heading counter is stepped before the heading is displayed, so
-/// `Analysis` gets the number seven even though the counter is at six after the
-/// second update.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 ///
 /// ```example
 /// #set heading(numbering: "1.")
@@ -141,19 +97,11 @@ use crate::routines::Routines;
 /// }
 /// ```
 ///
-<<<<<<< HEAD
 /// # ページカウンター
 /// ページカウンターは特別です。
 /// 改ページごとに値がインクリメントされます。
 /// しかし、他のカウンターと同様に手動でインクリメントもできます。
 /// 例えば、前書きではローマ数字のページ番号を使い、メインのコンテンツではアラビア数字のページ番号へ変更し、ページカウンターを1にリセットできます。
-=======
-/// # Page counter
-/// The page counter is special. It is automatically stepped at each pagebreak.
-/// But like other counters, you can also step it manually. For example, you
-/// could have Roman page numbers for your preface, then switch to Arabic page
-/// numbers for your main content and reset the page counter to one.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 ///
 /// ```example
 /// >>> #set page(
@@ -176,15 +124,9 @@ use crate::routines::Routines;
 /// Arabic numbers.
 /// ```
 ///
-<<<<<<< HEAD
 /// # カスタムカウンター
 /// 独自のカウンターを定義するには文字列をキーとして`counter`関数を呼び出します。
 /// このキーはグローバルにカウンターを識別します。
-=======
-/// # Custom counters
-/// To define your own counter, call the `counter` function with a string as a
-/// key. This key identifies the counter globally.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 ///
 /// ```example
 /// #let mine = counter("mycounter")
@@ -195,20 +137,10 @@ use crate::routines::Routines;
 /// #context mine.display()
 /// ```
 ///
-<<<<<<< HEAD
 /// # インクリメント方法
 /// カスタムカウンターを定義して使用する場合、一般にカウンターを最初にインクリメントしてから表示するべきです。
 /// こうすることで、カウンターのインクリメント動作をインクリメントする要素に依存させられます。
 /// 例えばtheoremのカウンターを実装する場合、theoremの定義では最初にカウンターのstepを書いてインクリメントし、その後に初めてカウンターとtheoremの内容を表示します。
-=======
-/// # How to step
-/// When you define and use a custom counter, in general, you should first step
-/// the counter and then display it. This way, the stepping behaviour of a
-/// counter can depend on the element it is stepped for. If you were writing a
-/// counter for, let's say, theorems, your theorem's definition would thus first
-/// include the counter step and only then display the counter and the theorem's
-/// contents.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 ///
 /// ```example
 /// #let c = counter("theorem")
@@ -222,7 +154,6 @@ use crate::routines::Routines;
 /// #theorem[$2 < 3$]
 /// ```
 ///
-<<<<<<< HEAD
 /// この背景にある考え方は、見出しカウンターの例で説明するのが最適です。
 /// 見出しカウンターの更新は、その見出しのレベルに依存します。
 /// 見出しの直前にインクリメントすることで、第2レベルの見出しがあるとき、`1`から`1.1`へと正しく更新できます。
@@ -234,22 +165,6 @@ use crate::routines::Routines;
 /// # タイムトラベル
 /// カウンターはタイムトラベルができます！
 /// カウンターの最終的な値は実際に到達する前にわかりますし、文書の任意の特定の場所での値がどうなっていたかさえ決定できます。
-=======
-/// The rationale behind this is best explained on the example of the heading
-/// counter: An update to the heading counter depends on the heading's level. By
-/// stepping directly before the heading, we can correctly step from `1` to
-/// `1.1` when encountering a level 2 heading. If we were to step after the
-/// heading, we wouldn't know what to step to.
-///
-/// Because counters should always be stepped before the elements they count,
-/// they always start at zero. This way, they are at one for the first display
-/// (which happens after the first step).
-///
-/// # Time travel
-/// Counters can travel through time! You can find out the final value of the
-/// counter before it is reached and even determine what the value was at any
-/// particular location in the document.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 ///
 /// ```example
 /// #let mine = counter("mycounter")
@@ -270,16 +185,9 @@ use crate::routines::Routines;
 /// #mine.step()
 /// ```
 ///
-<<<<<<< HEAD
 /// # その他の状態 { #other-state }
 /// `counter`型は[state]型と密接に関係しています。
 /// Typstにおける状態管理のより詳しい詳細と、なぜ単に普通の変数をカウンターとして用いないのかについては、stateのドキュメントを参照してください。
-=======
-/// # Other kinds of state { #other-state }
-/// The `counter` type is closely related to [state] type. Read its
-/// documentation for more details on state management in Typst and why it
-/// doesn't just use normal variables for counters.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 #[ty(scope)]
 #[derive(Debug, Clone, PartialEq, Hash)]
 pub struct Counter(CounterKey);
@@ -483,7 +391,6 @@ impl Counter {
 
 #[scope]
 impl Counter {
-<<<<<<< HEAD
     /// キーで識別される新しいカウンターの作成。
     #[func(constructor)]
     pub fn construct(
@@ -496,38 +403,15 @@ impl Counter {
         ///   - 要素関数が与えられた場合、その型を持つ要素がカウントされます
         ///   - [`where`]($function.where)セレクターが与えられた場合、特定フィールドの要素がカウントされます
         ///   - [`{<label>}`]($label)が与えられた場合、そのラベルを持つ要素がカウントされます
-=======
-    /// Create a new counter identified by a key.
-    #[func(constructor)]
-    pub fn construct(
-        /// The key that identifies this counter globally.
-        ///
-        /// - If it is a string, creates a custom counter that is only affected
-        ///   by manual updates,
-        /// - If it is the [`page`] function, counts through pages,
-        /// - If it is a [selector], counts through elements that match the
-        ///   selector. For example,
-        ///   - provide an element function: counts elements of that type,
-        ///   - provide a [`where`]($function.where) selector:
-        ///     counts a type of element with specific fields,
-        ///   - provide a [`{<label>}`]($label): counts elements with that label.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
         key: CounterKey,
     ) -> Counter {
         Self::new(key)
     }
 
-<<<<<<< HEAD
     /// 現在のロケーションでのカウンター値を取得。
     /// カウンターが1つの数値しか持たない場合でも、常に整数の配列を返します。
     ///
     /// これは`{counter.at(here())}`と等価です。
-=======
-    /// Retrieves the value of the counter at the current location. Always
-    /// returns an array of integers, even if the counter has just one number.
-    ///
-    /// This is equivalent to `{counter.at(here())}`.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     #[func(contextual)]
     pub fn get(
         &self,
@@ -539,19 +423,13 @@ impl Counter {
         self.at_loc(engine, loc)
     }
 
-<<<<<<< HEAD
     /// 番号付けされたカウンターの現在の値の表示および戻り値としての整形された出力。
-=======
-    /// Displays the current value of the counter with a numbering and returns
-    /// the formatted output.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     #[func(contextual)]
     pub fn display(
         self,
         engine: &mut Engine,
         context: Tracked<Context>,
         span: Span,
-<<<<<<< HEAD
     /// カウンターをどのように表示するか指定する[番号付けのパターンまたは関数]($numbering)。
     /// 関数が与えられた場合、カウンターの各数値が別々の引数として関数に渡されます。
     /// 見出しの番号付けを関数指定するときなどの、引数の数値の数が変化する場合は[引数シンク]($arguments)が使用できます。
@@ -563,23 +441,6 @@ impl Counter {
     /// 有効化された場合、トップレベルのカウンターの現在値と最終値を一緒に表示します。
     /// 両者のスタイル設定は1つの番号付けパターンで指定できます。
     /// これは、ページのnumberingプロパティで`{"1 / 1"}`のようなパターンが与えられたときに、現在のページ番号と総ページ数を表示するために使用されます。
-=======
-        /// A [numbering pattern or a function]($numbering), which specifies how
-        /// to display the counter. If given a function, that function receives
-        /// each number of the counter as a separate argument. If the amount of
-        /// numbers varies, e.g. for the heading argument, you can use an
-        /// [argument sink]($arguments).
-        ///
-        /// If this is omitted or set to `{auto}`, displays the counter with the
-        /// numbering style for the counted element or with the pattern
-        /// `{"1.1"}` if no such style exists.
-        #[default]
-        numbering: Smart<Numbering>,
-        /// If enabled, displays the current and final top-level count together.
-        /// Both can be styled through a single numbering pattern. This is used
-        /// by the page numbering property to display the current and total
-        /// number of pages when a pattern like `{"1 / 1"}` is given.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
         #[named]
         #[default(false)]
         both: bool,
@@ -588,44 +449,26 @@ impl Counter {
         self.display_impl(engine, loc, numbering, both, context.styles().ok())
     }
 
-<<<<<<< HEAD
     /// 指定された位置のカウンター値の取得。
     /// カウンターが1つの数値しか持たない場合でも、常に整数の配列を返します。
     ///
     /// `selector`は文書中で厳密に1つだけの要素にマッチしなければなりません。
     /// この目的で最も便利なセレクターは[ラベル]($label)と[ロケーション]($location)です。
-=======
-    /// Retrieves the value of the counter at the given location. Always returns
-    /// an array of integers, even if the counter has just one number.
-    ///
-    /// The `selector` must match exactly one element in the document. The most
-    /// useful kinds of selectors for this are [labels]($label) and
-    /// [locations]($location).
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     #[func(contextual)]
     pub fn at(
         &self,
         engine: &mut Engine,
         context: Tracked<Context>,
         span: Span,
-<<<<<<< HEAD
     /// カウンター値を取得する場所。
-=======
-        /// The place at which the counter's value should be retrieved.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
         selector: LocatableSelector,
     ) -> SourceResult<CounterState> {
         let loc = selector.resolve_unique(engine.introspector, context).at(span)?;
         self.at_loc(engine, loc)
     }
 
-<<<<<<< HEAD
     /// 文書の終わりでのカウンター値の取得。
     /// カウンターが1つの数値しか持たない場合でも、常に整数の配列を返します。
-=======
-    /// Retrieves the value of the counter at the end of the document. Always
-    /// returns an array of integers, even if the counter has just one number.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     #[func(contextual)]
     pub fn final_(
         &self,
@@ -643,33 +486,18 @@ impl Counter {
         Ok(state)
     }
 
-<<<<<<< HEAD
     /// カウンター値を1増加。
     ///
     /// 更新は、返り値であるコンテンツが文書中に挿入された位置で適用されます。
     /// 文書中に出力がなければ何も起こりません！
     /// 例えば`{let _ = counter(page).step()}`と書いた場合が、この何も起きないときに該当します。
     /// カウンターの更新は常にレイアウト順に適用されるため、この場合にはTypstはいつカウンターをインクリメントするのか分かりません。
-=======
-    /// Increases the value of the counter by one.
-    ///
-    /// The update will be in effect at the position where the returned content
-    /// is inserted into the document. If you don't put the output into the
-    /// document, nothing happens! This would be the case, for example, if you
-    /// write `{let _ = counter(page).step()}`. Counter updates are always
-    /// applied in layout order and in that case, Typst wouldn't know when to
-    /// step the counter.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     #[func]
     pub fn step(
         self,
         span: Span,
-<<<<<<< HEAD
     /// カウンターをインクリメントする深さ。
     /// デフォルトは`{1}`です。
-=======
-        /// The depth at which to step the counter. Defaults to `{1}`.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
         #[named]
         #[default(NonZeroUsize::ONE)]
         level: NonZeroUsize,
@@ -677,29 +505,15 @@ impl Counter {
         self.update(span, CounterUpdate::Step(level))
     }
 
-<<<<<<< HEAD
     /// カウンター値の更新。
     ///
     /// `step`と同様に、生成されたコンテンツが文書中へ配置されたときに限り更新が発生します。
-=======
-    /// Updates the value of the counter.
-    ///
-    /// Just like with `step`, the update only occurs if you put the resulting
-    /// content into the document.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     #[func]
     pub fn update(
         self,
         span: Span,
-<<<<<<< HEAD
     /// 整数か整数の配列が与えられた場合、カウンターをその値に設定します。
     /// 関数が与えられた場合、その関数は（各数値を別々の引数として）前のカウンターの値を受け取り、新しい値を（整数または配列で）返さなければなりません。
-=======
-        /// If given an integer or array of integers, sets the counter to that
-        /// value. If given a function, that function receives the previous
-        /// counter value (with each number as a separate argument) and has to
-        /// return the new value (integer or array).
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
         update: CounterUpdate,
     ) -> Content {
         CounterUpdateElem::new(self.0, update).pack().spanned(span)
diff --git a/crates/typst-library/src/introspection/here.rs b/crates/typst-library/src/introspection/here.rs
index 84118eac66..50e2359104 100644
--- a/crates/typst-library/src/introspection/here.rs
+++ b/crates/typst-library/src/introspection/here.rs
@@ -4,7 +4,6 @@ use crate::diag::HintedStrResult;
 use crate::foundations::{Context, func};
 use crate::introspection::Location;
 
-<<<<<<< HEAD
 /// 文書中における現在のロケーションを提供。
 ///
 /// `here`はアクティブな[コンテキスト]($context)から現在のロケーションを直接取得する低レベルな構成要素と考えられます。
@@ -18,26 +17,6 @@ use crate::introspection::Location;
 ///
 /// # 例
 /// [`position`]($location.position)メソッドと組み合わせて文書中での現在位置を決定します。
-=======
-/// Provides the current location in the document.
-///
-/// You can think of `here` as a low-level building block that directly extracts
-/// the current location from the active [context]. Some other functions use it
-/// internally: For instance, `{counter.get()}` is equivalent to
-/// `{counter.at(here())}`.
-///
-/// Within show rules on [locatable]($location/#locatable) elements, `{here()}`
-/// will match the location of the shown element.
-///
-/// If you want to display the current page number, refer to the documentation
-/// of the [`counter`] type. While `here` can be used to determine the physical
-/// page number, typically you want the logical page number that may, for
-/// instance, have been reset after a preface.
-///
-/// # Examples
-/// Determining the current position in the document in combination with the
-/// [`position`]($location.position) method:
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 /// ```example
 /// #context [
 ///   I am located at
@@ -45,11 +24,7 @@ use crate::introspection::Location;
 /// ]
 /// ```
 ///
-<<<<<<< HEAD
 /// 現在位置より前にある要素に対して[クエリ]($query)を実行します。
-=======
-/// Running a [query] for elements before the current position:
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 /// ```example
 /// = Introduction
 /// = Background
@@ -62,11 +37,7 @@ use crate::introspection::Location;
 ///
 /// = Conclusion
 /// ```
-<<<<<<< HEAD
 /// セレクターのbeforeおよびafterに関する詳細は[`selector`]型のドキュメントを参照してください。
-=======
-/// Refer to the [`selector`] type for more details on before/after selectors.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 #[func(contextual)]
 pub fn here(context: Tracked<Context>) -> HintedStrResult<Location> {
     context.location()
diff --git a/crates/typst-library/src/introspection/locate.rs b/crates/typst-library/src/introspection/locate.rs
index bc6e75a564..f4953d1812 100644
--- a/crates/typst-library/src/introspection/locate.rs
+++ b/crates/typst-library/src/introspection/locate.rs
@@ -5,7 +5,6 @@ use crate::engine::Engine;
 use crate::foundations::{Context, LocatableSelector, func};
 use crate::introspection::Location;
 
-<<<<<<< HEAD
 /// 文書中の要素のロケーションを特定。
 ///
 /// 厳密に1つだけの要素にマッチしなければならないセレクターを受け取り、要素の[`location`]を返します。
@@ -13,17 +12,6 @@ use crate::introspection::Location;
 ///
 /// # 例
 /// 特定の要素のロケーションを特定します。
-=======
-/// Determines the location of an element in the document.
-///
-/// Takes a selector that must match exactly one element and returns that
-/// element's [`location`]. This location can, in particular, be used to
-/// retrieve the physical [`page`]($location.page) number and
-/// [`position`]($location.position) (page, x, y) for that element.
-///
-/// # Examples
-/// Locating a specific element:
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 /// ```example
 /// #context [
 ///   Introduction is at: \
@@ -36,22 +24,12 @@ use crate::introspection::Location;
 pub fn locate(
     engine: &mut Engine,
     context: Tracked<Context>,
-<<<<<<< HEAD
     /// 厳密に1つだけの要素にマッチしなければならないセレクター。
     /// その要素のロケーションが決定されます。
     ///
     /// 以下との組み合わせが特に便利です。
     /// - [`here`]と組み合わせた現在のコンテキストでのロケーションの特定
     /// - 何らかのクエリで得られた要素からコンテンツの[`location()`]($content.location)メソッドを用いて取得した[`location`]
-=======
-    /// A selector that should match exactly one element. This element will be
-    /// located.
-    ///
-    /// Especially useful in combination with
-    /// - [`here`] to locate the current context,
-    /// - a [`location`] retrieved from some queried element via the
-    ///   [`location()`]($content.location) method on content.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     selector: LocatableSelector,
 ) -> HintedStrResult<Location> {
     selector.resolve_unique(engine.introspector, context)
diff --git a/crates/typst-library/src/introspection/location.rs b/crates/typst-library/src/introspection/location.rs
index cf0bb913bb..ca4780c092 100644
--- a/crates/typst-library/src/introspection/location.rs
+++ b/crates/typst-library/src/introspection/location.rs
@@ -8,7 +8,6 @@ use crate::foundations::{Repr, func, scope, ty};
 use crate::layout::Position;
 use crate::model::Numbering;
 
-<<<<<<< HEAD
 /// 文書中の要素の識別。
 ///
 /// locationは文書中の要素を一意に識別し、ページ中での絶対位置へのアクセスを提供します。
@@ -36,38 +35,6 @@ use crate::model::Numbering;
 ///
 /// ロケータブルでない要素でも、ラベルが付いている場合は
 /// クエリで観測できることがあります。
-=======
-/// Identifies an element in the document.
-///
-/// A location uniquely identifies an element in the document and lets you
-/// access its absolute position on the pages. You can retrieve the current
-/// location with the [`here`] function and the location of a queried or shown
-/// element with the [`location()`]($content.location) method on content.
-///
-/// # Locatable elements { #locatable }
-/// Elements that are automatically assigned a location are called _locatable._
-/// For efficiency reasons, not all elements are locatable.
-///
-/// - In the [Model category]($category/model), most elements are locatable.
-///   This is because semantic elements like [headings]($heading) and
-///   [figures]($figure) are often used with introspection.
-///
-/// - In the [Text category]($category/text), the [`raw`] element, and the
-///   decoration elements [`underline`], [`overline`], [`strike`], and
-///   [`highlight`] are locatable as these are also quite semantic in nature.
-///
-/// - In the [Introspection category]($category/introspection), the [`metadata`]
-///   element is locatable as being queried for is its primary purpose.
-///
-/// - In the other categories, most elements are not locatable. Exceptions are
-///   [`math.equation`] and [`image`].
-///
-/// To find out whether a specific element is locatable, you can try to
-/// [`query`] for it.
-///
-/// Note that you can still observe elements that are not locatable in queries
-/// through other means, for instance, when they have a label attached to them.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 #[ty(scope)]
 #[derive(Copy, Clone, Eq, PartialEq, Hash)]
 pub struct Location(u128);
@@ -95,7 +62,6 @@ impl Location {
 
 #[scope]
 impl Location {
-<<<<<<< HEAD
     /// このlocationのページ番号を返します。
     ///
     /// このlocationの[ページカウンター]($counter)の値を返すのではなく、（1始まりの）実際のページ番号を返すことに注意してください。
@@ -103,18 +69,6 @@ impl Location {
     /// ページカウンターの値が知りたい場合は代わりに`{counter(page).at(loc)}`を使用してください。
     ///
     /// [`here`]と組み合わせることで現在のコンテキストにおける実際のページ番号が取得できます。
-=======
-    /// Returns the page number for this location.
-    ///
-    /// Note that this does not return the value of the [page counter]($counter)
-    /// at this location, but the true page number (starting from one).
-    ///
-    /// If you want to know the value of the page counter, use
-    /// `{counter(page).at(loc)}` instead.
-    ///
-    /// Can be used with [`here`] to retrieve the physical page position
-    /// of the current context:
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     /// ```example
     /// #context [
     ///   I am located on
@@ -126,39 +80,20 @@ impl Location {
         engine.introspector.page(self)
     }
 
-<<<<<<< HEAD
     /// このlocationのページ番号とx座標とy座標を辞書で返します。
     /// ページ番号は1始まりで、座標はページの左上から測ります。
     ///
     /// ページ番号のみに興味がある場合は、代わりに`page()`を使用すると不要な処理を省略できます。
-=======
-    /// Returns a dictionary with the page number and the x, y position for this
-    /// location. The page number starts at one and the coordinates are measured
-    /// from the top-left of the page.
-    ///
-    /// If you only need the page number, use `page()` instead as it allows
-    /// Typst to skip unnecessary work.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     #[func]
     pub fn position(self, engine: &mut Engine) -> Position {
         engine.introspector.position(self)
     }
 
-<<<<<<< HEAD
     /// このlocationのページ番号の番号付けパターンを返します。
     /// これにより、ページカウンターの表示する際に、その位置での番号付けを取得できます。
     /// これは独自の索引やアウトラインを作成する場合に便利です。
     ///
     /// そのロケーションのページの番号付けが`{none}`に設定されていた場合、`{none}`を返します。
-=======
-    /// Returns the page numbering pattern of the page at this location. This
-    /// can be used when displaying the page counter in order to obtain the
-    /// local numbering. This is useful if you are building custom indices or
-    /// outlines.
-    ///
-    /// If the page numbering is set to `{none}` at that location, this function
-    /// returns `{none}`.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     #[func]
     pub fn page_numbering(self, engine: &mut Engine) -> Option<Numbering> {
         engine.introspector.page_numbering(self).cloned()
diff --git a/crates/typst-library/src/introspection/metadata.rs b/crates/typst-library/src/introspection/metadata.rs
index a24a3fb1d5..4e9e5855e7 100644
--- a/crates/typst-library/src/introspection/metadata.rs
+++ b/crates/typst-library/src/introspection/metadata.rs
@@ -1,7 +1,6 @@
 use crate::foundations::{Value, elem};
 use crate::introspection::Locatable;
 
-<<<<<<< HEAD
 /// 可視コンテンツの生成を伴わないクエリシステムへの値の公開。
 ///
 /// この要素は[`query`]関数や[`typst query`]($reference/introspection/query/#command-line-queries)を用いてコマンドラインから取得できます。
@@ -9,19 +8,6 @@ use crate::introspection::Locatable;
 /// メタデータの値を他と識別するために、[`label`]を付けて、それを検索できます。
 ///
 /// `metadata`要素は、外部に任意の値を公開できるため、特にコマンドラインクエリで便利です。
-=======
-/// Exposes a value to the query system without producing visible content.
-///
-/// This element can be retrieved with the [`query`] function and from the
-/// command line with
-/// [`typst query`]($reference/introspection/query/#command-line-queries). Its
-/// purpose is to expose an arbitrary value to the introspection system. To
-/// identify a metadata value among others, you can attach a [`label`] to it and
-/// query for that label.
-///
-/// The `metadata` element is especially useful for command line queries because
-/// it allows you to expose arbitrary values to the outside world.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 ///
 /// ```example
 /// // Put metadata somewhere.
@@ -34,11 +20,7 @@ use crate::introspection::Locatable;
 /// ```
 #[elem(Locatable)]
 pub struct MetadataElem {
-<<<<<<< HEAD
     /// 文書に埋め込む値。
-=======
-    /// The value to embed into the document.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     #[required]
     pub value: Value,
 }
diff --git a/crates/typst-library/src/introspection/query.rs b/crates/typst-library/src/introspection/query.rs
index 0313c2406d..bf26bd673f 100644
--- a/crates/typst-library/src/introspection/query.rs
+++ b/crates/typst-library/src/introspection/query.rs
@@ -4,7 +4,6 @@ use crate::diag::HintedStrResult;
 use crate::engine::Engine;
 use crate::foundations::{Array, Context, LocatableSelector, Value, func};
 
-<<<<<<< HEAD
 /// 文書中の要素の検索。
 ///
 /// `query`関数を用いると特定の型やラベルを持った要素を文書内から探せます。
@@ -19,26 +18,6 @@ use crate::foundations::{Array, Context, LocatableSelector, Value, func};
 /// `outlined`フィールドは"Table of Contents"という見出し自身を取り除くために使われます。
 ///
 /// `query`関数を使用可能にするため、`context`を作成していることに注意してください。
-=======
-/// Finds elements in the document.
-///
-/// The `query` function lets you search your document for elements of a
-/// particular type or with a particular label. To use it, you first need to
-/// ensure that [context] is available.
-///
-
-/// # Finding elements
-/// In the example below, we manually create a table of contents instead of
-/// using the [`outline`] function.
-///
-/// To do this, we first query for all headings in the document at level 1 and
-/// where `outlined` is true. Querying only for headings at level 1 ensures
-/// that, for the purpose of this example, sub-headings are not included in the
-/// table of contents. The `outlined` field is used to exclude the "Table of
-/// Contents" heading itself.
-///
-/// Note that we open a `context` to be able to use the `query` function.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 ///
 /// ```example
 /// >>> #set page(
@@ -79,7 +58,6 @@ use crate::foundations::{Array, Context, LocatableSelector, Value, func};
 /// #lorem(18)
 /// ```
 ///
-<<<<<<< HEAD
 /// ページ番号を取得するため、まず[`location`]($content.location)メソッドを用いて`query`が返す要素のロケーションを取得します。
 /// 続けて、その位置にある[ページの番号付け]($location.page-numbering)と[ページカウンター]($counter/#page-counter)を取得し、カウンターに番号付けを適用します。
 ///
@@ -99,31 +77,6 @@ use crate::foundations::{Array, Context, LocatableSelector, Value, func};
 ///
 /// 一般に、クエリ自身に影響を与えるようなクエリを書こうとしてはいけません。
 /// [カウンター]($counter)や[状態]($state)などの他の内省機能にも同じ注意が必要です。
-=======
-/// To get the page numbers, we first get the location of the elements returned
-/// by `query` with [`location`]($content.location). We then also retrieve the
-/// [page numbering]($location.page-numbering) and [page
-/// counter]($counter/#page-counter) at that location and apply the numbering to
-/// the counter.
-///
-/// # A word of caution { #caution }
-/// To resolve all your queries, Typst evaluates and layouts parts of the
-/// document multiple times. However, there is no guarantee that your queries
-/// can actually be completely resolved. If you aren't careful a query can
-/// affect itself—leading to a result that never stabilizes.
-///
-/// In the example below, we query for all headings in the document. We then
-/// generate as many headings. In the beginning, there's just one heading,
-/// titled `Real`. Thus, `count` is `1` and one `Fake` heading is generated.
-/// Typst sees that the query's result has changed and processes it again. This
-/// time, `count` is `2` and two `Fake` headings are generated. This goes on and
-/// on. As we can see, the output has a finite amount of headings. This is
-/// because Typst simply gives up after a few attempts.
-///
-/// In general, you should try not to write queries that affect themselves. The
-/// same words of caution also apply to other introspection features like
-/// [counters]($counter) and [state].
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 ///
 /// ```example
 /// = Real
@@ -134,28 +87,16 @@ use crate::foundations::{Array, Context, LocatableSelector, Value, func};
 /// }
 /// ```
 ///
-<<<<<<< HEAD
 /// # コマンドラインクエリ
 /// `typst query`コマンドを用いてコマンドラインからクエリも実行できます。
 /// このコマンドは文書上で任意のクエリを実行し、シリアライズされた形で結果の要素を返します。
 /// 以下の何らかの不可視の[メタデータ]($metadata)を含んだ`example.typ`ファイルを考えます。
-=======
-/// # Command line queries
-/// You can also perform queries from the command line with the `typst query`
-/// command. This command executes an arbitrary query on the document and
-/// returns the resulting elements in serialized form. Consider the following
-/// `example.typ` file which contains some invisible [metadata]:
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 ///
 /// ```typ
 /// #metadata("This is a note") <note>
 /// ```
 ///
-<<<<<<< HEAD
 /// Typst CLIを用いて、以下のようにこのファイルを対象にクエリを実行できます。
-=======
-/// You can execute a query on it as follows using Typst's CLI:
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 /// ```sh
 /// $ typst query example.typ "<note>"
 /// [
@@ -167,32 +108,18 @@ use crate::foundations::{Array, Context, LocatableSelector, Value, func};
 /// ]
 /// ```
 ///
-<<<<<<< HEAD
 /// ## 特定のフィールドの取得
 ///
 /// 多くの場合、結果となる要素では特定の1つのフィールドだけが関心の対象です。
 /// `metadata`要素の場合、`value`フィールドが興味の対象です。
 /// `--field`引数を用いてこのフィールドのみを抽出できます。
-=======
-/// ## Retrieving a specific field
-///
-/// Frequently, you're interested in only one specific field of the resulting
-/// elements. In the case of the `metadata` element, the `value` field is the
-/// interesting one. You can extract just this field with the `--field`
-/// argument.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 ///
 /// ```sh
 /// $ typst query example.typ "<note>" --field value
 /// ["This is a note"]
 /// ```
 ///
-<<<<<<< HEAD
 /// 単一の要素にのみ興味がある場合は、`--one`フラグを用いてその要素のみを抽出できます。
-=======
-/// If you are interested in just a single element, you can use the `--one`
-/// flag to extract just it.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 ///
 /// ```sh
 /// $ typst query example.typ "<note>" --field value --one
@@ -208,7 +135,6 @@ use crate::foundations::{Array, Context, LocatableSelector, Value, func};
 pub fn query(
     engine: &mut Engine,
     context: Tracked<Context>,
-<<<<<<< HEAD
     /// - `heading`や`figure`のような要素関数
     /// - `{<label>}`
     /// - `{heading.where(level: 1)}`のような、より複雑なセレクター
@@ -217,15 +143,6 @@ pub fn query(
     /// が可能です。
     ///
     /// [ロケータブル]($location/#locatable)要素関数がサポートされています。
-=======
-    /// Can be
-    /// - an element function like a `heading` or `figure`,
-    /// - a `{<label>}`,
-    /// - a more complex selector like `{heading.where(level: 1)}`,
-    /// - or `{selector(heading).before(here())}`.
-    ///
-    /// Only [locatable]($location/#locatable) element functions are supported.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     target: LocatableSelector,
 ) -> HintedStrResult<Array> {
     context.introspect()?;
diff --git a/crates/typst-library/src/introspection/state.rs b/crates/typst-library/src/introspection/state.rs
index 5b7ab23c6b..aa2a0d6baf 100644
--- a/crates/typst-library/src/introspection/state.rs
+++ b/crates/typst-library/src/introspection/state.rs
@@ -12,23 +12,12 @@ use crate::foundations::{
 use crate::introspection::{Introspector, Locatable, Location};
 use crate::routines::Routines;
 
-<<<<<<< HEAD
 /// 文書中の状態の管理。
 ///
 /// 文書中で何回か計算し、最後の計算結果を次の計算で使用するために記憶しておきたいとします。
 /// 以下と同等のコードを試すと10、13、26、21と出力されることを期待するでしょう。
 /// しかしTypstでは**そうはなりません**。
 /// このコードを試してみると、Typstは_Variables from outside the function are read-only and cannot be modified._というエラーメッセージを出力することが分かります。
-=======
-/// Manages stateful parts of your document.
-///
-/// Let's say you have some computations in your document and want to remember
-/// the result of your last computation to use it in the next one. You might try
-/// something similar to the code below and expect it to output 10, 13, 26, and
-/// 21. However this **does not work** in Typst. If you test this code, you will
-/// see that Typst complains with the following error message: _Variables from
-/// outside the function are read-only and cannot be modified._
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 ///
 /// ```typ
 /// // This doesn't work!
@@ -46,7 +35,6 @@ use crate::routines::Routines;
 /// #compute("⭐ - 5")
 /// ```
 ///
-<<<<<<< HEAD
 /// # 状態と文書のマークアップ { #state-and-markup }
 /// なぜこうなるのでしょうか？
 /// 一般的に副作用を伴うこの手の計算は文書のマークアップにおいて問題を引き起こすためで、Typstではこれをエラーとして扱います。
@@ -59,19 +47,6 @@ use crate::routines::Routines;
 /// ただ1を足すだけです。
 /// 残念ながらそう単純ではないのです。
 /// 以下の例を考えます。
-=======
-/// # State and document markup { #state-and-markup }
-/// Why does it do that? Because, in general, this kind of computation with side
-/// effects is problematic in document markup and Typst is upfront about that.
-/// For the results to make sense, the computation must proceed in the same
-/// order in which the results will be laid out in the document. In our simple
-/// example, that's the case, but in general it might not be.
-///
-/// Let's look at a slightly different, but similar kind of state: The heading
-/// numbering. We want to increase the heading counter at each heading. Easy
-/// enough, right? Just add one. Well, it's not that simple. Consider the
-/// following example:
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 ///
 /// ```example
 /// #set heading(numbering: "1.")
@@ -87,7 +62,6 @@ use crate::routines::Routines;
 /// ...
 /// ```
 ///
-<<<<<<< HEAD
 /// ここで、Typstはまずshowルール以降の文書本体を処理し、`Introduction`見出しを検知します。
 /// 続いて`template`関数に生成コンテンツを渡します。
 /// その後、初めて`Outline`を検知します。
@@ -108,30 +82,6 @@ use crate::routines::Routines;
 /// 関数が与えられた場合、その関数は前の状態を受け取り、新しい状態を返さなければなりません。
 ///
 /// 最初の例は以下のようになります。
-=======
-/// Here, Typst first processes the body of the document after the show rule,
-/// sees the `Introduction` heading, then passes the resulting content to the
-/// `template` function and only then sees the `Outline`. Just counting up would
-/// number the `Introduction` with `1` and the `Outline` with `2`.
-///
-/// # Managing state in Typst { #state-in-typst }
-/// So what do we do instead? We use Typst's state management system. Calling
-/// the `state` function with an identifying string key and an optional initial
-/// value gives you a state value which exposes a few functions. The two most
-/// important ones are `get` and `update`:
-///
-/// - The [`get`]($state.get) function retrieves the current value of the state.
-///   Because the value can vary over the course of the document, it is a
-///   _contextual_ function that can only be used when [context]($context) is
-///   available.
-///
-/// - The [`update`]($state.update) function modifies the state. You can give it
-///   any value. If given a non-function value, it sets the state to that value.
-///   If given a function, that function receives the previous state and has to
-///   return the new state.
-///
-/// Our initial example would now look like this:
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 ///
 /// ```example
 /// #let star = state("star", 0)
@@ -148,19 +98,10 @@ use crate::routines::Routines;
 /// #compute("⭐ - 5")
 /// ```
 ///
-<<<<<<< HEAD
 /// Typstが管理する状態は常に評価順ではなくレイアウト順で更新されます。
 /// `update`メソッドはコンテンツを返し、その影響は文書に返されたコンテンツが挿入された場所で生じます。
 ///
 /// こうして、計算結果を変数へ保存できるようになり、正しい結果を表示しています。
-=======
-/// State managed by Typst is always updated in layout order, not in evaluation
-/// order. The `update` method returns content and its effect occurs at the
-/// position where the returned content is inserted into the document.
-///
-/// As a result, we can now also store some of the computations in variables,
-/// but they still show the correct results:
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 ///
 /// ```example
 /// >>> #let star = state("star", 0)
@@ -182,7 +123,6 @@ use crate::routines::Routines;
 /// #more
 /// ```
 ///
-<<<<<<< HEAD
 /// この例はもちろん少々極端ですが、これが実際に本当に必要となることがよくあります！
 /// 良い例は見出しカウンターです。
 /// これはTypstの[カウンターシステム]($counter)が状態システムにとてもよく似ているためです。
@@ -191,18 +131,6 @@ use crate::routines::Routines;
 /// Typstの状態管理システムを使用するとタイムトラベルもできます！
 /// 文書内の任意の位置でその状態がどの値になっているのかを、どこからでも突き止められます。
 /// 特に、`at`メソッドを用いると特定の任意の位置での状態値が取得でき、`final`メソッドを用いると文書の終わりでの状態値を取得できます。
-=======
-/// This example is of course a bit silly, but in practice this is often exactly
-/// what you want! A good example are heading counters, which is why Typst's
-/// [counting system]($counter) is very similar to its state system.
-///
-/// # Time Travel
-/// By using Typst's state management system you also get time travel
-/// capabilities! We can find out what the value of the state will be at any
-/// position in the document from anywhere else. In particular, the `at` method
-/// gives us the value of the state at any particular location and the `final`
-/// methods gives us the value of the state at the end of the document.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 ///
 /// ```example
 /// >>> #let star = state("star", 0)
@@ -224,7 +152,6 @@ use crate::routines::Routines;
 /// #compute("⭐ - 5")
 /// ```
 ///
-<<<<<<< HEAD
 /// # 注意事項 { #caution }
 /// 全ての状態値を解決するために、Typstはコードを複数回評価します。
 /// しかしながら、実際に状態操作が完全に解決されるかは保証されません。
@@ -234,19 +161,6 @@ use crate::routines::Routines;
 /// 状態を`1`で初期化し、続いて自身の最終値に1を足した値に更新します。
 /// したがって値は`2`になるべきですが、最終値が`2`となったので`3`に更新します。以下同様です。
 /// この例では有限値が表示されていますが、これは単にTypstが数回試行した後に諦めるためです。
-=======
-/// # A word of caution { #caution }
-/// To resolve the values of all states, Typst evaluates parts of your code
-/// multiple times. However, there is no guarantee that your state manipulation
-/// can actually be completely resolved.
-///
-/// For instance, if you generate state updates depending on the final value of
-/// a state, the results might never converge. The example below illustrates
-/// this. We initialize our state with `1` and then update it to its own final
-/// value plus 1. So it should be `2`, but then its final value is `2`, so it
-/// should be `3`, and so on. This example displays a finite value because Typst
-/// simply gives up after a few attempts.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 ///
 /// ```example
 /// // This is bad!
@@ -255,17 +169,9 @@ use crate::routines::Routines;
 /// #context x.get()
 /// ```
 ///
-<<<<<<< HEAD
 /// 一般に、コンテキスト内部で更新する状態を作成しないようにしてください。
 /// 可能であれば、更新内容をコンテキストに依存しない値として、あるいは前の値から新しい値を計算する関数として定義してください。
 /// どうしても避けられない場合がありますが、その場合は結果が適切に収束することを保証することはあなたの責任です。
-=======
-/// In general, you should try not to generate state updates from within context
-/// expressions. If possible, try to express your updates as non-contextual
-/// values or functions that compute the new value from the previous value.
-/// Sometimes, it cannot be helped, but in those cases it is up to you to ensure
-/// that the result converges.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 #[ty(scope)]
 #[derive(Debug, Clone, PartialEq, Hash)]
 pub struct State {
@@ -352,7 +258,6 @@ impl State {
 
 #[scope]
 impl State {
-<<<<<<< HEAD
     /// キーで識別される新しい状態の作成。
     #[func(constructor)]
     pub fn construct(
@@ -366,24 +271,6 @@ impl State {
         /// 同じ`key`でも`init`が異なる場合、各状態は自分の初期値を使いますが、
         /// 更新は共有されます。つまり、ある場所での状態値は、その状態の初期値と
         /// それ以前の更新から計算されます。
-=======
-    /// Create a new state identified by a key.
-    #[func(constructor)]
-    pub fn construct(
-        /// The key that identifies this state.
-        ///
-        /// Any [updates]($state.update) to the state will be identified with
-        /// the string key. If you construct multiple states with the same
-        /// `key`, then updating any one will affect all of them.
-        key: Str,
-        /// The initial value of the state.
-        ///
-        /// If you construct multiple states with the same `key` but different
-        /// `init` values, they will each use their own initial value but share
-        /// updates. Specifically, the value of a state at some location in the
-        /// document will be computed from that state's initial value and all
-        /// preceding updates for the state's key.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
         ///
         /// ```example
         /// #let banana = state("key", "🍌")
@@ -403,15 +290,9 @@ impl State {
         Self::new(key, init)
     }
 
-<<<<<<< HEAD
     /// 現在のロケーションでの状態値を取得。
     ///
     /// これは`{state.at(here())}`と等価です。
-=======
-    /// Retrieves the value of the state at the current location.
-    ///
-    /// This is equivalent to `{state.at(here())}`.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     #[typst_macros::time(name = "state.get", span = span)]
     #[func(contextual)]
     pub fn get(
@@ -424,18 +305,10 @@ impl State {
         self.at_loc(engine, loc)
     }
 
-<<<<<<< HEAD
     /// 指定したセレクターで一意に特定される対象の状態値を取得。
     ///
     /// `selector`は文書中で厳密に1つだけの要素にマッチしなければなりません。
     /// この目的で最も便利なセレクターは[ラベル]($label)と[ロケーション]($location)です。
-=======
-    /// Retrieves the value of the state at the given selector's unique match.
-    ///
-    /// The `selector` must match exactly one element in the document. The most
-    /// useful kinds of selectors for this are [labels]($label) and
-    /// [locations]($location).
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     #[typst_macros::time(name = "state.at", span = span)]
     #[func(contextual)]
     pub fn at(
@@ -443,22 +316,14 @@ impl State {
         engine: &mut Engine,
         context: Tracked<Context>,
         span: Span,
-<<<<<<< HEAD
     /// 状態値を取得する場所。
-=======
-        /// The place at which the state's value should be retrieved.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
         selector: LocatableSelector,
     ) -> SourceResult<Value> {
         let loc = selector.resolve_unique(engine.introspector, context).at(span)?;
         self.at_loc(engine, loc)
     }
 
-<<<<<<< HEAD
     /// 文書の終わりでの状態値の取得。
-=======
-    /// Retrieves the value of the state at the end of the document.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     #[func(contextual)]
     pub fn final_(
         &self,
@@ -471,19 +336,8 @@ impl State {
         Ok(sequence.last().unwrap().clone())
     }
 
-<<<<<<< HEAD
     /// 状態値を更新。
     ///
-    /// 更新は、返り値であるコンテンツが文書中に挿入された位置で適用されます。
-    /// 文書中に出力がなければ何も起こりません！
-    /// 例えば`{let _ = state("key").update(7)}`と書いた場合が、この何も起きないときに該当します。
-    /// 状態の更新は常にレイアウト順に適用されるため、この場合にはTypstはいつ状態を更新するのか分かりません。
-    ///
-    /// [`get`]($state.get)、[`at`]($state.at)、[`final`]($state.final)とは異なり、
-    /// この関数は[コンテキスト]($context)を必要としません。
-=======
-    /// Updates the value of the state.
-    ///
     /// Returns an invisible piece of [content] that must be inserted into the
     /// document to take effect. This invisible content tells Typst that the
     /// specified update should take place wherever the content is inserted into
@@ -513,12 +367,10 @@ impl State {
     /// is because, to create the state update, we do not need to know where in
     /// the document we are. We only need this information to resolve the
     /// state's value.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     #[func]
     pub fn update(
         self,
         span: Span,
-<<<<<<< HEAD
     /// 更新に使う値または関数。
     ///
     /// - 関数ではない値が与えられた場合、状態にその値を設定します。
@@ -547,39 +399,6 @@ impl State {
     ///
     /// #lorem(5).split().map(list.item).join()
     /// ```
-=======
-        /// A value to update to or a function to update with.
-        ///
-        /// - If given a non-function value, sets the state to that value.
-        /// - If given a function, that function receives the state's previous
-        ///   value and has to return the state's new value.
-        ///
-        /// When updating the state based on its previous value, you should
-        /// prefer the function form instead of retrieving the previous value
-        /// from the [context]($context). This allows the compiler to resolve
-        /// the final state efficiently, minimizing the number of
-        /// [layout iterations]($context/#compiler-iterations) required.
-        ///
-        /// In the following example, `{fill.update(f => not f)}` will paint odd
-        /// [items in the bullet list]($list.item) as expected. However, if it's
-        /// replaced with `{context fill.update(not fill.get())}`, then layout
-        /// will not converge within 5 attempts, as each update will take one
-        /// additional iteration to propagate.
-        ///
-        /// ```example
-        /// #let fill = state("fill", false)
-        ///
-        /// #show list.item: it => {
-        ///   fill.update(f => not f)
-        ///   context {
-        ///     set text(fill: fuchsia) if fill.get()
-        ///     it
-        ///   }
-        /// }
-        ///
-        /// #lorem(5).split().map(list.item).join()
-        /// ```
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
         update: StateUpdate,
     ) -> Content {
         StateUpdateElem::new(self.key, update).pack().spanned(span)
diff --git a/crates/typst-library/src/layout/align.rs b/crates/typst-library/src/layout/align.rs
index e9c35a1768..c9d0259e9c 100644
--- a/crates/typst-library/src/layout/align.rs
+++ b/crates/typst-library/src/layout/align.rs
@@ -10,17 +10,10 @@ use crate::foundations::{
 use crate::layout::{Abs, Axes, Axis, Dir, Side};
 use crate::text::TextElem;
 
-<<<<<<< HEAD
 /// コンテンツを水平方向・垂直方向に配置。
 ///
 /// # 例
 /// コンテンツを水平方向で中央揃えにすることから始めましょう。
-=======
-/// Aligns content horizontally and vertically.
-///
-/// # Example
-/// Let's start with centering our content horizontally:
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 /// ```example
 /// #set page(height: 120pt)
 /// #set align(center)
@@ -31,11 +24,7 @@ use crate::text::TextElem;
 /// A work of art, a visual throne
 /// ```
 ///
-<<<<<<< HEAD
 /// 垂直方向で中央揃えにするには_horizon_配置を使用します。
-=======
-/// To center something vertically, use _horizon_ alignment:
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 /// ```example
 /// #set page(height: 120pt)
 /// #set align(horizon)
@@ -45,16 +34,9 @@ use crate::text::TextElem;
 /// a new paragraph.
 /// ```
 ///
-<<<<<<< HEAD
 /// # 配置の組み合わせ
 /// `+`演算子を用いて2種類の配置を組み合わせられます。
 /// setルールの代わりに関数形式を用いて1つのコンテンツのみに適用してみましょう。
-=======
-/// # Combining alignments
-/// You can combine two alignments with the `+` operator. Let's also only apply
-/// this to one piece of content by using the function form instead of a set
-/// rule:
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 /// ```example
 /// #set page(height: 120pt)
 /// Though left in the beginning ...
@@ -66,15 +48,9 @@ use crate::text::TextElem;
 /// ]
 /// ```
 ///
-<<<<<<< HEAD
 /// # 配置のネスト
 /// レイアウトコンテナおよびその内部の要素にさまざまな配置設定を適用できます。
 /// このようにすることで複雑なレイアウトを作成できます。
-=======
-/// # Nested alignment
-/// You can use varying alignments for layout containers and the elements within
-/// them. This way, you can create intricate layouts:
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 ///
 /// ```example
 /// #align(center, block[
@@ -87,27 +63,16 @@ use crate::text::TextElem;
 /// ])
 /// ```
 ///
-<<<<<<< HEAD
 /// # 同一行での配置設定
 /// `align` 関数はブロックレベルで配置するため、常に現在のパラグラフを中断します。
 /// 同じ行の一部を異なる配置にするためには、代わりに[比率間隔]($h)を使用しなければなりません。
-=======
-/// # Alignment within the same line
-/// The `align` function performs block-level alignment and thus always
-/// interrupts the current paragraph. To have different alignment for parts
-/// of the same line, you should use [fractional spacing]($h) instead:
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 ///
 /// ```example
 /// Start #h(1fr) End
 /// ```
 #[elem]
 pub struct AlignElem {
-<<<<<<< HEAD
     /// 両方の軸に沿った[alignment]。
-=======
-    /// The [alignment] along both axes.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     ///
     /// ```example
     /// #set page(height: 6cm)
@@ -124,16 +89,11 @@ pub struct AlignElem {
     #[default]
     pub alignment: Alignment,
 
-<<<<<<< HEAD
     /// 配置するコンテンツ。
-=======
-    /// The content to align.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     #[required]
     pub body: Content,
 }
 
-<<<<<<< HEAD
 /// 軸に沿って何かを[align]する位置。
 ///
 /// 取りうる値は以下の通りです。
@@ -148,55 +108,24 @@ pub struct AlignElem {
 ///
 /// これらの値はグローバルスコープでも、alignment型のスコープでも使えます。
 /// したがって、以下の2つのどちらでも書けます。
-=======
-/// Where to align something along an axis.
-///
-/// Possible values are:
-/// - `start`: Aligns at the [start]($direction.start) of the [text
-///   direction]($text.dir).
-/// - `end`: Aligns at the [end]($direction.end) of the [text
-///   direction]($text.dir).
-/// - `left`: Align at the left.
-/// - `center`: Aligns in the middle, horizontally.
-/// - `right`: Aligns at the right.
-/// - `top`: Aligns at the top.
-/// - `horizon`: Aligns in the middle, vertically.
-/// - `bottom`: Align at the bottom.
-///
-/// These values are available globally and also in the alignment type's scope,
-/// so you can write either of the following two:
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 ///
 /// ```example
 /// #align(center)[Hi]
 /// #align(alignment.center)[Hi]
 /// ```
 ///
-<<<<<<< HEAD
 /// # 2次元配置
 /// 両方の軸に沿って同時に配置するには、`+`演算子を用いて2種類の配置を足し合わせます。
 /// 例えば、`top + right`はコンテンツを右上隅に配置します。
-=======
-/// # 2D alignments
-/// To align along both axes at the same time, add the two alignments using the
-/// `+` operator. For example, `top + right` aligns the content to the top right
-/// corner.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 ///
 /// ```example
 /// #set page(height: 3cm)
 /// #align(center + bottom)[Hi]
 /// ```
 ///
-<<<<<<< HEAD
 /// # フィールド
 /// `x`、`y`フィールドには、それぞれ配置の水平成分と垂直成分が（別の`alignment`として）保持されます。
 /// これらは`{none}`になる可能性があります。
-=======
-/// # Fields
-/// The `x` and `y` fields hold the alignment's horizontal and vertical
-/// components, respectively (as yet another `alignment`). They may be `{none}`.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 ///
 /// ```example
 /// #(top + right).x \
@@ -248,17 +177,10 @@ impl Alignment {
     pub const HORIZON: Self = Alignment::V(VAlignment::Horizon);
     pub const BOTTOM: Self = Alignment::V(VAlignment::Bottom);
 
-<<<<<<< HEAD
     /// このalignmentが属する軸。
     /// -  `start`、`left`、`center`、`right`および`end`の場合は`{"horizontal"}`
     /// - `top`、`horizon`および`bottom`の場合は`{"vertical"}`
     /// - 2次元配置の場合は`{none}`
-=======
-    /// The axis this alignment belongs to.
-    /// - `{"horizontal"}` for `start`, `left`, `center`, `right`, and `end`
-    /// - `{"vertical"}` for `top`, `horizon`, and `bottom`
-    /// - `{none}` for 2-dimensional alignments
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     ///
     /// ```example
     /// #left.axis() \
@@ -273,11 +195,7 @@ impl Alignment {
         }
     }
 
-<<<<<<< HEAD
     /// 逆の配置。
-=======
-    /// The inverse alignment.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     ///
     /// ```example
     /// #top.inv() \
diff --git a/crates/typst-library/src/layout/angle.rs b/crates/typst-library/src/layout/angle.rs
index bc95288d30..a0c7c19df1 100644
--- a/crates/typst-library/src/layout/angle.rs
+++ b/crates/typst-library/src/layout/angle.rs
@@ -8,7 +8,6 @@ use typst_utils::{Numeric, Scalar};
 
 use crate::foundations::{Repr, func, repr, scope, ty};
 
-<<<<<<< HEAD
 /// 回転を表す角度。
 ///
 /// Typstは以下の角度の単位をサポートしています。
@@ -17,16 +16,6 @@ use crate::foundations::{Repr, func, repr, scope, ty};
 /// - ラジアン: `{3.14rad}`
 ///
 /// # 例
-=======
-/// An angle describing a rotation.
-///
-/// Typst supports the following angular units:
-///
-/// - Degrees: `{180deg}`
-/// - Radians: `{3.14rad}`
-///
-/// # Example
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 /// ```example
 /// #rotate(10deg)[Hello there!]
 /// ```
@@ -115,21 +104,13 @@ impl Angle {
 
 #[scope]
 impl Angle {
-<<<<<<< HEAD
     /// 角度をラジアンに変換します。
-=======
-    /// Converts this angle to radians.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     #[func(name = "rad", title = "Radians")]
     pub fn to_rad(self) -> f64 {
         self.to_unit(AngleUnit::Rad)
     }
 
-<<<<<<< HEAD
     /// 角度を度に変換します。
-=======
-    /// Converts this angle to degrees.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     #[func(name = "deg", title = "Degrees")]
     pub fn to_deg(self) -> f64 {
         self.to_unit(AngleUnit::Deg)
diff --git a/crates/typst-library/src/layout/columns.rs b/crates/typst-library/src/layout/columns.rs
index 8740194c75..1f2d5b4832 100644
--- a/crates/typst-library/src/layout/columns.rs
+++ b/crates/typst-library/src/layout/columns.rs
@@ -1,5 +1,5 @@
 use std::num::NonZeroUsize;
-<<<<<<< HEAD
+
 use crate::foundations::{Content, elem};
 use crate::layout::{Length, Ratio, Rel};
 
@@ -10,27 +10,6 @@ use crate::layout::{Length, Ratio, Rel};
 /// その代わり、段はコンテナの高さかページの残りの高さを占めます。
 /// バランスを取った段組は将来的にサポートされる予定です。
 ///
-/// # ページレベルの段組 { #page-level }
-/// ドキュメント全体に渡る段組を挿入する必要がある場合は、代わりに`{page}`関数の[`columns`パラメーター]($page.columns)を使用してください。
-/// これは、レイアウトコンテナ内のコンテンツ全てをラップするのではなく、ページレベルの段組を直接作成します。
-/// 結果として[改ページ]($pagebreak)、[脚注]($footnote)および[行番号]($par.line)のようなものが期待通りの動作をし続けます。
-/// より詳しくは[ページのセットアップガイドの関連する項目]($guides/page-setup/#columns)をご覧ください。
-///
-/// # 段組の中断 { #breaking-out }
-/// （例えば、論文のタイトルのように）段組を一時的に中断する場合は、親スコープでのフロート配置を使用してください。
-=======
-
-use crate::foundations::{Content, elem};
-use crate::layout::{Length, Ratio, Rel};
-
-/// Separates a region into multiple equally sized columns.
-///
-/// The `column` function lets you separate the interior of any container into
-/// multiple columns. It will currently not balance the height of the columns.
-/// Instead, the columns will take up the height of their container or the
-/// remaining height on the page. Support for balanced columns is planned for
-/// the future.
-///
 /// When arranging content across multiple columns, use [`colbreak`]($colbreak)
 /// to explicitly continue in the next column.
 ///
@@ -47,20 +26,14 @@ use crate::layout::{Length, Ratio, Rel};
 /// ]
 /// ```
 ///
-/// # Page-level columns { #page-level }
-/// If you need to insert columns across your whole document, use the `{page}`
-/// function's [`columns` parameter]($page.columns) instead. This will create
-/// the columns directly at the page-level rather than wrapping all of your
-/// content in a layout container. As a result, things like
-/// [pagebreaks]($pagebreak), [footnotes]($footnote), and [line
-/// numbers]($par.line) will continue to work as expected. For more information,
-/// also read the [relevant part of the page setup
-/// guide]($guides/page-setup/#columns).
+/// # ページレベルの段組 { #page-level }
+/// ドキュメント全体に渡る段組を挿入する必要がある場合は、代わりに`{page}`関数の[`columns`パラメーター]($page.columns)を使用してください。
+/// これは、レイアウトコンテナ内のコンテンツ全てをラップするのではなく、ページレベルの段組を直接作成します。
+/// 結果として[改ページ]($pagebreak)、[脚注]($footnote)および[行番号]($par.line)のようなものが期待通りの動作をし続けます。
+/// より詳しくは[ページのセットアップガイドの関連する項目]($guides/page-setup/#columns)をご覧ください。
 ///
-/// # Breaking out of columns { #breaking-out }
-/// To temporarily break out of columns (e.g. for a paper's title), use
-/// parent-scoped floating placement:
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
+/// # 段組の中断 { #breaking-out }
+/// （例えば、論文のタイトルのように）段組を一時的に中断する場合は、親スコープでのフロート配置を使用してください。
 ///
 /// ```example:single
 /// #set page(columns: 2, height: 150pt)
@@ -78,48 +51,26 @@ use crate::layout::{Length, Ratio, Rel};
 /// ```
 #[elem]
 pub struct ColumnsElem {
-<<<<<<< HEAD
     /// 段数。
-=======
-    /// The number of columns.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     #[positional]
     #[default(NonZeroUsize::new(2).unwrap())]
     pub count: NonZeroUsize,
 
-<<<<<<< HEAD
     /// 段間。
     #[default(Ratio::new(0.04).into())]
     pub gutter: Rel<Length>,
 
     /// 段内にレイアウトされるべきコンテンツ。
-=======
-    /// The size of the gutter space between each column.
-    #[default(Ratio::new(0.04).into())]
-    pub gutter: Rel<Length>,
-
-    /// The content that should be layouted into the columns.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     #[required]
     pub body: Content,
 }
 
-<<<<<<< HEAD
 /// 強制的な段の区切り。
 ///
 /// この関数は、一段組やページ中の最後の段で使用されると、[改ページ]($pagebreak)と同じように振る舞います。
 /// それ以外の場合、段区切りの後のコンテンツは次の段に配置されます。
 ///
 /// # 例
-=======
-/// Forces a column break.
-///
-/// The function will behave like a [page break]($pagebreak) when used in a
-/// single column layout or the last column on a page. Otherwise, content after
-/// the column break will be placed in the next column.
-///
-/// # Example
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 /// ```example
 /// #set page(columns: 2)
 /// Preliminary findings from our
@@ -138,12 +89,7 @@ pub struct ColumnsElem {
 /// ```
 #[elem(title = "Column Break")]
 pub struct ColbreakElem {
-<<<<<<< HEAD
     /// `{true}`の場合、現在の段がすでに空のとき段区切りが実行されません。
-=======
-    /// If `{true}`, the column break is skipped if the current column is
-    /// already empty.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     #[default(false)]
     pub weak: bool,
 }
diff --git a/crates/typst-library/src/layout/container.rs b/crates/typst-library/src/layout/container.rs
index b9fe8c5441..623a94c2f0 100644
--- a/crates/typst-library/src/layout/container.rs
+++ b/crates/typst-library/src/layout/container.rs
@@ -11,7 +11,6 @@ use crate::layout::{
 };
 use crate::visualize::{Paint, Stroke};
 
-<<<<<<< HEAD
 /// コンテンツの大きさを持つインラインレベルのコンテナ。
 ///
 /// インライン数式、テキスト、ボックスを除く全ての要素はブロックレベルであり、[段落]($par)の中に含められません。
@@ -19,16 +18,6 @@ use crate::visualize::{Paint, Stroke};
 /// ボックスの大きさはデフォルトでは受け取ったコンテンツと同じですが、明示的にも指定できます。
 ///
 /// # 例
-=======
-/// An inline-level container that sizes content.
-///
-/// All elements except inline math, text, and boxes are block-level and cannot
-/// occur inside of a [paragraph]($par). The box function can be used to
-/// integrate such elements into a paragraph. Boxes take the size of their
-/// contents by default but can also be sized explicitly.
-///
-/// # Example
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 /// ```example
 /// Refer to the docs
 /// #box(
@@ -39,47 +28,28 @@ use crate::visualize::{Paint, Stroke};
 /// ```
 #[elem]
 pub struct BoxElem {
-<<<<<<< HEAD
     /// ボックスの幅。
     ///
     /// ボックスは以下の例で示すように、[比率]($fraction)を用いて幅を指定できます。
     ///
     /// _注意:_ 現在、パラグラフ内で比率指定が可能なのはボックスおよびその幅のみです。
     /// 比率で指定した大きさを持つ画像や図形などは今後サポートされる可能性があります。
-=======
-    /// The width of the box.
-    ///
-    /// Boxes can have [fractional]($fraction) widths, as the example below
-    /// demonstrates.
-    ///
-    /// _Note:_ Currently, only boxes and only their widths might be fractionally
-    /// sized within paragraphs. Support for fractionally sized images, shapes,
-    /// and more might be added in the future.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     ///
     /// ```example
     /// Line in #box(width: 1fr, line(length: 100%)) between.
     /// ```
     pub width: Sizing,
 
-<<<<<<< HEAD
     /// ボックスの高さ。
     pub height: Smart<Rel<Length>>,
 
     /// ボックスのベースラインをシフトさせる量。
-=======
-    /// The height of the box.
-    pub height: Smart<Rel<Length>>,
-
-    /// An amount to shift the box's baseline by.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     ///
     /// ```example
     /// Image: #box(baseline: 40%, image("tiger.jpg", width: 2cm)).
     /// ```
     pub baseline: Rel<Length>,
 
-<<<<<<< HEAD
     /// ボックスの背景色。
     /// 詳細は[rectangleのドキュメント]($rect.fill)を参照してください。
     pub fill: Option<Paint>,
@@ -105,46 +75,13 @@ pub struct BoxElem {
     /// 相対的なインセットやアウトセットは、コンテナを基準とする[幅]($box.width)や[高さ]($box.height)の相対値とは基準が異なることに注意してください。
     ///
     /// _注意:_ ボックスがテキストを含むとき、その正確な大きさは現在の[テキストの端]($text.top-edge)に依存します。
-=======
-    /// The box's background color. See the
-    /// [rectangle's documentation]($rect.fill) for more details.
-    pub fill: Option<Paint>,
-
-    /// The box's border color. See the
-    /// [rectangle's documentation]($rect.stroke) for more details.
-    #[fold]
-    pub stroke: Sides<Option<Option<Stroke>>>,
-
-    /// How much to round the box's corners. See the
-    /// [rectangle's documentation]($rect.radius) for more details.
-    #[fold]
-    pub radius: Corners<Option<Rel<Length>>>,
-
-    /// How much to pad the box's content.
-    ///
-    /// This can be a single length for all sides or a dictionary of lengths
-    /// for individual sides. When passing a dictionary, it can contain the
-    /// following keys in order of precedence: `top`, `right`, `bottom`, `left`
-    /// (controlling the respective cell sides), `x`, `y` (controlling vertical
-    /// and horizontal insets), and `rest` (covers all insets not styled by
-    /// other dictionary entries). All keys are optional; omitted keys will use
-    /// their previously set value, or the default value if never set.
-    ///
-    /// [Relative lengths]($relative) for this parameter are relative to the box
-    /// size excluding [outset]($box.outset). Note that relative insets and
-    /// outsets are different from relative [widths]($box.width) and
-    /// [heights]($box.height), which are relative to the container.
-    ///
-    /// _Note:_ When the box contains text, its exact size depends on the
-    /// current [text edges]($text.top-edge).
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     ///
     /// ```example
     /// #rect(inset: 0pt)[Tight]
     /// ```
     #[fold]
     pub inset: Sides<Option<Rel<Length>>>,
-<<<<<<< HEAD
+
     /// レイアウトに影響を与えずにボックスの大きさを拡大する量。
     ///
     /// 全ての辺に対する単一の長さ、または辺ごとの長さの辞書を指定できます。
@@ -153,19 +90,6 @@ pub struct BoxElem {
     ///
     /// これはパディングが行のレイアウトに影響を与えるのを防ぐために便利です。
     /// 以下の例より一般的な場合については、[未加工テキストのblockパラメーター]($raw.block)のドキュメントを参照してください。
-=======
-
-    /// How much to expand the box's size without affecting the layout.
-    ///
-    /// This can be a single length for all sides or a dictionary of lengths for
-    /// individual sides. [Relative lengths]($relative) for this parameter are
-    /// relative to the box size excluding outset. See the documentation for
-    /// [inset]($box.inset) above for further details.
-    ///
-    /// This is useful to prevent padding from affecting line layout. For a
-    /// generalized version of the example below, see the documentation for the
-    /// [raw text's block parameter]($raw.block).
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     ///
     /// ```example
     /// An inline
@@ -179,15 +103,8 @@ pub struct BoxElem {
     #[fold]
     pub outset: Sides<Option<Rel<Length>>>,
 
-<<<<<<< HEAD
     /// ボックスの内側のコンテンツをクリッピングするかどうか。
     /// クリッピングは、ボックスの境界を超えたコンテンツを隠すため、ボックスのコンテンツがボックス本体よりも大きい場合に便利です。
-=======
-    /// Whether to clip the content inside the box.
-    ///
-    /// Clipping is useful when the box's content is larger than the box itself,
-    /// as any content that exceeds the box's bounds will be hidden.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     ///
     /// ```example
     /// #box(
@@ -200,11 +117,7 @@ pub struct BoxElem {
     #[default(false)]
     pub clip: bool,
 
-<<<<<<< HEAD
     /// ボックスのコンテンツ。
-=======
-    /// The contents of the box.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     #[positional]
     pub body: Option<Content>,
 }
@@ -265,7 +178,6 @@ pub enum InlineItem {
     Frame(Frame),
 }
 
-<<<<<<< HEAD
 /// ブロックレベルのコンテナ。
 ///
 /// このようなコンテナは、コンテンツを区切り、その大きさを調整し、背景や枠線を付与するために使用できます。
@@ -275,20 +187,6 @@ pub enum InlineItem {
 ///
 /// # 例
 /// ブロックを使用すると、複数のページに渡って分割されるコンテンツに背景を与えられます。
-=======
-/// A block-level container.
-///
-/// Such a container can be used to separate content, size it, and give it a
-/// background or border.
-///
-/// Blocks are also the primary way to control whether text becomes part of a
-/// paragraph or not. See [the paragraph documentation]($par/#what-becomes-a-paragraph)
-/// for more details.
-///
-/// # Examples
-/// With a block, you can give a background to content while still allowing it
-/// to break across multiple pages.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 /// ```example
 /// #set page(height: 100pt)
 /// #block(
@@ -299,12 +197,7 @@ pub enum InlineItem {
 /// )
 /// ```
 ///
-<<<<<<< HEAD
 /// ブロックは、特にshowルールを記述する際、本来インラインとなる要素を強制的にブロックレベルとして扱う場合にも有用です。
-=======
-/// Blocks are also useful to force elements that would otherwise be inline to
-/// become block-level, especially when writing show rules.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 /// ```example
 /// #show heading: it => it.body
 /// = Blockless
@@ -316,11 +209,7 @@ pub enum InlineItem {
 /// ```
 #[elem]
 pub struct BlockElem {
-<<<<<<< HEAD
     /// ブロックの幅。
-=======
-    /// The block's width.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     ///
     /// ```example
     /// #set align(center)
@@ -333,14 +222,8 @@ pub struct BlockElem {
     /// ```
     pub width: Smart<Rel<Length>>,
 
-<<<<<<< HEAD
     /// ブロックの高さ。
     /// 高さがページに残された余白より大きく、[`breakable`]($block.breakable)を`{true}`に設定した場合、 ブロックは残りの高さで次のページに続きます。
-=======
-    /// The block's height. When the height is larger than the remaining space
-    /// on a page and [`breakable`]($block.breakable) is `{true}`, the
-    /// block will continue on the next page with the remaining height.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     ///
     /// ```example
     /// #set page(height: 80pt)
@@ -353,11 +236,7 @@ pub struct BlockElem {
     /// ```
     pub height: Sizing,
 
-<<<<<<< HEAD
     /// ブロックが分割可能で次のページに継続するかどうか。
-=======
-    /// Whether the block can be broken and continue on the next page.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     ///
     /// ```example
     /// #set page(height: 80pt)
@@ -371,7 +250,6 @@ pub struct BlockElem {
     #[default(true)]
     pub breakable: bool,
 
-<<<<<<< HEAD
     /// ブロックの背景色。
     /// 詳細は[rectangleのドキュメント]($rect.fill)を参照してください。
     pub fill: Option<Paint>,
@@ -405,46 +283,6 @@ pub struct BlockElem {
     /// `above`と`below`の値は異なる可能性があるため、[context]ブロックでは`{block.above}`と `{block.below}`にのみアクセスでき、`{block.spacing}`には直接アクセスできません。
     ///
     /// このプロパティはshowルールと組み合わせて使用することで、任意のブロックレベル要素の周りの間隔を調整できます。
-=======
-    /// The block's background color. See the
-    /// [rectangle's documentation]($rect.fill) for more details.
-    pub fill: Option<Paint>,
-
-    /// The block's border color. See the
-    /// [rectangle's documentation]($rect.stroke) for more details.
-    #[fold]
-    pub stroke: Sides<Option<Option<Stroke>>>,
-
-    /// How much to round the block's corners. See the
-    /// [rectangle's documentation]($rect.radius) for more details.
-    #[fold]
-    pub radius: Corners<Option<Rel<Length>>>,
-
-    /// How much to pad the block's content. See the
-    /// [box's documentation]($box.inset) for more details.
-    #[fold]
-    pub inset: Sides<Option<Rel<Length>>>,
-
-    /// How much to expand the block's size without affecting the layout. See
-    /// the [box's documentation]($box.outset) for more details.
-    #[fold]
-    pub outset: Sides<Option<Rel<Length>>>,
-
-    /// The spacing around the block. When `{auto}`, inherits the paragraph
-    /// [`spacing`]($par.spacing).
-    ///
-    /// For two adjacent blocks, the larger of the first block's `above` and the
-    /// second block's `below` spacing wins. Moreover, block spacing takes
-    /// precedence over paragraph [`spacing`]($par.spacing).
-    ///
-    /// Note that this is only a shorthand to set `above` and `below` to the
-    /// same value. Since the values for `above` and `below` might differ, a
-    /// [context] block only provides access to `{block.above}` and
-    /// `{block.below}`, not to `{block.spacing}` directly.
-    ///
-    /// This property can be used in combination with a show rule to adjust the
-    /// spacing around arbitrary block-level elements.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     ///
     /// ```example
     /// #set align(center)
@@ -458,18 +296,13 @@ pub struct BlockElem {
     #[default(Em::new(1.2).into())]
     pub spacing: Spacing,
 
-<<<<<<< HEAD
     /// このブロックとその前のブロックとの間隔。
-=======
-    /// The spacing between this block and its predecessor.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     #[parse(
         let spacing = args.named("spacing")?;
         args.named("above")?.or(spacing)
     )]
     pub above: Smart<Spacing>,
 
-<<<<<<< HEAD
     /// このブロックとその後のブロックとの間隔。
     #[parse(args.named("below")?.or(spacing))]
     pub below: Smart<Spacing>,
@@ -477,16 +310,6 @@ pub struct BlockElem {
     /// ブロックの内側のコンテンツをクリッピングするかどうか。
     ///
     /// クリッピングは、ブロックの境界を超えたコンテンツを隠すため、ブロックのコンテンツがブロック本体よりも大きい場合に便利です。
-=======
-    /// The spacing between this block and its successor.
-    #[parse(args.named("below")?.or(spacing))]
-    pub below: Smart<Spacing>,
-
-    /// Whether to clip the content inside the block.
-    ///
-    /// Clipping is useful when the block's content is larger than the block itself,
-    /// as any content that exceeds the block's bounds will be hidden.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     ///
     /// ```example
     /// #block(
@@ -499,17 +322,9 @@ pub struct BlockElem {
     #[default(false)]
     pub clip: bool,
 
-<<<<<<< HEAD
     /// このブロックが、次のブロックとの間に区切りを入れることなく続ける必要があるかどうか。
     ///
     /// この設定は、ページの下部で見出しが孤立することを防ぐために、見出しブロックに対してデフォルトで適用されています。
-=======
-    /// Whether this block must stick to the following one, with no break in
-    /// between.
-    ///
-    /// This is, by default, set on heading blocks to prevent orphaned headings
-    /// at the bottom of the page.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     ///
     /// ```example
     /// >>> #set page(height: 140pt)
@@ -523,11 +338,7 @@ pub struct BlockElem {
     #[default(false)]
     pub sticky: bool,
 
-<<<<<<< HEAD
     /// ブロックのコンテンツ。
-=======
-    /// The contents of the block.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     #[positional]
     pub body: Option<BlockBody>,
 }
diff --git a/crates/typst-library/src/layout/dir.rs b/crates/typst-library/src/layout/dir.rs
index 8c66012c87..ec8ac4098d 100644
--- a/crates/typst-library/src/layout/dir.rs
+++ b/crates/typst-library/src/layout/dir.rs
@@ -3,7 +3,6 @@ use ecow::EcoString;
 use crate::foundations::{Repr, func, scope, ty};
 use crate::layout::{Axis, Side};
 
-<<<<<<< HEAD
 /// コンテンツをレイアウトできる4つの向き。
 ///
 ///  取りうる値は以下の通りです。
@@ -14,19 +13,6 @@ use crate::layout::{Axis, Side};
 ///
 /// これらの値はグローバルスコープでも、direction型のスコープでも使えます。
 /// したがって、以下の2つのどちらでも書けます。
-=======
-/// The four directions into which content can be laid out.
-///
-///  Possible values are:
-/// - `{ltr}`: Left to right.
-/// - `{rtl}`: Right to left.
-/// - `{ttb}`: Top to bottom.
-/// - `{btt}`: Bottom to top.
-///
-/// These values are available globally and
-/// also in the direction type's scope, so you can write either of the following
-/// two:
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 /// ```example
 /// #stack(dir: rtl)[A][B][C]
 /// #stack(dir: direction.rtl)[A][B][C]
@@ -63,11 +49,7 @@ impl Dir {
     pub const TTB: Self = Self::TTB;
     pub const BTT: Self = Self::BTT;
 
-<<<<<<< HEAD
     /// 指定した引数を始点とする向きを返します。
-=======
-    /// Returns a direction from a starting point.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     ///
     /// ```example
     /// #direction.from(left) \
@@ -85,11 +67,7 @@ impl Dir {
         }
     }
 
-<<<<<<< HEAD
     /// 指定した引数を終点とする向きを返します。
-=======
-    /// Returns a direction from an end point.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     ///
     /// ```example
     /// #direction.to(left) \
@@ -107,12 +85,7 @@ impl Dir {
         }
     }
 
-<<<<<<< HEAD
     /// このdirectionが属する軸。`{"horizontal"}`か`{"vertical"}`のいずれかになります。
-=======
-    /// The axis this direction belongs to, either `{"horizontal"}` or
-    /// `{"vertical"}`.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     ///
     /// ```example
     /// #ltr.axis() \
@@ -126,11 +99,7 @@ impl Dir {
         }
     }
 
-<<<<<<< HEAD
     /// 計算に用いる、対応する符号。
-=======
-    /// The corresponding sign, for use in calculations.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     ///
     /// ```example
     /// #ltr.sign() \
@@ -146,11 +115,7 @@ impl Dir {
         }
     }
 
-<<<<<<< HEAD
     /// このdirectionの始点をalignmentとして返します。
-=======
-    /// The start point of this direction, as an alignment.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     ///
     /// ```example
     /// #ltr.start() \
@@ -168,11 +133,7 @@ impl Dir {
         }
     }
 
-<<<<<<< HEAD
     /// このdirectionの終点をalignmentとして返します。
-=======
-    /// The end point of this direction, as an alignment.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     ///
     /// ```example
     /// #ltr.end() \
@@ -190,11 +151,7 @@ impl Dir {
         }
     }
 
-<<<<<<< HEAD
     /// 逆の向き。
-=======
-    /// The inverse direction.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     ///
     /// ```example
     /// #ltr.inv() \
diff --git a/crates/typst-library/src/layout/fr.rs b/crates/typst-library/src/layout/fr.rs
index 010cbd1762..2010ace5d1 100644
--- a/crates/typst-library/src/layout/fr.rs
+++ b/crates/typst-library/src/layout/fr.rs
@@ -8,7 +8,6 @@ use typst_utils::{Numeric, Scalar};
 use crate::foundations::{Repr, repr, ty};
 use crate::layout::Abs;
 
-<<<<<<< HEAD
 /// レイアウトに残されたスペースをどう分配するかを定義。
 ///
 /// 要素の大きさが比率（fraction）で指定された場合、それぞれの要素には、比率の総和に対する自身の比率の割合に応じたスペースが割り当てられます。
@@ -16,17 +15,6 @@ use crate::layout::Abs;
 /// 詳細は[h]関数、[v]関数および[grid関数]($grid)も参照してください。
 ///
 /// # 例
-=======
-/// Defines how the remaining space in a layout is distributed.
-///
-/// Each fractionally sized element gets space based on the ratio of its
-/// fraction to the sum of all fractions.
-///
-/// For more details, also see the [h] and [v] functions and the
-/// [grid function]($grid).
-///
-/// # Example
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 /// ```example
 /// Left #h(1fr) Left-ish #h(2fr) Right
 /// ```
diff --git a/crates/typst-library/src/layout/grid/mod.rs b/crates/typst-library/src/layout/grid/mod.rs
index 6386575a49..1d1dc4d1d0 100644
--- a/crates/typst-library/src/layout/grid/mod.rs
+++ b/crates/typst-library/src/layout/grid/mod.rs
@@ -21,7 +21,6 @@ use crate::layout::{
 use crate::model::{TableCell, TableFooter, TableHLine, TableHeader, TableVLine};
 use crate::visualize::{Paint, Stroke};
 
-<<<<<<< HEAD
 /// グリッド状にコンテンツを配置。
 ///
 /// グリッド要素を用いるとコンテンツをグリッド状に配置できます。
@@ -56,56 +55,6 @@ use crate::visualize::{Paint, Stroke};
 /// # 例
 /// 以下の例は異なるトラックサイズオプションの実演です。
 /// また、1つのセルをグリッドの2つのトラックにまたがせる[`grid.cell`]の使い方も示しています。
-=======
-/// Arranges content in a grid.
-///
-/// The grid element allows you to arrange content in a grid. You can define the
-/// number of rows and columns, as well as the size of the gutters between them.
-/// There are multiple sizing modes for columns and rows that can be used to
-/// create complex layouts.
-///
-/// While the grid and table elements work very similarly, they are intended for
-/// different use cases and carry different semantics. The grid element is
-/// intended for presentational and layout purposes, while the [`table`] element
-/// is intended for, in broad terms, presenting multiple related data points.
-/// Set and show rules on one of these elements do not affect the other. Refer
-/// to the [Accessibility Section]($grid/#accessibility) to learn how grids and
-/// tables are presented to users of Assistive Technology (AT) like screen
-/// readers.
-///
-/// # Sizing the tracks { #track-size }
-///
-/// A grid's sizing is determined by the track sizes specified in the arguments.
-/// There are multiple sizing parameters: [`columns`]($grid.columns),
-/// [`rows`]($grid.rows) and [`gutter`]($grid.gutter).
-/// Because each of the sizing parameters accepts the same values, we will
-/// explain them just once, here. Each sizing argument accepts an array of
-/// individual track sizes. A track size is either:
-///
-/// - `{auto}`: The track will be sized to fit its contents. It will be at most
-///   as large as the remaining space. If there is more than one `{auto}` track
-///   width, and together they claim more than the available space, the `{auto}`
-///   tracks will fairly distribute the available space among themselves.
-///
-/// - A fixed or relative length (e.g. `{10pt}` or `{20% - 1cm}`): The track
-///   will be exactly of this size.
-///
-/// - A fractional length (e.g. `{1fr}`): Once all other tracks have been sized,
-///   the remaining space will be divided among the fractional tracks according
-///   to their fractions. For example, if there are two fractional tracks, each
-///   with a fraction of `{1fr}`, they will each take up half of the remaining
-///   space.
-///
-/// To specify a single track, the array can be omitted in favor of a single
-/// value. To specify multiple `{auto}` tracks, enter the number of tracks
-/// instead of an array. For example, `columns:` `{3}` is equivalent to
-/// `columns:` `{(auto, auto, auto)}`.
-///
-/// # Examples
-/// The example below demonstrates the different track sizing options. It also
-/// shows how you can use [`grid.cell`] to make an individual cell span two grid
-/// tracks.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 ///
 /// ```example
 /// // We use `rect` to emphasize the
@@ -131,12 +80,7 @@ use crate::visualize::{Paint, Stroke};
 /// )
 /// ```
 ///
-<<<<<<< HEAD
 /// また、文字列やコンテンツの配列をグリッドに[展開](#arguments/#spreading)して、セルを埋められます。
-=======
-/// You can also [spread]($arguments/#spreading) an array of strings or content
-/// into a grid to populate its cells.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 ///
 /// ```example
 /// #grid(
@@ -146,7 +90,6 @@ use crate::visualize::{Paint, Stroke};
 /// )
 /// ```
 ///
-<<<<<<< HEAD
 /// # グリッドのスタイル設定 { #styling }
 /// グリッド要素とテーブル要素の動作は似ています。
 /// 実践的な説明については[テーブルガイド]($guides/tables/#fills)を参照してください。
@@ -170,37 +113,6 @@ use crate::visualize::{Paint, Stroke};
 /// - 全てのセルに適用される単一の値。
 /// - 各列に対応する値の配列。配列の要素数が列数より少ない場合、配列は循環して使用されます。
 /// - `(x, y) => value`の形式の関数。セルの列と行の（いずれも0始まりの）インデックスを受け取り、そのセルに適用する値を返します。
-=======
-/// # Styling the grid { #styling }
-/// The grid and table elements work similarly. For a hands-on explanation,
-/// refer to the [Table Guide]($guides/tables/#fills); for a quick overview,
-/// continue reading.
-///
-/// The grid's appearance can be customized through different parameters. These
-/// are the most important ones:
-///
-/// - [`align`]($grid.align) to change how cells are aligned
-/// - [`inset`]($grid.inset) to optionally add internal padding to cells
-/// - [`fill`]($grid.fill) to give cells a background
-/// - [`stroke`]($grid.stroke) to optionally enable grid lines with a certain
-///   stroke
-///
-/// To meet different needs, there are various ways to set them.
-///
-/// If you need to override the above options for individual cells, you can use
-/// the [`grid.cell`] element. Likewise, you can override individual grid lines
-/// with the [`grid.hline`] and [`grid.vline`] elements.
-///
-/// To configure an overall style for a grid, you may instead specify the option
-/// in any of the following fashions:
-///
-/// - As a single value that applies to all cells.
-/// - As an array of values corresponding to each column. The array will be
-///   cycled if there are more columns than the array has items.
-/// - As a function in the form of `(x, y) => value`. It receives the cell's
-///   column and row indices (both starting from zero) and should return the
-///   value to apply to that cell.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 ///
 /// ```example
 /// #grid(
@@ -219,7 +131,6 @@ use crate::visualize::{Paint, Stroke};
 /// )
 /// ```
 ///
-<<<<<<< HEAD
 /// さらに、[`grid`]や[`grid.cell`]に[スタイルルール]($styling)を適用できます。
 /// 特に、`grid.cell`の[`x`]($grid.cell.x)と[`y`]($grid.cell.y)フィールドは[`where`]($function.where)セレクターで使用でき、特定の列や行、または特定の位置のセルにスタイルを適用できます。
 ///
@@ -267,75 +178,12 @@ pub struct GridElem {
     pub gutter: TrackSizings,
 
     /// 列間の間隔。
-=======
-/// On top of that, you may [apply styling rules]($styling) to [`grid`] and
-/// [`grid.cell`]. Especially, the [`x`]($grid.cell.x) and [`y`]($grid.cell.y)
-/// fields of `grid.cell` can be used in a [`where`]($function.where) selector,
-/// making it possible to style cells at specific columns or rows, or individual
-/// positions.
-///
-/// ## Stroke styling precedence
-/// As explained above, there are three ways to set the stroke of a grid cell:
-/// through [`{grid.cell}`'s `stroke` field]($grid.cell.stroke), by using
-/// [`{grid.hline}`]($grid.hline) and [`{grid.vline}`]($grid.vline), or by
-/// setting the [`{grid}`'s `stroke` field]($grid.stroke). When multiple of
-/// these settings are present and conflict, the `hline` and `vline` settings
-/// take the highest precedence, followed by the `cell` settings, and finally
-/// the `grid` settings.
-///
-/// Furthermore, strokes of a repeated grid header or footer will take
-/// precedence over regular cell strokes.
-///
-/// # Accessibility
-/// Grids do not carry any special semantics. Assistive Technology (AT) does not
-/// offer the ability to navigate two-dimensionally by cell in grids. If you
-/// want to present tabular data, use the [`table`] element instead.
-///
-/// AT will read the grid cells in their semantic order. Usually, this is the
-/// order in which you passed them to the grid. However, if you manually
-/// positioned them using [`grid.cell`'s `x` and `y` arguments]($grid.cell.x),
-/// cells will be read row by row, from left to right (in left-to-right
-/// documents). A cell will be read when its position is first reached.
-#[elem(scope, Synthesize, Tagged)]
-pub struct GridElem {
-    /// The column sizes.
-    ///
-    /// Either specify a track size array or provide an integer to create a grid
-    /// with that many `{auto}`-sized columns. Note that opposed to rows and
-    /// gutters, providing a single track size will only ever create a single
-    /// column.
-    ///
-    /// See the [track size section](#track-size) above for more details.
-    pub columns: TrackSizings,
-
-    /// The row sizes.
-    ///
-    /// If there are more cells than fit the defined rows, the last row is
-    /// repeated until there are no more cells.
-    ///
-    /// See the [track size section](#track-size) above for more details.
-    pub rows: TrackSizings,
-
-    /// The gaps between rows and columns. This is a shorthand to set
-    /// [`column-gutter`]($grid.column-gutter) and [`row-gutter`]($grid.row-gutter)
-    /// to the same value.
-    ///
-    /// If there are more gutters than defined sizes, the last gutter is
-    /// repeated.
-    ///
-    /// See the [track size section](#track-size) above for more details.
-    #[external]
-    pub gutter: TrackSizings,
-
-    /// The gaps between columns.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     #[parse(
         let gutter = args.named("gutter")?;
         args.named("column-gutter")?.or_else(|| gutter.clone())
     )]
     pub column_gutter: TrackSizings,
 
-<<<<<<< HEAD
     /// 行間の間隔。
     #[parse(args.named("row-gutter")?.or_else(|| gutter.clone()))]
     pub row_gutter: TrackSizings,
@@ -379,52 +227,6 @@ pub struct GridElem {
     ///
     /// 特に、配列や関数はストライプ状のグリッドを作成するのに便利です。
     /// 詳細は上記の[スタイル設定のセクション](#styling)を参照してください。
-=======
-    /// The gaps between rows.
-    #[parse(args.named("row-gutter")?.or_else(|| gutter.clone()))]
-    pub row_gutter: TrackSizings,
-
-    /// How much to pad the cells' content.
-    ///
-    /// To specify a uniform inset for all cells, you can use a single length
-    /// for all sides, or a dictionary of lengths for individual sides. See the
-    /// [box's documentation]($box.inset) for more details.
-    ///
-    /// To specify varying inset for different cells, you can:
-    /// - use a single inset for all cells
-    /// - use an array of insets corresponding to each column
-    /// - use a function that maps a cell's position to its inset
-    ///
-    /// See the [styling section](#styling) above for more details.
-    ///
-    /// In addition, you can find an example at the [`table.inset`] parameter.
-    #[fold]
-    pub inset: Celled<Sides<Option<Rel<Length>>>>,
-
-    /// How to align the cells' content.
-    ///
-    /// If set to `{auto}`, the outer alignment is used.
-    ///
-    /// You can specify the alignment in any of the following fashions:
-    /// - use a single alignment for all cells
-    /// - use an array of alignments corresponding to each column
-    /// - use a function that maps a cell's position to its alignment
-    ///
-    /// See the [styling section](#styling) above for details.
-    ///
-    /// In addition, you can find an example at the [`table.align`] parameter.
-    pub align: Celled<Smart<Alignment>>,
-
-    /// How to fill the cells.
-    ///
-    /// This can be:
-    /// - a single color for all cells
-    /// - an array of colors corresponding to each column
-    /// - a function that maps a cell's position to its color
-    ///
-    /// Most notably, arrays and functions are useful for creating striped grids.
-    /// See the [styling section](#styling) above for more details.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     ///
     /// ```example
     /// #grid(
@@ -442,7 +244,6 @@ pub struct GridElem {
     /// ```
     pub fill: Celled<Option<Paint>>,
 
-<<<<<<< HEAD
     /// セルの[ストローク]($stroke)をどうするか。
     ///
     /// デフォルトではグリッドにストロークはありませんが、このオプションを所望のストロークに設定すれば変更できます。
@@ -460,31 +261,6 @@ pub struct GridElem {
     /// 詳細は上記の[スタイル設定のセクション](#styling)を参照してください。
     ///
     /// ```example:"関数を渡して位置に基づくストロークを設定"
-=======
-    /// How to [stroke]($stroke) the cells.
-    ///
-    /// Grids have no strokes by default, which can be changed by setting this
-    /// option to the desired stroke.
-    ///
-    /// If it is necessary to place lines which can cross spacing between cells
-    /// produced by the [`gutter`]($grid.gutter) option, or to override the
-    /// stroke between multiple specific cells, consider specifying one or more
-    /// of [`grid.hline`] and [`grid.vline`] alongside your grid cells.
-    ///
-    /// To specify the same stroke for all cells, you can use a single [stroke]
-    /// for all sides, or a dictionary of [strokes]($stroke) for individual
-    /// sides. See the [rectangle's documentation]($rect.stroke) for more
-    /// details.
-    ///
-    /// To specify varying strokes for different cells, you can:
-    /// - use a single stroke for all cells
-    /// - use an array of strokes corresponding to each column
-    /// - use a function that maps a cell's position to its stroke
-    ///
-    /// See the [styling section](#styling) above for more details.
-    ///
-    /// ```example:"Passing a function to set a stroke based on position"
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     /// #set page(width: 420pt)
     /// #set text(number-type: "old-style")
     /// #show grid.cell.where(y: 0): set text(size: 1.3em)
@@ -518,11 +294,7 @@ pub struct GridElem {
     /// )
     /// ```
     ///
-<<<<<<< HEAD
     /// ```example:"ストロークの辞書の畳み込み"
-=======
-    /// ```example:"Folding the stroke dictionary"
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     /// #set page(height: 13em, width: 26em)
     ///
     /// #let cv(..jobs) = grid(
@@ -595,16 +367,9 @@ pub struct GridElem {
     #[synthesized]
     pub grid: Arc<CellGrid>,
 
-<<<<<<< HEAD
     /// グリッドセルのコンテンツと、[`grid.hline`]および[`grid.vline`]要素で指定される任意のグリッド線。
     ///
     /// セルは行優先で埋められます。
-=======
-    /// The contents of the grid cells, plus any extra grid lines specified with
-    /// the [`grid.hline`] and [`grid.vline`] elements.
-    ///
-    /// The cells are populated in row-major order.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     #[variadic]
     pub children: Vec<GridChild>,
 }
@@ -761,7 +526,6 @@ impl TryFrom<Content> for GridItem {
     }
 }
 
-<<<<<<< HEAD
 /// 繰り返し可能なグリッドのヘッダー。
 ///
 /// `repeat`が`true`に設定されている場合、ヘッダーは改ページごとに繰り返されます。
@@ -782,36 +546,10 @@ pub struct GridHeader {
     pub level: NonZeroU32,
 
     /// ヘッダー内のセルと線。
-=======
-/// A repeatable grid header.
-///
-/// If `repeat` is set to `true`, the header will be repeated across pages. For
-/// an example, refer to the [`table.header`] element and the [`grid.stroke`]
-/// parameter.
-#[elem(name = "header", title = "Grid Header")]
-pub struct GridHeader {
-    /// Whether this header should be repeated across pages.
-    #[default(true)]
-    pub repeat: bool,
-
-    /// The level of the header. Must not be zero.
-    ///
-    /// This allows repeating multiple headers at once. Headers with different
-    /// levels can repeat together, as long as they have ascending levels.
-    ///
-    /// Notably, when a header with a lower level starts repeating, all higher
-    /// or equal level headers stop repeating (they are "replaced" by the new
-    /// header).
-    #[default(NonZeroU32::ONE)]
-    pub level: NonZeroU32,
-
-    /// The cells and lines within the header.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     #[variadic]
     pub children: Vec<GridItem>,
 }
 
-<<<<<<< HEAD
 /// 繰り返し可能なグリッドのフッター。
 ///
 /// [`grid.header`]要素と同様に各ページで繰り返し可能です。
@@ -824,26 +562,10 @@ pub struct GridFooter {
     pub repeat: bool,
 
     /// フッター内のセルと線。
-=======
-/// A repeatable grid footer.
-///
-/// Just like the [`grid.header`] element, the footer can repeat itself on every
-/// page of the table.
-///
-/// No other grid cells may be placed after the footer.
-#[elem(name = "footer", title = "Grid Footer")]
-pub struct GridFooter {
-    /// Whether this footer should be repeated across pages.
-    #[default(true)]
-    pub repeat: bool,
-
-    /// The cells and lines within the footer.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     #[variadic]
     pub children: Vec<GridItem>,
 }
 
-<<<<<<< HEAD
 /// グリッドの水平方向の線。
 ///
 /// グリッドの`stroke`フィールドを用いて指定されたものを含めてセルごとに設定されたストロークを上書きします。
@@ -873,71 +595,19 @@ pub struct GridHLine {
     ///
     /// `{none}`を指定すると、水平方向の線の範囲にこれまで配置された全ての線が削除されます。
     /// これには水平方向の線の下にあるhlineやセルごとのストロークが含まれます。
-=======
-/// A horizontal line in the grid.
-///
-/// Overrides any per-cell stroke, including stroke specified through the grid's
-/// `stroke` field. Can cross spacing between cells created through the grid's
-/// `column-gutter` option.
-///
-/// An example for this function can be found at the [`table.hline`] element.
-#[elem(name = "hline", title = "Grid Horizontal Line")]
-pub struct GridHLine {
-    /// The row above which the horizontal line is placed (zero-indexed).
-    /// If the `position` field is set to `{bottom}`, the line is placed below
-    /// the row with the given index instead (see [`grid.hline.position`] for
-    /// details).
-    ///
-    /// Specifying `{auto}` causes the line to be placed at the row below the
-    /// last automatically positioned cell (that is, cell without coordinate
-    /// overrides) before the line among the grid's children. If there is no
-    /// such cell before the line, it is placed at the top of the grid (row 0).
-    /// Note that specifying for this option exactly the total amount of rows
-    /// in the grid causes this horizontal line to override the bottom border
-    /// of the grid, while a value of 0 overrides the top border.
-    pub y: Smart<usize>,
-
-    /// The column at which the horizontal line starts (zero-indexed, inclusive).
-    pub start: usize,
-
-    /// The column before which the horizontal line ends (zero-indexed,
-    /// exclusive).
-    /// Therefore, the horizontal line will be drawn up to and across column
-    /// `end - 1`.
-    ///
-    /// A value equal to `{none}` or to the amount of columns causes it to
-    /// extend all the way towards the end of the grid.
-    pub end: Option<NonZeroUsize>,
-
-    /// The line's stroke.
-    ///
-    /// Specifying `{none}` removes any lines previously placed across this
-    /// line's range, including hlines or per-cell stroke below it.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     #[fold]
     #[default(Some(Arc::new(Stroke::default())))]
     pub stroke: Option<Arc<Stroke>>,
 
-<<<<<<< HEAD
     /// 行（`y`）が与えられた場合の線が配置される位置。
     /// `{top}`か`{bottom}`のいずれかを指定し、それぞれその行の上または下に描画します。
     ///
     /// この設定は`row-gutter`が設定されている場合にのみ有効です（それ以外の場合は使用せず、単に`y`フィールドの値を1ずつ増やしてください）。
     /// これは、行の下部の位置と次の行の上部の位置の間に空白が発生し、両者が一致しなくなるためです。
-=======
-    /// The position at which the line is placed, given its row (`y`) - either
-    /// `{top}` to draw above it or `{bottom}` to draw below it.
-    ///
-    /// This setting is only relevant when row gutter is enabled (and
-    /// shouldn't be used otherwise - prefer just increasing the `y` field by
-    /// one instead), since then the position below a row becomes different
-    /// from the position above the next row due to the spacing between both.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     #[default(OuterVAlignment::Top)]
     pub position: OuterVAlignment,
 }
 
-<<<<<<< HEAD
 /// グリッドの垂直方向の線。
 ///
 /// グリッドのstrokeフィールドを用いて指定されたものを含めてセルごとに設定されたストロークを上書きします。
@@ -964,52 +634,10 @@ pub struct GridVLine {
     ///
     /// `{none}`を指定すると、垂直方向の線の範囲にこれまで配置された全ての線が削除されます。
     /// これには垂直方向の線の下にあるvlineやセルごとのストロークが含まれます。
-=======
-/// A vertical line in the grid.
-///
-/// Overrides any per-cell stroke, including stroke specified through the
-/// grid's `stroke` field. Can cross spacing between cells created through
-/// the grid's `row-gutter` option.
-#[elem(name = "vline", title = "Grid Vertical Line")]
-pub struct GridVLine {
-    /// The column before which the vertical line is placed (zero-indexed).
-    /// If the `position` field is set to `{end}`, the line is placed after the
-    /// column with the given index instead (see [`grid.vline.position`] for
-    /// details).
-    ///
-    /// Specifying `{auto}` causes the line to be placed at the column after
-    /// the last automatically positioned cell (that is, cell without
-    /// coordinate overrides) before the line among the grid's children. If
-    /// there is no such cell before the line, it is placed before the grid's
-    /// first column (column 0).
-    /// Note that specifying for this option exactly the total amount of
-    /// columns in the grid causes this vertical line to override the end
-    /// border of the grid (right in LTR, left in RTL), while a value of 0
-    /// overrides the start border (left in LTR, right in RTL).
-    pub x: Smart<usize>,
-
-    /// The row at which the vertical line starts (zero-indexed, inclusive).
-    pub start: usize,
-
-    /// The row on top of which the vertical line ends (zero-indexed,
-    /// exclusive).
-    /// Therefore, the vertical line will be drawn up to and across row
-    /// `end - 1`.
-    ///
-    /// A value equal to `{none}` or to the amount of rows causes it to extend
-    /// all the way towards the bottom of the grid.
-    pub end: Option<NonZeroUsize>,
-
-    /// The line's stroke.
-    ///
-    /// Specifying `{none}` removes any lines previously placed across this
-    /// line's range, including vlines or per-cell stroke below it.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     #[fold]
     #[default(Some(Arc::new(Stroke::default())))]
     pub stroke: Option<Arc<Stroke>>,
 
-<<<<<<< HEAD
     /// 列（`x`）が与えられた場合の線が配置される位置。
     /// `{start}`か`{end}`のいずれかを指定し、それぞれその前またはその後に描画します。
     ///
@@ -1018,38 +646,15 @@ pub struct GridVLine {
     /// この設定は`column-gutter`が設定されている場合にのみ有効です（それ以外の場合は使用せず、単に`x`フィールドの値を1ずつ増やしてください）。
     /// これは、ある列の直後の位置と次の列の直前の位置の間に空白が発生し、両者が一致しなくなるためです。
 
-=======
-    /// The position at which the line is placed, given its column (`x`) -
-    /// either `{start}` to draw before it or `{end}` to draw after it.
-    ///
-    /// The values `{left}` and `{right}` are also accepted, but discouraged as
-    /// they cause your grid to be inconsistent between left-to-right and
-    /// right-to-left documents.
-    ///
-    /// This setting is only relevant when column gutter is enabled (and
-    /// shouldn't be used otherwise - prefer just increasing the `x` field by
-    /// one instead), since then the position after a column becomes different
-    /// from the position before the next column due to the spacing between
-    /// both.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     #[default(OuterHAlignment::Start)]
     pub position: OuterHAlignment,
 }
 
-<<<<<<< HEAD
 /// グリッドのセル。
 /// グリッドの引数リストでこの関数を用いると各セルのスタイルプロパティを上書きしたり、グリッド内にセルを手動で配置したりできます。
 /// showルールにこの関数を用いると複数のセルに対して特定のスタイルを一度に適用できます。
 ///
 /// 例えば、以下のようにある単一セルの位置とストロークを上書きできます。
-=======
-/// A cell in the grid. You can use this function in the argument list of a grid
-/// to override grid style properties for an individual cell or manually
-/// positioning it within the grid. You can also use this function in show rules
-/// to apply certain styles to multiple cells at once.
-///
-/// For example, you can override the position and stroke for a single cell:
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 ///
 /// ```example
 /// >>> #set page(width: auto)
@@ -1080,7 +685,6 @@ pub struct GridVLine {
 /// )
 /// ```
 ///
-<<<<<<< HEAD
 /// `grid.cell`に対してshowルールを用いると全てのセルに一括でスタイル設定ができます。
 /// 例えば、セルの位置に基づいてスタイルを適用できます。
 /// より詳しく知りたい場合は[`table.cell`]要素の例を参照してください。
@@ -1097,29 +701,6 @@ pub struct GridCell {
     /// 行（`y`）が選択されていない場合、セルは（0行目から始まる）使用可能な（存在しなければ新しい）最初の行に配置されます。
     /// 一方、`x`と`y`の両方が選択された場合は正確にその位置に配置されます。
     /// その位置が利用できない場合、エラーが発生します（したがって、通常はセルを自動配置する前に、カスタム位置を指定する方が賢明です）。
-=======
-/// You may also apply a show rule on `grid.cell` to style all cells at once,
-/// which allows you, for example, to apply styles based on a cell's position.
-/// Refer to the examples of the [`table.cell`] element to learn more about
-/// this.
-#[elem(name = "cell", title = "Grid Cell")]
-pub struct GridCell {
-    /// The cell's body.
-    #[required]
-    pub body: Content,
-
-    /// The cell's column (zero-indexed).
-    /// This field may be used in show rules to style a cell depending on its
-    /// column.
-    ///
-    /// You may override this field to pick in which column the cell must
-    /// be placed. If no row (`y`) is chosen, the cell will be placed in the
-    /// first row (starting at row 0) with that column available (or a new row
-    /// if none). If both `x` and `y` are chosen, however, the cell will be
-    /// placed in that exact position. An error is raised if that position is
-    /// not available (thus, it is usually wise to specify cells with a custom
-    /// position before cells with automatic positions).
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     ///
     /// ```example
     /// #let circ(c) = circle(
@@ -1141,23 +722,12 @@ pub struct GridCell {
     /// ```
     pub x: Smart<usize>,
 
-<<<<<<< HEAD
     /// セルの行（0始まり）。
     /// このフィールドをshowルールで用いるとセルの行に応じたスタイルを適用できます。
     ///
     /// このフィールドを上書きすることでセルを配置する行を選択できます。
     /// 列（`x`）が選択されていない場合、セルは（0列目から始まる）使用可能な最初の列に配置されます。
     /// 選ばれた行にある全ての列が既に埋まっている場合、エラーが発生します。
-=======
-    /// The cell's row (zero-indexed).
-    /// This field may be used in show rules to style a cell depending on its
-    /// row.
-    ///
-    /// You may override this field to pick in which row the cell must be
-    /// placed. If no column (`x`) is chosen, the cell will be placed in the
-    /// first column (starting at column 0) available in the chosen row. If all
-    /// columns in the chosen row are already occupied, an error is raised.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     ///
     /// ```example
     /// #let tri(c) = polygon.regular(
@@ -1179,7 +749,6 @@ pub struct GridCell {
     /// ```
     pub y: Smart<usize>,
 
-<<<<<<< HEAD
     /// このcellがまたぐ列の数。
     #[default(NonZeroUsize::ONE)]
     pub colspan: NonZeroUsize,
@@ -1198,26 +767,6 @@ pub struct GridCell {
     pub fill: Smart<Option<Paint>>,
 
     /// セルの[stroke]($grid.stroke)の上書き。
-=======
-    /// The amount of columns spanned by this cell.
-    #[default(NonZeroUsize::ONE)]
-    pub colspan: NonZeroUsize,
-
-    /// The amount of rows spanned by this cell.
-    #[default(NonZeroUsize::ONE)]
-    pub rowspan: NonZeroUsize,
-
-    /// The cell's [inset]($grid.inset) override.
-    pub inset: Smart<Sides<Option<Rel<Length>>>>,
-
-    /// The cell's [alignment]($grid.align) override.
-    pub align: Smart<Alignment>,
-
-    /// The cell's [fill]($grid.fill) override.
-    pub fill: Smart<Option<Paint>>,
-
-    /// The cell's [stroke]($grid.stroke) override.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     #[fold]
     pub stroke: Sides<Option<Option<Arc<Stroke>>>>,
 
@@ -1225,15 +774,8 @@ pub struct GridCell {
     #[parse(Some(false))]
     pub is_repeated: bool,
 
-<<<<<<< HEAD
     /// このcellがまたぐ行のページまたぎを許すかどうか。
     /// `{auto}`に設定された場合、固定サイズの行のみをまたぐセルは分割不可となり、`{auto}`サイズの行を少なくとも1つ含むセルは分割可能となります。
-=======
-    /// Whether rows spanned by this cell can be placed in different pages.
-    /// When equal to `{auto}`, a cell spanning only fixed-size rows is
-    /// unbreakable, while a cell spanning at least one `{auto}`-sized row is
-    /// breakable.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     pub breakable: Smart<bool>,
 }
 
diff --git a/crates/typst-library/src/layout/hide.rs b/crates/typst-library/src/layout/hide.rs
index 59014a43b0..7f26b5e8bf 100644
--- a/crates/typst-library/src/layout/hide.rs
+++ b/crates/typst-library/src/layout/hide.rs
@@ -1,32 +1,16 @@
 use crate::foundations::{Content, elem};
 use crate::introspection::Tagged;
 
-<<<<<<< HEAD
 /// レイアウトに影響を与えないコンテンツの隠蔽。
 ///
 /// `hide`関数を用いると、レイアウトにコンテンツを「認識」させながらコンテンツを隠せます。
 /// これは何らかのコンテンツと全く同じ大きさを持つ空白を作る際に便利です。
-/// 引数が出力に含まれないため、コンテンツを削除する際にも便利かもしれません。
 ///
 /// # 例
-=======
-/// Hides content without affecting layout.
-///
-/// The `hide` function allows you to hide content while the layout still "sees"
-/// it. This is useful for creating blank space that is exactly as large as some
-/// content.
-///
-/// # Example
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 /// ```example
 /// Hello Jane \
 /// #hide[Hello] Joe
 /// ```
-<<<<<<< HEAD
-#[elem(Tagged)]
-pub struct HideElem {
-    /// 隠したいコンテンツ。
-=======
 ///
 /// # Redaction
 /// This function may also be useful for redacting content as its arguments are
@@ -39,8 +23,7 @@ pub struct HideElem {
 /// recommend using this function to hide highly sensitive information.
 #[elem(Tagged)]
 pub struct HideElem {
-    /// The content to hide.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
+    /// 隠したいコンテンツ。
     #[required]
     pub body: Content,
 
diff --git a/crates/typst-library/src/layout/layout.rs b/crates/typst-library/src/layout/layout.rs
index 7fc1babe07..9bb7b03584 100644
--- a/crates/typst-library/src/layout/layout.rs
+++ b/crates/typst-library/src/layout/layout.rs
@@ -3,22 +3,11 @@ use typst_syntax::Span;
 use crate::foundations::{Content, Func, NativeElement, elem, func};
 use crate::introspection::Locatable;
 
-<<<<<<< HEAD
 /// 現在の外側のコンテナ（存在しなければページ）の寸法（幅と高さ）へのアクセスを提供します。
 ///
 /// `width`と`height`という[`length`]型のキーを持つ辞書を単一の引数として受け取る関数を受け付けます。
 /// 関数には[context]が渡されるため、`context`キーワードと組み合わせて使用する必要はありません。
 /// これが以下の例で[`measure`]が呼び出せる理由です。
-=======
-/// Provides access to the current outer container's (or page's, if none)
-/// dimensions (width and height).
-///
-/// Accepts a function that receives a single parameter, which is a dictionary
-/// with keys `width` and `height`, both of type [`length`]. The function is
-/// provided [context], meaning you don't need to use it in combination with the
-/// `context` keyword. This is why [`measure`] can be called in the example
-/// below.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 ///
 /// ```example
 /// #let text = lorem(30)
@@ -33,7 +22,6 @@ use crate::introspection::Locatable;
 /// ])
 /// ```
 ///
-<<<<<<< HEAD
 /// `layout`関数はコンテンツに[ブロック]($block)レベルのコンテナであることを強制するため、そのコンテナ内部でページを基準とした配置や改ページはできないことに注意してください。
 ///
 /// 例えば、幅が`{800pt}`で高さが`{400pt}`のボックスの中から`layout`が呼び出されたとすると、指定された関数には`{(width: 800pt, height: 400pt)}`という引数が与えられます。
@@ -42,22 +30,6 @@ use crate::introspection::Locatable;
 ///
 /// `layout`の呼び出しを`{block(height: 1fr)}`でラップすることで、ページ全体の高さではなく、_残りの_高さを取得できます。
 /// これが動作するのは、残りのスペースを埋めるようにブロックが自動的に拡張するためです（詳細は[比率]($fraction)のドキュメントを参照してください）。
-=======
-/// Note that the `layout` function forces its contents into a [block]-level
-/// container, so placement relative to the page or pagebreaks are not possible
-/// within it.
-///
-/// If the `layout` call is placed inside a box with a width of `{800pt}` and a
-/// height of `{400pt}`, then the specified function will be given the argument
-/// `{(width: 800pt, height: 400pt)}`. If it is placed directly into the page, it
-/// receives the page's dimensions minus its margins. This is mostly useful in
-/// combination with [measurement]($measure).
-///
-/// To retrieve the _remaining_ height of the page rather than its full size,
-/// you can wrap your `layout` call in a `{block(height: 1fr)}`. This works
-/// because the block automatically grows to fill the remaining space (see the
-/// [fraction] documentation for more details).
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 ///
 /// ```example
 /// #set page(height: 150pt)
@@ -69,13 +41,8 @@ use crate::introspection::Locatable;
 /// ]))
 /// ```
 ///
-<<<<<<< HEAD
 /// この関数は、[`ratio`]を固定長に変換するためにも利用できます。
 /// これは独自のレイアウト抽象化を構築する際に重宝するかもしれません。
-=======
-/// You can also use this function to resolve a [`ratio`] to a fixed length.
-/// This might come in handy if you're building your own layout abstractions.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 ///
 /// ```example
 /// #layout(size => {
@@ -84,7 +51,6 @@ use crate::introspection::Locatable;
 /// })
 /// ```
 ///
-<<<<<<< HEAD
 /// `layout`が提供する幅と高さは、対象ページの寸法が`{auto}`に設定されていると無限大となりうることに注意してください。
 #[func]
 pub fn layout(
@@ -93,25 +59,10 @@ pub fn layout(
     /// 戻り値は文書に表示されます。
     ///
     /// コンテナの大きさは`width`と`height`のキーを持つ[dictionary]として与えられます。
+    /// Both are of type [`length`].
     ///
     /// この関数は、`layout`によって返されるコンテンツが文書に現れると、その都度1回呼び出されます。
     /// これによりそのコンテナの寸法に依存するコンテンツの生成が可能になります。
-=======
-/// Note that the width or height provided by `layout` will be infinite if the
-/// corresponding page dimension is set to `{auto}`.
-#[func]
-pub fn layout(
-    span: Span,
-    /// A function to call with the outer container's size. Its return value is
-    /// displayed in the document.
-    ///
-    /// The container's size is given as a [dictionary] with the keys `width`
-    /// and `height`, both of type [`length`].
-    ///
-    /// This function is called once for each time the content returned by
-    /// `layout` appears in the document. This makes it possible to generate
-    /// content that depends on the dimensions of its container.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     func: Func,
 ) -> Content {
     LayoutElem::new(func).pack().spanned(span)
diff --git a/crates/typst-library/src/layout/length.rs b/crates/typst-library/src/layout/length.rs
index e7de07551c..35ed98bad4 100644
--- a/crates/typst-library/src/layout/length.rs
+++ b/crates/typst-library/src/layout/length.rs
@@ -11,7 +11,6 @@ use crate::diag::{HintedStrResult, SourceResult, bail};
 use crate::foundations::{Context, Fold, Repr, Resolve, StyleChain, func, scope, ty};
 use crate::layout::{Abs, Em};
 
-<<<<<<< HEAD
 /// 文脈に応じた単位で表現される場合もある、大きさまたは距離。
 ///
 /// Typstは以下の長さの単位をサポートしています。
@@ -25,21 +24,6 @@ use crate::layout::{Abs, Em};
 /// 長さは整数や浮動小数点数で乗除算できます。
 ///
 /// # 例
-=======
-/// A size or distance, possibly expressed with contextual units.
-///
-/// Typst supports the following length units:
-///
-/// - Points: `{72pt}`
-/// - Millimeters: `{254mm}`
-/// - Centimeters: `{2.54cm}`
-/// - Inches: `{1in}`
-/// - Relative to font size: `{2.5em}`
-///
-/// You can multiply lengths with and divide them by integers and floats.
-///
-/// # Example
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 /// ```example
 /// #rect(width: 20pt)
 /// #rect(width: 2em)
@@ -51,16 +35,9 @@ use crate::layout::{Abs, Em};
 /// #(5em).abs
 /// ```
 ///
-<<<<<<< HEAD
 /// # フィールド
 /// - `abs`: 現在の長さの単なる数値部分（すなわち`em`部分を除いたもの）。
 /// - `em`: [float]としての、このlengthでの`em`単位の大きさ。
-=======
-/// # Fields
-/// - `abs`: A length with just the absolute component of the current length
-///   (that is, excluding the `em` component).
-/// - `em`: The amount of `em` units in this length, as a [float].
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 #[ty(scope, cast)]
 #[derive(Default, Copy, Clone, Eq, PartialEq, Hash)]
 pub struct Length {
@@ -117,81 +94,47 @@ impl Length {
 
 #[scope]
 impl Length {
-<<<<<<< HEAD
     /// このlengthをポイントに変換します。
     ///
     /// このlengthの`em`単位の値が（単に`2pt`ではなく`5em + 2pt`のように）非ゼロの場合にエラーが発生して失敗します。
     /// 長さの`em`成分を無視するために（`(5em + 2pt).abs.pt()`のように）`abs`フィールドを使用してください（したがって、数値部分のみが変換されます）。
-=======
-    /// Converts this length to points.
-    ///
-    /// Fails with an error if this length has non-zero `em` units (such as
-    /// `5em + 2pt` instead of just `2pt`). Use the `abs` field (such as in
-    /// `(5em + 2pt).abs.pt()`) to ignore the `em` component of the length (thus
-    /// converting only its absolute component).
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     #[func(name = "pt", title = "Points")]
     pub fn to_pt(&self, span: Span) -> SourceResult<f64> {
         self.ensure_that_em_is_zero(span, "pt")?;
         Ok(self.abs.to_pt())
     }
 
-<<<<<<< HEAD
     /// このlengthをミリメートルに変換します。
     ///
     /// このlengthの`em`単位の値が非ゼロの場合にエラーが発生して失敗します。
     /// 詳細は[`pt`]($length.pt)メソッドを参照して下さい。
-=======
-    /// Converts this length to millimeters.
-    ///
-    /// Fails with an error if this length has non-zero `em` units. See the
-    /// [`pt`]($length.pt) method for more details.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     #[func(name = "mm", title = "Millimeters")]
     pub fn to_mm(&self, span: Span) -> SourceResult<f64> {
         self.ensure_that_em_is_zero(span, "mm")?;
         Ok(self.abs.to_mm())
     }
 
-<<<<<<< HEAD
     /// このlengthをセンチメートルに変換します。
     ///
     /// このlengthの`em`単位の値が非ゼロの場合にエラーが発生して失敗します。
     /// 詳細は[`pt`]($length.pt)メソッドを参照して下さい。
-=======
-    /// Converts this length to centimeters.
-    ///
-    /// Fails with an error if this length has non-zero `em` units. See the
-    /// [`pt`]($length.pt) method for more details.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     #[func(name = "cm", title = "Centimeters")]
     pub fn to_cm(&self, span: Span) -> SourceResult<f64> {
         self.ensure_that_em_is_zero(span, "cm")?;
         Ok(self.abs.to_cm())
     }
 
-<<<<<<< HEAD
     /// このlengthをインチに変換します。
     ///
     /// このlengthの`em`単位の値が非ゼロの場合にエラーが発生して失敗します。
     /// 詳細は[`pt`]($length.pt)メソッドを参照して下さい。
-=======
-    /// Converts this length to inches.
-    ///
-    /// Fails with an error if this length has non-zero `em` units. See the
-    /// [`pt`]($length.pt) method for more details.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     #[func(name = "inches")]
     pub fn to_inches(&self, span: Span) -> SourceResult<f64> {
         self.ensure_that_em_is_zero(span, "inches")?;
         Ok(self.abs.to_inches())
     }
 
-<<<<<<< HEAD
     /// このlengthを絶対的な長さに変換します。
-=======
-    /// Resolve this length to an absolute length.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     ///
     /// ```example
     /// #set text(size: 12pt)
diff --git a/crates/typst-library/src/layout/measure.rs b/crates/typst-library/src/layout/measure.rs
index c4636a2f84..371c1fd10c 100644
--- a/crates/typst-library/src/layout/measure.rs
+++ b/crates/typst-library/src/layout/measure.rs
@@ -9,7 +9,6 @@ use crate::foundations::{
 use crate::introspection::{Locator, LocatorLink};
 use crate::layout::{Abs, Axes, Length, Region, Size};
 
-<<<<<<< HEAD
 /// レイアウトされたコンテンツの測定。
 ///
 /// `measure`関数を用いるとレイアウトされたコンテンツの大きさを測定できます。
@@ -19,20 +18,6 @@ use crate::layout::{Abs, Axes, Length, Region, Size};
 /// # 例
 /// 同じコンテンツでも置く場所の[context]によって異なる大きさになることがあります。
 /// 以下の例では、フォントサイズを大きくすると`[#content]`は必然的に大きくなります。
-=======
-/// Measures the layouted size of content.
-///
-/// The `measure` function lets you determine the layouted size of content.
-/// By default an infinite space is assumed, so the measured dimensions may
-/// not necessarily match the final dimensions of the content.
-/// If you want to measure in the current layout dimensions, you can combine
-/// `measure` and [`layout`].
-///
-/// # Example
-/// The same content can have a different size depending on the [context] that
-/// it is placed into. In the example below, the `[#content]` is of course
-/// bigger when we increase the font size.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 ///
 /// ```example
 /// #let content = [Hello!]
@@ -41,11 +26,7 @@ use crate::layout::{Abs, Axes, Length, Region, Size};
 /// #content
 /// ```
 ///
-<<<<<<< HEAD
 /// この理由から、測定が可能なのはコンテキストが利用可能な場合に限ります。
-=======
-/// For this reason, you can only measure when context is available.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 ///
 /// ```example
 /// #let thing(body) = context {
@@ -57,34 +38,18 @@ use crate::layout::{Abs, Axes, Length, Region, Size};
 /// #thing[Welcome]
 /// ```
 ///
-<<<<<<< HEAD
 /// measure関数はキーが`width`と`height`で、その値がいずれも[`length`]型の辞書を返します。
-=======
-/// The measure function returns a dictionary with the entries `width` and
-/// `height`, both of type [`length`].
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 #[func(contextual)]
 pub fn measure(
     engine: &mut Engine,
     context: Tracked<Context>,
     span: Span,
-<<<<<<< HEAD
     /// コンテンツをレイアウトするのに利用可能な幅。
     ///
     /// これを`{auto}`に設定すると無限大の幅が利用可能であると見なされます。
     ///
     /// この関数の`width`および`height`パラメーターを用いることは、大きさを持ち、コンテンツを有する[`block`]を測定することとは異なることに注意してください。
     /// 以下の例では、前者はブロックの寸法ではなく、内側のコンテンツの寸法を取得します。
-=======
-    /// The width available to layout the content.
-    ///
-    /// Setting this to `{auto}` indicates infinite available width.
-    ///
-    /// Note that using the `width` and `height` parameters of this function is
-    /// different from measuring a sized [`block`] containing the content. In
-    /// the following example, the former will get the dimensions of the inner
-    /// content instead of the dimensions of the block.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     ///
     /// ```example
     /// #context measure(lorem(100), width: 400pt)
@@ -94,7 +59,6 @@ pub fn measure(
     #[named]
     #[default(Smart::Auto)]
     width: Smart<Length>,
-<<<<<<< HEAD
     /// コンテンツをレイアウトするのに利用可能な高さ。
     ///
     /// これを`{auto}`に設定すると無限大の高さが利用可能であると見なされます。
@@ -102,15 +66,6 @@ pub fn measure(
     #[default(Smart::Auto)]
     height: Smart<Length>,
     /// 大きさを測定するコンテンツ。
-=======
-    /// The height available to layout the content.
-    ///
-    /// Setting this to `{auto}` indicates infinite available height.
-    #[named]
-    #[default(Smart::Auto)]
-    height: Smart<Length>,
-    /// The content whose size to measure.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     content: Content,
 ) -> SourceResult<Dict> {
     // Create a pod region with the available space.
diff --git a/crates/typst-library/src/layout/pad.rs b/crates/typst-library/src/layout/pad.rs
index 4fd191be18..dfc479177f 100644
--- a/crates/typst-library/src/layout/pad.rs
+++ b/crates/typst-library/src/layout/pad.rs
@@ -1,20 +1,11 @@
 use crate::foundations::{Content, elem};
 use crate::layout::{Length, Rel};
 
-<<<<<<< HEAD
 /// コンテンツの周囲に空白を追加。
 ///
 /// 空白は各辺を独立に指定するか、位置変数を用いて全辺を一括指定できます。
 ///
 /// # 例
-=======
-/// Adds spacing around content.
-///
-/// The spacing can be specified for each side individually, or for all sides at
-/// once by specifying a positional argument.
-///
-/// # Example
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 /// ```example
 /// #set align(center)
 ///
@@ -24,11 +15,7 @@ use crate::layout::{Length, Rel};
 /// ```
 #[elem(title = "Padding")]
 pub struct PadElem {
-<<<<<<< HEAD
     /// 左辺のパディング。
-=======
-    /// The padding at the left side.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     #[parse(
         let all = args.named("rest")?.or(args.find()?);
         let x = args.named("x")?.or(all);
@@ -37,7 +24,6 @@ pub struct PadElem {
     )]
     pub left: Rel<Length>,
 
-<<<<<<< HEAD
     /// 上辺のパディング。
     #[parse(args.named("top")?.or(y))]
     pub top: Rel<Length>,
@@ -63,33 +49,6 @@ pub struct PadElem {
     pub rest: Rel<Length>,
 
     /// パディングを追加するコンテンツ。
-=======
-    /// The padding at the top side.
-    #[parse(args.named("top")?.or(y))]
-    pub top: Rel<Length>,
-
-    /// The padding at the right side.
-    #[parse(args.named("right")?.or(x))]
-    pub right: Rel<Length>,
-
-    /// The padding at the bottom side.
-    #[parse(args.named("bottom")?.or(y))]
-    pub bottom: Rel<Length>,
-
-    /// A shorthand to set `left` and `right` to the same value.
-    #[external]
-    pub x: Rel<Length>,
-
-    /// A shorthand to set `top` and `bottom` to the same value.
-    #[external]
-    pub y: Rel<Length>,
-
-    /// A shorthand to set all four sides to the same value.
-    #[external]
-    pub rest: Rel<Length>,
-
-    /// The content to pad at the sides.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     #[required]
     pub body: Content,
 }
diff --git a/crates/typst-library/src/layout/page.rs b/crates/typst-library/src/layout/page.rs
index e511669eae..5ade5fe7c0 100644
--- a/crates/typst-library/src/layout/page.rs
+++ b/crates/typst-library/src/layout/page.rs
@@ -19,7 +19,6 @@ use crate::model::{DocumentInfo, Numbering};
 use crate::text::LocalName;
 use crate::visualize::{Color, Paint};
 
-<<<<<<< HEAD
 /// その子要素を単一ページか複数ページにレイアウト。
 ///
 /// この関数は主にsetルールでページのプロパティに影響を与えるために使用されますが、引数を独自のページセットに明示的にレンダリングするためにも使用できます。
@@ -30,21 +29,6 @@ use crate::visualize::{Color, Paint};
 /// [ページセットアップガイド]($guides/page-setup)では多くの例とともにこの関数と関連する関数を用いてどのように文書をセットアップするかを説明しています。
 ///
 /// # 例
-=======
-/// Layouts its child onto one or multiple pages.
-///
-/// Although this function is primarily used in set rules to affect page
-/// properties, it can also be used to explicitly render its argument onto
-/// a set of pages of its own.
-///
-/// Pages can be set to use `{auto}` as their width or height. In this case, the
-/// pages will grow to fit their content on the respective axis.
-///
-/// The [Guide for Page Setup]($guides/page-setup) explains how to use
-/// this and related functions to set up a document with many examples.
-///
-/// # Example
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 /// ```example
 /// >>> #set page(margin: auto)
 /// #set page("us-letter")
@@ -52,7 +36,6 @@ use crate::visualize::{Color, Paint};
 /// There you go, US friends!
 /// ```
 ///
-<<<<<<< HEAD
 /// # アクセシビリティ
 /// ページのヘッダー、フッター、前景、背景の内容は支援技術（AT）には読み上げられません。
 /// 文書内で重要な情報は本文に含めてください。
@@ -61,28 +44,11 @@ pub struct PageElem {
     /// 幅と高さを設定するための標準的な紙の大きさ。
     ///
     /// これは`width`と`height`を設定するための単なる省略記法であり、その性質上コンテキスト式からは取得できません。
-=======
-/// # Accessibility
-/// The contents of the page's header, footer, foreground, and background are
-/// invisible to Assistive Technology (AT) like screen readers. Only the body of
-/// the page is read by AT. Do not include vital information not included
-/// elsewhere in the document in these areas.
-#[elem(Construct)]
-pub struct PageElem {
-    /// A standard paper size to set width and height.
-    ///
-    /// This is just a shorthand for setting `width` and `height` and, as such,
-    /// cannot be retrieved in a context expression.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     #[external]
     #[default(Paper::A4)]
     pub paper: Paper,
 
-<<<<<<< HEAD
     /// ページの幅。
-=======
-    /// The width of the page.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     ///
     /// ```example
     /// #set page(
@@ -103,22 +69,12 @@ pub struct PageElem {
     #[ghost]
     pub width: Smart<Length>,
 
-<<<<<<< HEAD
     /// ページの高さ。
     ///
     /// これが`{auto}`に設定された場合、[改ページ]($pagebreak)は手動で挿入したときのみ発火させられます。
     /// あるいは、別の空でないページセットルールを追加したときに発火します。
     /// このドキュメントのほとんどの例では、ページの高さに `{auto}` を指定しており、
     /// コンテンツにあわせて動的に伸縮するようにしています。
-=======
-    /// The height of the page.
-    ///
-    /// If this is set to `{auto}`, page breaks can only be triggered manually
-    /// by inserting a [page break]($pagebreak) or by adding another non-empty
-    /// page set rule. Most examples throughout this documentation use `{auto}`
-    /// for the height of the page to dynamically grow and shrink to fit their
-    /// content.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     #[parse(
         args.named("height")?
             .or_else(|| paper.map(|paper| Smart::Custom(paper.height().into())))
@@ -127,11 +83,7 @@ pub struct PageElem {
     #[ghost]
     pub height: Smart<Length>,
 
-<<<<<<< HEAD
     /// ページを90度回転させるかどうか。
-=======
-    /// Whether the page is flipped into landscape orientation.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     ///
     /// ```example
     /// #set page(
@@ -153,7 +105,6 @@ pub struct PageElem {
     #[ghost]
     pub flipped: bool,
 
-<<<<<<< HEAD
     /// ページの余白。
     ///
     /// - `{auto}`: 余白が自動的に短辺の2.5/21倍の大きさに設定されます。
@@ -173,32 +124,6 @@ pub struct PageElem {
     ///
     /// 全てのキーは省略可能で、未指定のキーは以前の設定（未設定なら既定値）を使用します。
     /// また、`left`と`right`は`inside`と`outside`と同時に指定できません。
-=======
-    /// The page's margins.
-    ///
-    /// - `{auto}`: The margins are set automatically to 2.5/21 times the smaller
-    ///   dimension of the page. This results in 2.5 cm margins for an A4 page.
-    /// - A single length: The same margin on all sides.
-    /// - A dictionary: With a dictionary, the margins can be set individually.
-    ///   The dictionary can contain the following keys in order of precedence:
-    ///   - `top`: The top margin.
-    ///   - `right`: The right margin.
-    ///   - `bottom`: The bottom margin.
-    ///   - `left`: The left margin.
-    ///   - `inside`: The margin at the inner side of the page (where the
-    ///     [binding]($page.binding) is).
-    ///   - `outside`: The margin at the outer side of the page (opposite to the
-    ///     [binding]($page.binding)).
-    ///   - `x`: The horizontal margins.
-    ///   - `y`: The vertical margins.
-    ///   - `rest`: The margins on all sides except those for which the
-    ///     dictionary explicitly sets a size.
-    ///
-    /// All keys are optional; omitted keys will use their previously set value,
-    /// or the default margin if never set. In addition, the values for `left`
-    /// and `right` are mutually exclusive with the values for `inside` and
-    /// `outside`.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     ///
     /// ```example
     /// #set page(
@@ -217,7 +142,6 @@ pub struct PageElem {
     #[ghost]
     pub margin: Margin,
 
-<<<<<<< HEAD
     /// ページのどちら側を綴じるか。
     ///
     /// - `{auto}`: [テキストの向き]($text.dir)が左から右なら`left`と等価となり、右から左なら`right`と等価となります。
@@ -231,24 +155,6 @@ pub struct PageElem {
     /// ぺージの段数。
     ///
     /// ページや他のコンテナに段を挿入したい場合は[`columns`関数]($columns)も使用できます。
-=======
-    /// On which side the pages will be bound.
-    ///
-    /// - `{auto}`: Equivalent to `left` if the [text direction]($text.dir)
-    ///   is left-to-right and `right` if it is right-to-left.
-    /// - `left`: Bound on the left side.
-    /// - `right`: Bound on the right side.
-    ///
-    /// This affects the meaning of the `inside` and `outside` options for
-    /// margins.
-    #[ghost]
-    pub binding: Smart<Binding>,
-
-    /// How many columns the page has.
-    ///
-    /// If you need to insert columns into a page or other container, you can
-    /// also use the [`columns` function]($columns).
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     ///
     /// ```example:single
     /// #set page(columns: 2, height: 4.8cm)
@@ -266,7 +172,6 @@ pub struct PageElem {
     #[ghost]
     pub columns: NonZeroUsize,
 
-<<<<<<< HEAD
     /// ページ背景の塗り潰し。
     ///
     /// これを非透明なものに設定すると、プリンターにページ全体を着色するよう指示します。
@@ -276,22 +181,6 @@ pub struct PageElem {
     /// ビューアーではPDFのページに（通常は白色の）背景があるように見えますが、実際は透明であることに注意してください（印刷時には背景に色が使用されません）。
     ///
     /// デフォルト値の`{auto}`は、PDF出力の場合は`{none}`となり、PNGおよびSVG出力の場合は`{white}`になります。
-=======
-    /// The page's background fill.
-    ///
-    /// Setting this to something non-transparent instructs the printer to color
-    /// the complete page. If you are considering larger production runs, it may
-    /// be more environmentally friendly and cost-effective to source pre-dyed
-    /// pages and not set this property.
-    ///
-    /// When set to `{none}`, the background becomes transparent. Note that PDF
-    /// pages will still appear with a (usually white) background in viewers,
-    /// but they are actually transparent. (If you print them, no color is used
-    /// for the background.)
-    ///
-    /// The default of `{auto}` results in `{none}` for PDF output, and
-    /// `{white}` for PNG and SVG.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     ///
     /// ```example
     /// #set page(fill: rgb("444352"))
@@ -301,7 +190,6 @@ pub struct PageElem {
     #[ghost]
     pub fill: Smart<Option<Paint>>,
 
-<<<<<<< HEAD
     /// ページ[番号]($numbering)の付け方。
     /// [ページセットアップガイド]($guides/page-setup/#page-numbers)の
     /// ページ番号カスタマイズも参照してください。
@@ -309,7 +197,10 @@ pub struct PageElem {
     /// 1つまたは2つの数を取る[番号付けパターンまたは関数]($numbering)を受け取ります。
     ///
     /// 1. 1つ目は現在のページ番号。
-    /// 2. 2つ目は総ページ数。番号付けパターンでは省略できますが、関数の場合は常に両方が渡されます。
+    /// 2. The second number is the total number of pages. In a numbering
+    ///    pattern, the second number can be omitted. If a function is passed,
+    ///    it will receive one argument in the context of links or references,
+    ///    and two arguments when producing the visible page numbers.
     ///
     /// これらはページカウンターにより制御される論理番号であり、物理的なページ番号と一致しない場合があります。
     /// 具体的には`{counter(page)}`の[現在値]($counter.get)と[最終値]($counter.final)です。
@@ -317,28 +208,6 @@ pub struct PageElem {
     ///
     /// 明示的な[`footer`]($page.footer)（または[上部配置]($page.number-align)の
     /// 番号付け時は[`header`]($page.header)）が与えられた場合、numberingは無視されます。
-=======
-    /// How to number the pages. You can refer to the Page Setup Guide for
-    /// [customizing page numbers]($guides/page-setup/#page-numbers).
-    ///
-    /// Accepts a [numbering pattern or function]($numbering) taking one or two
-    /// numbers:
-    /// 1. The first number is the current page number.
-    /// 2. The second number is the total number of pages. In a numbering
-    ///    pattern, the second number can be omitted. If a function is passed,
-    ///    it will receive one argument in the context of links or references,
-    ///    and two arguments when producing the visible page numbers.
-    ///
-    /// These are logical numbers controlled by the page counter, and may thus
-    /// not match the physical numbers. Specifically, they are the
-    /// [current]($counter.get) and the [final]($counter.final) value of
-    /// `{counter(page)}`. See the [`counter`]($counter/#page-counter)
-    /// documentation for more details.
-    ///
-    /// If an explicit [`footer`]($page.footer) (or [`header`]($page.header) for
-    /// [top-aligned]($page.number-align) numbering) is given, the numbering is
-    /// ignored.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     ///
     /// ```example
     /// #set page(
@@ -352,15 +221,9 @@ pub struct PageElem {
     #[ghost]
     pub numbering: Option<Numbering>,
 
-<<<<<<< HEAD
     /// ページの補足語。
     ///
     /// ページ参照では、これはページ番号の前に追加されます。
-=======
-    /// A supplement for the pages.
-    ///
-    /// For page references, this is added before the page number.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     ///
     /// ```example
     /// #set page(numbering: "1.", supplement: [p.])
@@ -371,20 +234,11 @@ pub struct PageElem {
     #[ghost]
     pub supplement: Smart<Option<Content>>,
 
-<<<<<<< HEAD
     /// ページ番号の配置。
     ///
     /// 垂直成分が`top`の場合は、番号はヘッダー内に配置され、`bottom`の場合はフッター内に配置されます。
     /// 水平方向には配置できません。
     /// 対応する`header`や`footer`が明示的に与えられた場合、numberingは無視されます。
-=======
-    /// The alignment of the page numbering.
-    ///
-    /// If the vertical component is `top`, the numbering is placed into the
-    /// header and if it is `bottom`, it is placed in the footer. Horizon
-    /// alignment is forbidden. If an explicit matching `header` or `footer` is
-    /// given, the numbering is ignored.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     ///
     /// ```example
     /// #set page(
@@ -399,21 +253,12 @@ pub struct PageElem {
     #[ghost]
     pub number_align: SpecificAlignment<HAlignment, OuterVAlignment>,
 
-<<<<<<< HEAD
     /// ページのヘッダー。
     /// ページの上部余白を埋めます。
     ///
     /// - コンテンツが与えられた場合: ヘッダーとしてコンテンツを表示します。
     /// - `{auto}`: [`numbering`]($page.numbering)が設定されており、[`number-align`]($page.number-align)が`top`の場合ページ番号を表示します。
     /// - `{none}`: ヘッダーを表示しません。
-=======
-    /// The page's header. Fills the top margin of each page.
-    ///
-    /// - Content: Shows the content as the header.
-    /// - `{auto}`: Shows the page number if a [`numbering`]($page.numbering) is
-    ///   set and [`number-align`]($page.number-align) is `top`.
-    /// - `{none}`: Suppresses the header.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     ///
     /// ```example
     /// #set par(justify: true)
@@ -431,16 +276,11 @@ pub struct PageElem {
     #[ghost]
     pub header: Smart<Option<Content>>,
 
-<<<<<<< HEAD
     /// 上部余白方向のヘッダーの上昇量。
-=======
-    /// The amount the header is raised into the top margin.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     #[default(Ratio::new(0.3).into())]
     #[ghost]
     pub header_ascent: Rel<Length>,
 
-<<<<<<< HEAD
     /// ページのフッター。
     /// ページの下部余白を埋めます。
     ///
@@ -450,18 +290,6 @@ pub struct PageElem {
     ///
     /// 単純なページ番号を使用する場合は、一般的に`numbering`プロパティで十分です。
     /// カスタムフッターを作成したい場合でページ番号を表示したいときは、[ページカウンター]($counter)に直接アクセスできます。
-=======
-    /// The page's footer. Fills the bottom margin of each page.
-    ///
-    /// - Content: Shows the content as the footer.
-    /// - `{auto}`: Shows the page number if a [`numbering`]($page.numbering) is
-    ///   set and [`number-align`]($page.number-align) is `bottom`.
-    /// - `{none}`: Suppresses the footer.
-    ///
-    /// For just a page number, the `numbering` property typically suffices. If
-    /// you want to create a custom footer but still display the page number,
-    /// you can directly access the [page counter]($counter).
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     ///
     /// ```example
     /// #set par(justify: true)
@@ -483,26 +311,15 @@ pub struct PageElem {
     #[ghost]
     pub footer: Smart<Option<Content>>,
 
-<<<<<<< HEAD
     /// 下部余白方向のフッターの下降量。
-=======
-    /// The amount the footer is lowered into the bottom margin.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     #[default(Ratio::new(0.3).into())]
     #[ghost]
     pub footer_descent: Rel<Length>,
 
-<<<<<<< HEAD
     /// ページ背景のコンテンツ。
     ///
     /// このコンテンツはページ本文の背後に配置されます。
     /// これは背景画像や透かしに使用できます。
-=======
-    /// Content in the page's background.
-    ///
-    /// This content will be placed behind the page's body. It can be
-    /// used to place a background image or a watermark.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     ///
     /// ```example
     /// #set page(background: rotate(24deg,
@@ -518,15 +335,9 @@ pub struct PageElem {
     #[ghost]
     pub background: Option<Content>,
 
-<<<<<<< HEAD
     /// ページ前景のコンテンツ。
     ///
     /// このコンテンツはページ本文の上に重なって表示されます。
-=======
-    /// Content in the page's foreground.
-    ///
-    /// This content will overlay the page's body.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     ///
     /// ```example
     /// #set page(foreground: text(24pt)[🤓])
@@ -538,18 +349,10 @@ pub struct PageElem {
     #[ghost]
     pub foreground: Option<Content>,
 
-<<<<<<< HEAD
     /// ページの本文。
     ///
     /// コンテンツが単一ページに収まらなかった場合は複数ページが作成されます。
     /// 関数呼び出し前に設定されていたページプロパティを適用した新しいページが本文組版後に作成されます。
-=======
-    /// The contents of the page(s).
-    ///
-    /// Multiple pages will be created if the content does not fit on a single
-    /// page. A new page with the page properties prior to the function invocation
-    /// will be created after the body has been typeset.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     #[external]
     #[required]
     pub body: Content,
@@ -580,19 +383,11 @@ impl LocalName for PageElem {
     const KEY: &'static str = "page";
 }
 
-<<<<<<< HEAD
 /// 手動の改ページ。
 ///
 /// いかなるコンテナ内でも使用してはいけません。
 ///
 /// # 例
-=======
-/// A manual page break.
-///
-/// Must not be used inside any containers.
-///
-/// # Example
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 /// ```example
 /// The next page contains
 /// more details on compound theory.
@@ -602,7 +397,6 @@ impl LocalName for PageElem {
 /// In 1984, the first ...
 /// ```
 ///
-<<<<<<< HEAD
 /// 手動の改ページがなくても、コンテンツは設定されたページサイズに基づいて自動的に改ページされます。
 /// [ページの高さ]($page.height)を`{auto}`にすると、手動改ページが現れるまで
 /// ページが動的に伸びます。
@@ -616,25 +410,6 @@ pub struct PagebreakElem {
     pub weak: bool,
 
     /// 設定された場合、必要に応じて空ページを追加して次のページを偶数/奇数ページにします。
-=======
-/// Even without manual page breaks, content will be automatically paginated
-/// based on the configured page size. You can set [the page height]($page.height)
-/// to `{auto}` to let the page grow dynamically until a manual page break
-/// occurs.
-///
-/// Pagination tries to avoid single lines of text at the top or bottom of a
-/// page (these are called _widows_ and _orphans_). You can adjust the
-/// [`text.costs`] parameter to disable this behavior.
-#[elem(title = "Page Break")]
-pub struct PagebreakElem {
-    /// If `{true}`, the page break is skipped if the current page is already
-    /// empty.
-    #[default(false)]
-    pub weak: bool,
-
-    /// If given, ensures that the next page will be an even/odd page, with an
-    /// empty page in between if necessary.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     ///
     /// ```example
     /// #set page(height: 30pt)
@@ -905,15 +680,9 @@ impl PageRanges {
 /// Whether something should be even or odd.
 #[derive(Debug, Copy, Clone, Eq, PartialEq, Hash, Cast)]
 pub enum Parity {
-<<<<<<< HEAD
     /// 次のページが偶数ページになります。
     Even,
     /// 次のページが奇数ページになります。
-=======
-    /// Next page will be an even page.
-    Even,
-    /// Next page will be an odd page.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     Odd,
 }
 
@@ -979,11 +748,7 @@ macro_rules! papers {
             Paper,
             self => self.name.into_value(),
             $(
-<<<<<<< HEAD
                 /// 指定された大きさの用紙を生成。
-=======
-                /// Produces a paper of the respective size.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
                 $name => Self::$var,
             )*
         }
diff --git a/crates/typst-library/src/layout/place.rs b/crates/typst-library/src/layout/place.rs
index 5c8448b443..cdb5bcf420 100644
--- a/crates/typst-library/src/layout/place.rs
+++ b/crates/typst-library/src/layout/place.rs
@@ -2,7 +2,6 @@ use crate::foundations::{Cast, Content, Smart, elem, scope};
 use crate::introspection::{Locatable, Tagged, Unqueriable};
 use crate::layout::{Alignment, Em, Length, Rel};
 
-<<<<<<< HEAD
 /// 親コンテナに対して相対的なコンテンツの配置。
 ///
 /// コンテンツはオーバーレイ（デフォルト）あるいはフロートのいずれかで配置できます。
@@ -17,28 +16,6 @@ use crate::layout::{Alignment, Em, Length, Rel};
 /// マージンを含めたページ全体における絶対位置指定は、[`page.foreground`]か[`page.background`]中で`place`を使うと可能です。
 ///
 /// # 例
-=======
-/// Places content relatively to its parent container.
-///
-/// Placed content can be either overlaid (the default) or floating. Overlaid
-/// content is aligned with the parent container according to the given
-/// [`alignment`]($place.alignment), and shown over any other content added so
-/// far in the container. Floating content is placed at the top or bottom of
-/// the container, displacing other content down or up respectively. In both
-/// cases, the content position can be adjusted with [`dx`]($place.dx) and
-/// [`dy`]($place.dy) offsets without affecting the layout.
-///
-/// The parent can be any container such as a [`block`], [`box`],
-/// [`rect`], etc. A top level `place` call will place content directly
-/// in the text area of the current page. This can be used for absolute
-/// positioning on the page: with a `top + left`
-/// [`alignment`]($place.alignment), the offsets `dx` and `dy` will set the
-/// position of the element's top left corner relatively to the top left corner
-/// of the text area. For absolute positioning on the full page including
-/// margins, you can use `place` in [`page.foreground`] or [`page.background`].
-///
-/// # Examples
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 /// ```example
 /// #set page(height: 120pt)
 /// Hello, world!
@@ -56,7 +33,6 @@ use crate::layout::{Alignment, Em, Length, Rel};
 /// )
 /// ```
 ///
-<<<<<<< HEAD
 /// # 他の要素の位置に対する影響 { #effect-on-other-elements }
 /// 要素のオーバーレイはコンテンツの流れの中にスペースを取りませんが、`place`の呼び出しは、流れの中にブロックレベルの不可視要素を挿入します。
 /// これは現在の段落を中断することでレイアウトに影響を与える可能性があります。
@@ -65,19 +41,6 @@ use crate::layout::{Alignment, Em, Length, Rel};
 /// 間隔に影響しないよう、ワードジョイナーを使用してボックスを単語に結合してください。
 ///
 /// 例えば、以下は直後の単語に注釈を付与する関数を定義しています。
-=======
-/// # Effect on the position of other elements { #effect-on-other-elements }
-/// Overlaid elements don't take space in the flow of content, but a `place`
-/// call inserts an invisible block-level element in the flow. This can
-/// affect the layout by breaking the current paragraph. To avoid this,
-/// you can wrap the `place` call in a [`box`] when the call is made
-/// in the middle of a paragraph. The alignment and offsets will then be
-/// relative to this zero-size box. To make sure it doesn't interfere with
-/// spacing, the box should be attached to a word using a word joiner.
-///
-/// For example, the following defines a function for attaching an annotation
-/// to the following word:
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 ///
 /// ```example
 /// >>> #set page(height: 70pt)
@@ -91,7 +54,6 @@ use crate::layout::{Alignment, Em, Length, Rel};
 /// square in my text.
 /// ```
 ///
-<<<<<<< HEAD
 /// ゼロ幅の弱い空白は、関数呼び出しと次の単語との間の空白を削除する役割を果たします。
 ///
 /// # アクセシビリティ
@@ -105,30 +67,10 @@ pub struct PlaceElem {
     /// - `float`が`{true}`の場合、`{auto}`、`{top}`あるいは`{bottom}`のいずれかを指定しなければなりません。
     ///
     /// `float`が`{false}`で、かつvertical alignmentが指定されていなければ、コンテンツは垂直方向の軸上の現在の位置に配置されます。
-=======
-/// The zero-width weak spacing serves to discard spaces between the function
-/// call and the next word.
-///
-/// # Accessibility
-/// Assistive Technology (AT) will always read the placed element at the point
-/// where it logically appears in the document, regardless of where this
-/// function physically moved it. Put its markup where it would make the most
-/// sense in the reading order.
-#[elem(scope, Unqueriable, Locatable, Tagged)]
-pub struct PlaceElem {
-    /// Relative to which position in the parent container to place the content.
-    ///
-    /// - If `float` is `{false}`, then this can be any alignment other than `{auto}`.
-    /// - If `float` is `{true}`, then this must be `{auto}`, `{top}`, or `{bottom}`.
-    ///
-    /// When `float` is `{false}` and no vertical alignment is specified, the
-    /// content is placed at the current position on the vertical axis.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     #[positional]
     #[default(Smart::Custom(Alignment::START))]
     pub alignment: Smart<Alignment>,
 
-<<<<<<< HEAD
     /// 何かを配置するときの基準となる包含スコープ。
     ///
     /// 親スコープは主に図表に使用されるため、figure関数にはそれを反映した[`scope`パラメーター]($figure.scope)が用意されています。
@@ -136,19 +78,6 @@ pub struct PlaceElem {
     /// 典型的な例は2段組の文書で[1段組のタイトル節]($guides/page-setup/#columns)を作成することでしょう。
     ///
     /// 現在、親スコープでの配置は`float`が`{true}`の場合のみサポートされています。 この挙動は将来変更される可能性があります。
-=======
-    /// Relative to which containing scope something is placed.
-    ///
-    /// The parent scope is primarily used with figures and, for
-    /// this reason, the figure function has a mirrored [`scope`
-    /// parameter]($figure.scope). Nonetheless, it can also be more generally
-    /// useful to break out of the columns. A typical example would be to
-    /// [create a single-column title section]($guides/page-setup/#columns)
-    /// in a two-column document.
-    ///
-    /// Note that parent-scoped placement is currently only supported if `float`
-    /// is `{true}`. This may change in the future.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     ///
     /// ```example
     /// #set page(height: 150pt, columns: 2)
@@ -163,20 +92,11 @@ pub struct PlaceElem {
     /// ```
     pub scope: PlacementScope,
 
-<<<<<<< HEAD
     /// 要素をフロートレイアウトで配置するかどうか。
     ///
     /// フロートの要素は流れの中のコンテンツをずらして親コンテナの上部または下部に位置取ります。
     ///
     /// それらは常に互いのフロー内での順序を保ち、後続の[`place.flush`]要素に続くコンテンツより前に配置されます。
-=======
-    /// Whether the placed element has floating layout.
-    ///
-    /// Floating elements are positioned at the top or bottom of the parent
-    /// container, displacing in-flow content. They are always placed in the
-    /// in-flow order relative to each other, as well as before any content
-    /// following a later [`place.flush`] element.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     ///
     /// ```example
     /// #set page(height: 150pt)
@@ -196,7 +116,6 @@ pub struct PlaceElem {
     /// ```
     pub float: bool,
 
-<<<<<<< HEAD
     /// フロートレイアウトでの配置された要素と他の要素との間隔。
     ///
     /// `float`が`{false}`の場合は影響がありません。
@@ -207,35 +126,6 @@ pub struct PlaceElem {
     ///
     /// ```example
     /// #set page(height: 100pt)
-    /// #for i in range(16) {
-    ///   let amount = i * 4pt
-    ///   place(center, dx: amount - 32pt, dy: amount)[A]
-    /// }
-    /// ```
-    ///
-    /// これは流れの中のコンテンツのレイアウトには影響しません。
-    /// 言い換えると、配置されたコンテンツは[`move`]要素にラップされたかのように扱われます。
-    pub dx: Rel<Length>,
-
-    /// 配置したコンテンツの垂直方向の変位。
-    ///
-    /// これは流れの中のコンテンツのレイアウトには影響しません。
-    /// 言い換えると、配置されたコンテンツは[`move`]要素にラップされたかのように扱われます。
-    pub dy: Rel<Length>,
-
-    /// 配置するコンテンツ。
-=======
-    /// The spacing between the placed element and other elements in a floating
-    /// layout.
-    ///
-    /// Has no effect if `float` is `{false}`.
-    #[default(Em::new(1.5).into())]
-    pub clearance: Length,
-
-    /// The horizontal displacement of the placed content.
-    ///
-    /// ```example
-    /// #set page(height: 100pt)
     /// #for x in range(-8, 8) {
     ///   place(center + horizon,
     ///     dx: x * 8pt, dy: x * 4pt,
@@ -247,20 +137,17 @@ pub struct PlaceElem {
     /// }
     /// ```
     ///
-    /// This does not affect the layout of in-flow content.
-    /// In other words, the placed content is treated as if it
-    /// were wrapped in a [`move`] element.
+    /// これは流れの中のコンテンツのレイアウトには影響しません。
+    /// 言い換えると、配置されたコンテンツは[`move`]要素にラップされたかのように扱われます。
     pub dx: Rel<Length>,
 
-    /// The vertical displacement of the placed content.
+    /// 配置したコンテンツの垂直方向の変位。
     ///
-    /// This does not affect the layout of in-flow content.
-    /// In other words, the placed content is treated as if it
-    /// were wrapped in a [`move`] element.
+    /// これは流れの中のコンテンツのレイアウトには影響しません。
+    /// 言い換えると、配置されたコンテンツは[`move`]要素にラップされたかのように扱われます。
     pub dy: Rel<Length>,
 
-    /// The content to place.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
+    /// 配置するコンテンツ。
     #[required]
     pub body: Content,
 }
@@ -274,7 +161,6 @@ impl PlaceElem {
 /// Relative to which containing scope something shall be placed.
 #[derive(Debug, Default, Copy, Clone, Eq, PartialEq, Hash, Cast)]
 pub enum PlacementScope {
-<<<<<<< HEAD
     /// 現在の列に配置する。
     #[default]
     Column,
@@ -285,20 +171,6 @@ pub enum PlacementScope {
 /// コンテンツの続行前に保留中のフロート要素を配置するようレイアウトアルゴリズムに指示。
 ///
 /// これは、次のセクションにフロートの図表が流れ込むのを防ぐのに便利です。
-=======
-    /// Place into the current column.
-    #[default]
-    Column,
-    /// Place relative to the parent, letting the content span over all columns.
-    Parent,
-}
-
-/// Asks the layout algorithm to place pending floating elements before
-/// continuing with the content.
-///
-/// This is useful for preventing floating figures from spilling
-/// into the next section.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 ///
 /// ```example
 /// >>> #set page(height: 160pt, width: 150pt)
diff --git a/crates/typst-library/src/layout/ratio.rs b/crates/typst-library/src/layout/ratio.rs
index 6cf027ed3d..db19e2c055 100644
--- a/crates/typst-library/src/layout/ratio.rs
+++ b/crates/typst-library/src/layout/ratio.rs
@@ -6,42 +6,21 @@ use typst_utils::{Numeric, Scalar};
 
 use crate::foundations::{Repr, repr, ty};
 
-<<<<<<< HEAD
 /// 百分率。
 ///
 /// 数値の後にパーセント記号を付けて表記します。
 /// 百分率は、ページやコンテナに対するレイアウト要素の相対的なサイズを指定するために、[相対長さ]($relative)の一部として用いられることが最も一般的です。
-=======
-/// A ratio of a whole.
-///
-/// A ratio is written as a number, followed by a percent sign. Ratios most
-/// often appear as part of a [relative length]($relative), to specify the size
-/// of some layout element relative to the page or some container.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 ///
 /// ```example
 /// #rect(width: 25%)
 /// ```
 ///
-<<<<<<< HEAD
 /// 百分率はその他にも、何らかの基準に対する相対量を表せます。例えば、[水平方向の拡大縮小量]($scale.x)や、囲まれたコンテンツの高さに対する[括弧の高さ]($math.lr.size)などです。
 ///
 /// # スクリプト記述
 /// 自身のコード内では、百分率を自由に使用できます。以下の表のように、さまざまな型と乗算できます。
 ///
 /// |  乗算する型     |  例                     | 結果            |
-=======
-/// However, they can also describe any other property that is relative to some
-/// base, e.g. an amount of [horizontal scaling]($scale.x) or the
-/// [height of parentheses]($math.lr.size) relative to the height of the content
-/// they enclose.
-///
-/// # Scripting
-/// Within your own code, you can use ratios as you like. You can multiply them
-/// with various other types as shown below:
-///
-/// |  Multiply by    |  Example                | Result          |
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 /// |-----------------|-------------------------|-----------------|
 /// | [`ratio`]       | `{27% * 10%}`           | `{2.7%}`        |
 /// | [`length`]      | `{27% * 100pt}`         | `{27pt}`        |
@@ -51,12 +30,7 @@ use crate::foundations::{Repr, repr, ty};
 /// | [`float`]       | `{27% * 0.37037}`       | `{10%}`         |
 /// | [`fraction`]    | `{27% * 3fr}`           | `{0.81fr}`      |
 ///
-<<<<<<< HEAD
 /// 百分率が文書中に[表示]($repr)される際は、可読性のため有効数字2桁に丸められます。
-=======
-/// When ratios are [displayed]($repr) in the document, they are rounded to two
-/// significant digits for readability.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 #[ty(cast)]
 #[derive(Default, Copy, Clone, Eq, PartialEq, Ord, PartialOrd, Hash)]
 pub struct Ratio(Scalar);
diff --git a/crates/typst-library/src/layout/rel.rs b/crates/typst-library/src/layout/rel.rs
index 96887366e0..8c27b36ab4 100644
--- a/crates/typst-library/src/layout/rel.rs
+++ b/crates/typst-library/src/layout/rel.rs
@@ -8,7 +8,6 @@ use typst_utils::Numeric;
 use crate::foundations::{Fold, Repr, Resolve, StyleChain, cast, ty};
 use crate::layout::{Abs, Em, Length, Ratio};
 
-<<<<<<< HEAD
 /// 既知の長さに対する相対的な長さ。
 ///
 /// この型は[length]と[ratio]の組み合わせです。
@@ -18,35 +17,16 @@ use crate::layout::{Abs, Em, Length, Ratio};
 /// # ページに対する相対的な長さ
 /// よくある利用例として、（[ブロック]($block)、[長方形]($rect)などの）レイアウト要素の幅や高さをページ幅に対する百分率の値を用いて設定する場合があります。
 /// 以下の例では長方形の幅が`{25%}`に設定されており、ページの_内部_幅（幅からマージンを引いたもの）の4分の1を占めます。
-=======
-/// A length in relation to some known length.
-///
-/// This type is a combination of a [length] with a [ratio]. It results from
-/// addition and subtraction of a length and a ratio. Wherever a relative length
-/// is expected, you can also use a bare length or ratio.
-///
-/// # Relative to the page
-/// A common use case is setting the width or height of a layout element (e.g.,
-/// [block], [rect], etc.) as a certain percentage of the width of the page.
-/// Here, the rectangle's width is set to `{25%}`, so it takes up one fourth of
-/// the page's _inner_ width (the width minus margins).
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 ///
 /// ```example
 /// #rect(width: 25%)
 /// ```
 ///
-<<<<<<< HEAD
 /// 相対長さが想定されているあらゆる箇所で長さや百分率を単体で指定できますが、両者を自由に組み合わせられます。
-=======
-/// Bare lengths or ratios are always valid where relative lengths are expected,
-/// but the two can also be freely mixed:
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 /// ```example
 /// #rect(width: 25% + 1cm)
 /// ```
 ///
-<<<<<<< HEAD
 /// ページの_全体_幅を占めるように要素のサイズを設定したい場合、いくつかの選択肢があります（具体的な用途に大きく依存します）。
 ///
 /// 1. ページのマージンを`{0pt}`に設定する（`[#set page(margin: 0pt)]`）
@@ -58,23 +38,6 @@ use crate::layout::{Abs, Em, Length, Ratio};
 ///
 /// # コンテナに対する相対的な長さ
 /// （[長方形]($rect)などの）レイアウト要素がページの直接の子孫ではなく、（[ブロック]($block)などの）別のレイアウトコンテナ内で入れ子になっている場合、相対的な幅はコンテナを基準とした値になります。
-=======
-/// If you're trying to size an element so that it takes up the page's _full_
-/// width, you have a few options (this highly depends on your exact use case):
-///
-/// 1. Set page margins to `{0pt}` (`[#set page(margin: 0pt)]`)
-/// 2. Multiply the ratio by the known full page width (`{21cm * 69%}`)
-/// 3. Use padding which will negate the margins (`[#pad(x: -2.5cm, ...)]`)
-/// 4. Use the page [background](page.background) or
-///    [foreground](page.foreground) field as those don't take margins into
-///    account (note that it will render the content outside of the document
-///    flow, see [place] to control the content position)
-///
-/// # Relative to a container
-/// When a layout element (e.g. a [rect]) is nested in another layout container
-/// (e.g. a [block]) instead of being a direct descendant of the page, relative
-/// widths become relative to the container:
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 ///
 /// ```example
 /// #block(
@@ -84,22 +47,12 @@ use crate::layout::{Abs, Em, Length, Ratio};
 /// )
 /// ```
 ///
-<<<<<<< HEAD
 /// # スクリプト記述
 /// 相対長さは[百分率]($ratio)、[整数]($int)、[浮動小数点数]($float)と乗算できます。
 ///
 /// 相対長さは以下のフィールドを持ちます。
-/// - `length`: 長さ成分。
-/// - `ratio`: 百分率成分。
-=======
-/// # Scripting
-/// You can multiply relative lengths by [ratios]($ratio), [integers]($int), and
-/// [floats]($float).
-///
-/// A relative length has the following fields:
-/// - `length`: Its [length] component.
-/// - `ratio`: Its [ratio] component.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
+/// - `length`: [長さ]($length)成分。
+/// - `ratio`: [百分率]($ratio)成分。
 ///
 /// ```example
 /// #(100% - 50pt).length \
@@ -108,15 +61,9 @@ use crate::layout::{Abs, Em, Length, Ratio};
 #[ty(cast, name = "relative", title = "Relative Length")]
 #[derive(Default, Copy, Clone, Eq, PartialEq, Hash)]
 pub struct Rel<T: Numeric = Length> {
-<<<<<<< HEAD
     /// 相対成分。
     pub rel: Ratio,
     /// 絶対成分。
-=======
-    /// The relative part.
-    pub rel: Ratio,
-    /// The absolute part.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     pub abs: T,
 }
 
diff --git a/crates/typst-library/src/layout/repeat.rs b/crates/typst-library/src/layout/repeat.rs
index eda43de094..646c6cd917 100644
--- a/crates/typst-library/src/layout/repeat.rs
+++ b/crates/typst-library/src/layout/repeat.rs
@@ -2,7 +2,6 @@ use crate::foundations::{Content, elem};
 use crate::introspection::Tagged;
 use crate::layout::Length;
 
-<<<<<<< HEAD
 /// 利用可能なスペースでのコンテンツの繰り返し。
 ///
 /// これは独自の索引、参考文献、目次を作成する際に便利です。
@@ -12,19 +11,6 @@ use crate::layout::Length;
 /// 利用可能なスペースに上限がない場合は、コンテンツを無限に生成してしまうためエラーになります。
 ///
 /// # 例
-=======
-/// Repeats content to the available space.
-///
-/// This can be useful when implementing a custom index, reference, or outline.
-///
-/// Space may be inserted between the instances of the body parameter, so be
-/// sure to adjust the [`justify`]($repeat.justify) parameter accordingly.
-///
-/// Errors if there are no bounds on the available space, as it would create
-/// infinite content.
-///
-/// # Example
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 /// ```example
 /// Sign on the dotted line:
 /// #box(width: 1fr, repeat[.])
@@ -36,7 +22,6 @@ use crate::layout::Length;
 /// ]
 /// ```
 ///
-<<<<<<< HEAD
 /// # アクセシビリティ
 /// 繰り返されたコンテンツは自動的に[アーティファクト]($pdf.artifact)としてマークされ、支援技術（AT）からは認識されません。
 /// そのため、文書の意味にかかわるコンテンツの作成には、この関数を使用しないでください。
@@ -51,24 +36,6 @@ pub struct RepeatElem {
     pub gap: Length,
 
     /// 利用可能なスペースを完全に埋めるために、実体間の間隔を大きくするかどうか。
-=======
-/// # Accessibility
-/// Repeated content is automatically marked as an [artifact]($pdf.artifact) and
-/// hidden from Assistive Technology (AT). Do not use this function to create
-/// content that contributes to the meaning of your document.
-#[elem(Tagged)]
-pub struct RepeatElem {
-    /// The content to repeat.
-    #[required]
-    pub body: Content,
-
-    /// The gap between each instance of the body.
-    #[default]
-    pub gap: Length,
-
-    /// Whether to increase the gap between instances to completely fill the
-    /// available space.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     #[default(true)]
     pub justify: bool,
 }
diff --git a/crates/typst-library/src/layout/spacing.rs b/crates/typst-library/src/layout/spacing.rs
index 714df52d43..9c1a800141 100644
--- a/crates/typst-library/src/layout/spacing.rs
+++ b/crates/typst-library/src/layout/spacing.rs
@@ -3,37 +3,20 @@ use typst_utils::{Numeric, singleton};
 use crate::foundations::{Content, NativeElement, cast, elem};
 use crate::layout::{Abs, Em, Fr, Length, Ratio, Rel};
 
-<<<<<<< HEAD
 /// パラグラフに水平方向の間隔を挿入。
 ///
 /// 間隔の大きさは絶対的な値、相対的な値、または比率で指定できます。
 /// 比率指定の場合は、比率指定されたそれぞれの間隔へ、行の残りの間隔がその相対比率に応じて配分されます。
 ///
 /// # 例
-=======
-/// Inserts horizontal spacing into a paragraph.
-///
-/// The spacing can be absolute, relative, or fractional. In the last case, the
-/// remaining space on the line is distributed among all fractional spacings
-/// according to their relative fractions.
-///
-/// # Example
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 /// ```example
 /// First #h(1cm) Second \
 /// First #h(30%) Second
 /// ```
 ///
-<<<<<<< HEAD
 /// # 比率指定の間隔
 /// 比率指定の間隔を用いると、（[`align`]のように）段落区切りを強制することなく行内の配置が可能です。
 /// 要素の大きさが比率で指定された場合、各要素には、比率の総和に対する自身の比率の割合に応じた間隔が割り当てられます。
-=======
-/// # Fractional spacing
-/// With fractional spacing, you can align things within a line without forcing
-/// a paragraph break (like [`align`] would). Each fractionally sized element
-/// gets space based on the ratio of its fraction to the sum of all fractions.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 ///
 /// ```example
 /// First #h(1fr) Second \
@@ -41,7 +24,6 @@ use crate::layout::{Abs, Em, Fr, Length, Ratio, Rel};
 /// First #h(2fr) Second #h(1fr) Third
 /// ```
 ///
-<<<<<<< HEAD
 /// # 数式用の間隔 { #math-spacing }
 /// [数式]($category/math)中では、要素間に間隔を挿入するための定数として、`thin`（1/6 em）、`med`（2/9 em）、`thick`（5/18 em）、`quad`（1 em）および`wide`（2 em）も利用可能です。
 #[elem(title = "Spacing (H)")]
@@ -56,29 +38,6 @@ pub struct HElem {
     /// マークアップ中に弱い間隔があると、挿入された間隔の総量によらず、全ての隣接するマークアップの間隔が削除されます。
     /// 明示的に（通常の間隔の場合は）`[#" "]`と書くか、（改行しない間隔の場合は）`[~]`と書くことで弱い間隔の隣に間隔を強制できます。
     /// 後者は、マークアップで直前に間隔があったかどうかに関係なく、直前の単語に改行しない間隔を常に1つ追加する構造を作成する際に便利かもしれません。
-=======
-/// # Mathematical Spacing { #math-spacing }
-/// In [mathematical formulas]($category/math), you can additionally use these
-/// constants to add spacing between elements: `thin` (1/6 em), `med` (2/9 em),
-/// `thick` (5/18 em), `quad` (1 em), `wide` (2 em).
-#[elem(title = "Spacing (H)")]
-pub struct HElem {
-    /// How much spacing to insert.
-    #[required]
-    pub amount: Spacing,
-
-    /// If `{true}`, the spacing collapses at the start or end of a paragraph.
-    /// Moreover, from multiple adjacent weak spacings all but the largest one
-    /// collapse.
-    ///
-    /// Weak spacing in markup also causes all adjacent markup spaces to be
-    /// removed, regardless of the amount of spacing inserted. To force a space
-    /// next to weak spacing, you can explicitly write `[#" "]` (for a normal
-    /// space) or `[~]` (for a non-breaking space). The latter can be useful to
-    /// create a construct that always attaches to the preceding word with one
-    /// non-breaking space, independently of whether a markup space existed in
-    /// front or not.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     ///
     /// ```example
     /// #h(1cm, weak: true)
@@ -104,22 +63,12 @@ impl HElem {
     }
 }
 
-<<<<<<< HEAD
 /// ブロックの流れに垂直方向の間隔を挿入。
 ///
 /// 間隔の大きさは絶対的な値、相対的な値、または比率で指定できます。
 /// 比率指定の場合は、比率指定されたそれぞれの間隔へ、ページの残りの間隔がその相対比率に応じて配分されます。
 ///
 /// # 例
-=======
-/// Inserts vertical spacing into a flow of blocks.
-///
-/// The spacing can be absolute, relative, or fractional. In the last case,
-/// the remaining space on the page is distributed among all fractional spacings
-/// according to their relative fractions.
-///
-/// # Example
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 /// ```example
 /// #grid(
 ///   rows: 3cm,
@@ -135,7 +84,6 @@ impl HElem {
 /// ```
 #[elem(title = "Spacing (V)")]
 pub struct VElem {
-<<<<<<< HEAD
     /// 挿入する間隔の大きさ。
     #[required]
     pub amount: Spacing,
@@ -143,16 +91,6 @@ pub struct VElem {
     /// `{true}`の場合、流れの始まりと終わりの空白は削除されます。
     /// さらに、弱い間隔が隣接していると最大のもの以外は削除されます。
     /// たとえ段落間隔の方が大きかったとしても、弱い間隔に隣接する段落間隔は常に削除されます。
-=======
-    /// How much spacing to insert.
-    #[required]
-    pub amount: Spacing,
-
-    /// If `{true}`, the spacing collapses at the start or end of a flow.
-    /// Moreover, from multiple adjacent weak spacings all but the largest one
-    /// collapse. Weak spacings will always collapse adjacent paragraph spacing,
-    /// even if the paragraph spacing is larger.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     ///
     /// ```example
     /// The following theorem is
diff --git a/crates/typst-library/src/layout/stack.rs b/crates/typst-library/src/layout/stack.rs
index 241069e8e2..eacc0220af 100644
--- a/crates/typst-library/src/layout/stack.rs
+++ b/crates/typst-library/src/layout/stack.rs
@@ -3,20 +3,11 @@ use std::fmt::{self, Debug, Formatter};
 use crate::foundations::{Content, cast, elem};
 use crate::layout::{Dir, Spacing};
 
-<<<<<<< HEAD
 /// コンテンツと間隔を垂直または水平方向に配置。
 ///
 /// スタックは、ある軸に沿ってアイテムのリストを配置し、各アイテム間に任意の間隔を設定します。
 ///
 /// # 例
-=======
-/// Arranges content and spacing horizontally or vertically.
-///
-/// The stack places a list of items along an axis, with optional spacing
-/// between each item.
-///
-/// # Example
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 /// ```example
 /// #stack(
 ///   dir: ttb,
@@ -26,7 +17,6 @@ use crate::layout::{Dir, Spacing};
 /// )
 /// ```
 ///
-<<<<<<< HEAD
 /// # アクセシビリティ
 /// スタックは特別なセマンティクスを持ちません。
 /// スタックのコンテンツは、この関数に渡された順序のまま支援技術（AT）によって読み上げられます。
@@ -51,36 +41,6 @@ pub struct StackElem {
     pub spacing: Option<Spacing>,
 
     /// 軸に沿って積み重ねる子要素。
-=======
-/// # Accessibility
-/// Stacks do not carry any special semantics. The contents of the stack are
-/// read by Assistive Technology (AT) in the order in which they have been
-/// passed to this function.
-#[elem]
-pub struct StackElem {
-    /// The direction along which the items are stacked. Possible values are:
-    ///
-    /// - `{ltr}`: Left to right.
-    /// - `{rtl}`: Right to left.
-    /// - `{ttb}`: Top to bottom.
-    /// - `{btt}`: Bottom to top.
-    ///
-    /// You can use the `start` and `end` methods to obtain the initial and
-    /// final points (respectively) of a direction, as `alignment`. You can also
-    /// use the `axis` method to determine whether a direction is
-    /// `{"horizontal"}` or `{"vertical"}`. The `inv` method returns a
-    /// direction's inverse direction.
-    ///
-    /// For example, `{ttb.start()}` is `top`, `{ttb.end()}` is `bottom`,
-    /// `{ttb.axis()}` is `{"vertical"}` and `{ttb.inv()}` is equal to `btt`.
-    #[default(Dir::TTB)]
-    pub dir: Dir,
-
-    /// Spacing to insert between items where no explicit spacing was provided.
-    pub spacing: Option<Spacing>,
-
-    /// The children to stack along the axis.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     #[variadic]
     pub children: Vec<StackChild>,
 }
diff --git a/crates/typst-library/src/layout/transform.rs b/crates/typst-library/src/layout/transform.rs
index 283071b368..3014daa580 100644
--- a/crates/typst-library/src/layout/transform.rs
+++ b/crates/typst-library/src/layout/transform.rs
@@ -1,7 +1,6 @@
 use crate::foundations::{Content, Smart, cast, elem};
 use crate::layout::{Abs, Alignment, Angle, HAlignment, Length, Ratio, Rel, VAlignment};
 
-<<<<<<< HEAD
 /// レイアウトに影響を与えないコンテンツの移動。
 ///
 /// `move`関数を用いると、コンテンツの元々の位置をレイアウトに「認識」させながら、そのコンテンツを移動させられます。
@@ -9,20 +8,8 @@ use crate::layout::{Abs, Alignment, Angle, HAlignment, Length, Ratio, Rel, VAlig
 ///
 /// # 例
 /// ```example
-/// #rect(inset: 0pt, move(
-///   dx: 6pt, dy: 6pt,
-=======
-/// Moves content without affecting layout.
-///
-/// The `move` function allows you to move content while the layout still 'sees'
-/// it at the original positions. Containers will still be sized as if the
-/// content was not moved.
-///
-/// # Example
-/// ```example
 /// #rect(inset: 0pt, fill: gray, move(
 ///   dx: 4pt, dy: 6pt,
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 ///   rect(
 ///     inset: 8pt,
 ///     fill: white,
@@ -32,7 +19,6 @@ use crate::layout::{Abs, Alignment, Angle, HAlignment, Length, Ratio, Rel, VAlig
 /// ))
 /// ```
 ///
-<<<<<<< HEAD
 /// # アクセシビリティ
 /// 移動は支援技術（AT）に対して透過的です。
 /// コンテンツは視覚的な移動に関係なく、ソースに現れる順序で読み上げられます。
@@ -46,41 +32,16 @@ pub struct MoveElem {
     pub dy: Rel<Length>,
 
     /// 移動させたいコンテンツ。
-=======
-/// # Accessibility
-/// Moving is transparent to Assistive Technology (AT). Your content will be
-/// read in the order it appears in the source, regardless of any visual
-/// movement. If you need to hide content from AT altogether in PDF export,
-/// consider using [`pdf.artifact`].
-#[elem]
-pub struct MoveElem {
-    /// The horizontal displacement of the content.
-    pub dx: Rel<Length>,
-
-    /// The vertical displacement of the content.
-    pub dy: Rel<Length>,
-
-    /// The content to move.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     #[required]
     pub body: Content,
 }
 
-<<<<<<< HEAD
 /// レイアウトに影響を与えないコンテンツの回転。
 ///
 /// 要素を指定された角度だけ回転させます。
 /// `{reflow: true}`を指定しない限り、レイアウトは、その要素が回転していないかのように振る舞います。
 ///
 /// # 例
-=======
-/// Rotates content without affecting layout.
-///
-/// Rotates an element by a given angle. The layout will act as if the element
-/// was not rotated unless you specify `{reflow: true}`.
-///
-/// # Example
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 /// ```example
 /// #stack(
 ///   dir: ltr,
@@ -91,11 +52,7 @@ pub struct MoveElem {
 /// ```
 #[elem]
 pub struct RotateElem {
-<<<<<<< HEAD
     /// 回転させる量。
-=======
-    /// The amount of rotation.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     ///
     /// ```example
     /// #rotate(-1.571rad)[Space!]
@@ -103,17 +60,9 @@ pub struct RotateElem {
     #[positional]
     pub angle: Angle,
 
-<<<<<<< HEAD
     /// 回転の中心点。
     ///
     /// 例えば、回転した要素の左下隅をベースラインに揃えたまま保ちたい場合、代わりに`bottom + left`を指定します。
-=======
-    /// The origin of the rotation.
-    ///
-    /// If, for instance, you wanted the bottom left corner of the rotated
-    /// element to stay aligned with the baseline, you would set it to `bottom +
-    /// left` instead.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     ///
     /// ```example
     /// #set text(spacing: 8pt)
@@ -128,18 +77,10 @@ pub struct RotateElem {
     #[default(HAlignment::Center + VAlignment::Horizon)]
     pub origin: Alignment,
 
-<<<<<<< HEAD
     /// 回転がレイアウトに影響を与えるかどうか。
     ///
     /// `{false}`に設定された場合、回転したコンテンツは元々のコンテンツのバウンディングボックスに留まります。
     /// `{true}`に設定された場合、バウンディングボックスはコンテンツの回転を考慮してレイアウトを調整します。
-=======
-    /// Whether the rotation impacts the layout.
-    ///
-    /// If set to `{false}`, the rotated content will retain the bounding box of
-    /// the original content. If set to `{true}`, the bounding box will take the
-    /// rotation of the content into account and adjust the layout accordingly.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     ///
     /// ```example
     /// Hello #rotate(90deg, reflow: true)[World]!
@@ -147,28 +88,16 @@ pub struct RotateElem {
     #[default(false)]
     pub reflow: bool,
 
-<<<<<<< HEAD
     /// 回転させるコンテンツ。
-=======
-    /// The content to rotate.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     #[required]
     pub body: Content,
 }
 
-<<<<<<< HEAD
 /// レイアウトに影響を与えないコンテンツの拡大縮小。
 ///
 /// 単一の軸で負のスケールを指定することで、コンテンツを反転表示できます。
 ///
 /// # 例
-=======
-/// Scales content without affecting layout.
-///
-/// Lets you mirror content by specifying a negative scale on a single axis.
-///
-/// # Example
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 /// ```example
 /// #set align(center)
 /// #scale(x: -100%)[This is mirrored.]
@@ -176,28 +105,16 @@ pub struct RotateElem {
 /// ```
 #[elem]
 pub struct ScaleElem {
-<<<<<<< HEAD
     /// 位置引数として両方の軸の拡大縮小率を設定します。
     /// これは`x`と`y`を同じ値で設定する省略記法です。
-=======
-    /// The scaling factor for both axes, as a positional argument. This is just
-    /// an optional shorthand notation for setting `x` and `y` to the same
-    /// value.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     #[external]
     #[positional]
     #[default(Smart::Custom(ScaleAmount::Ratio(Ratio::one())))]
     pub factor: Smart<ScaleAmount>,
 
-<<<<<<< HEAD
     /// 水平方向の拡大縮小率。
     ///
     /// 負の値が指定された場合は本文が水平方向に反転します。
-=======
-    /// The horizontal scaling factor.
-    ///
-    /// The body will be mirrored horizontally if the parameter is negative.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     #[parse(
         let all = args.find()?;
         args.named("x")?.or(all)
@@ -205,24 +122,14 @@ pub struct ScaleElem {
     #[default(Smart::Custom(ScaleAmount::Ratio(Ratio::one())))]
     pub x: Smart<ScaleAmount>,
 
-<<<<<<< HEAD
     /// 垂直方向の拡大縮小率。
     ///
     /// 負の値が指定された場合は本文が垂直方向に反転します。
-=======
-    /// The vertical scaling factor.
-    ///
-    /// The body will be mirrored vertically if the parameter is negative.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     #[parse(args.named("y")?.or(all))]
     #[default(Smart::Custom(ScaleAmount::Ratio(Ratio::one())))]
     pub y: Smart<ScaleAmount>,
 
-<<<<<<< HEAD
     /// 変換の原点。
-=======
-    /// The origin of the transformation.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     ///
     /// ```example
     /// A#box(scale(75%)[A])A \
@@ -232,18 +139,10 @@ pub struct ScaleElem {
     #[default(HAlignment::Center + VAlignment::Horizon)]
     pub origin: Alignment,
 
-<<<<<<< HEAD
     /// 拡大縮小がレイアウトに影響を与えるかどうか。
     ///
     /// `{false}`の場合、拡大縮小したコンテンツが他のコンテンツと重なることを許可します。
     /// `{true}`の場合、拡大縮小したコンテンツの新しい大きさを計算し、それに応じてレイアウトを調整します。
-=======
-    /// Whether the scaling impacts the layout.
-    ///
-    /// If set to `{false}`, the scaled content will be allowed to overlap
-    /// other content. If set to `{true}`, it will compute the new size of
-    /// the scaled content and adjust the layout accordingly.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     ///
     /// ```example
     /// Hello #scale(x: 20%, y: 40%, reflow: true)[World]!
@@ -251,11 +150,7 @@ pub struct ScaleElem {
     #[default(false)]
     pub reflow: bool,
 
-<<<<<<< HEAD
     /// 拡大縮小するコンテンツ。
-=======
-    /// The content to scale.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     #[required]
     pub body: Content,
 }
@@ -277,21 +172,12 @@ cast! {
     length: Length => ScaleAmount::Length(length),
 }
 
-<<<<<<< HEAD
 /// コンテンツのスキュー変形。
 ///
 /// 水平方向または垂直方向、あるいは両方向に要素をスキュー（シアー）変形します。
 /// `{reflow: true}`を指定しない限り、レイアウトは要素がスキュー変形を受けていないかのように振る舞います。
 ///
 /// # 例
-=======
-/// Skews content.
-///
-/// Skews an element in horizontal and/or vertical direction. The layout will
-/// act as if the element was not skewed unless you specify `{reflow: true}`.
-///
-/// # Example
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 /// ```example
 /// #skew(ax: -12deg)[
 ///   This is some fake italic text.
@@ -299,11 +185,7 @@ cast! {
 /// ```
 #[elem]
 pub struct SkewElem {
-<<<<<<< HEAD
     /// 水平方向のスキュー角。
-=======
-    /// The horizontal skewing angle.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     ///
     /// ```example
     /// #skew(ax: 30deg)[Skewed]
@@ -311,11 +193,7 @@ pub struct SkewElem {
     #[default(Angle::zero())]
     pub ax: Angle,
 
-<<<<<<< HEAD
     /// 垂直方向のスキュー角。
-=======
-    /// The vertical skewing angle.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     ///
     /// ```example
     /// #skew(ay: 30deg)[Skewed]
@@ -323,15 +201,9 @@ pub struct SkewElem {
     #[default(Angle::zero())]
     pub ay: Angle,
 
-<<<<<<< HEAD
     /// スキュー変形の原点。
     ///
     /// 操作中は原点が固定されます。
-=======
-    /// The origin of the skew transformation.
-    ///
-    /// The origin will stay fixed during the operation.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     ///
     /// ```example
     /// X #box(skew(ax: -30deg, origin: center + horizon)[X]) X \
@@ -342,18 +214,10 @@ pub struct SkewElem {
     #[default(HAlignment::Center + VAlignment::Horizon)]
     pub origin: Alignment,
 
-<<<<<<< HEAD
     /// スキュー変形がレイアウトに影響を与えるかどうか。
     ///
     /// `{false}`の場合、スキュー変形されたコンテンツは元々のコンテンツのバウンディングボックスに留まります。
     /// `{true}`の場合、バウンディングボックスはコンテンツの変形を考慮してレイアウトを調整します。
-=======
-    /// Whether the skew transformation impacts the layout.
-    ///
-    /// If set to `{false}`, the skewed content will retain the bounding box of
-    /// the original content. If set to `{true}`, the bounding box will take the
-    /// transformation of the content into account and adjust the layout accordingly.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     ///
     /// ```example
     /// Hello #skew(ay: 30deg, reflow: true, "World")!
@@ -361,11 +225,7 @@ pub struct SkewElem {
     #[default(false)]
     pub reflow: bool,
 
-<<<<<<< HEAD
     /// スキュー変形するコンテンツ。
-=======
-    /// The content to skew.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     #[required]
     pub body: Content,
 }
diff --git a/crates/typst-library/src/loading/cbor.rs b/crates/typst-library/src/loading/cbor.rs
index bf743f475c..1d411364cc 100644
--- a/crates/typst-library/src/loading/cbor.rs
+++ b/crates/typst-library/src/loading/cbor.rs
@@ -6,7 +6,6 @@ use crate::engine::Engine;
 use crate::foundations::{Bytes, Value, func, scope};
 use crate::loading::{DataSource, Load};
 
-<<<<<<< HEAD
 /// CBORファイルから構造化データを読み込む。
 ///
 /// 読み込むファイルには有効なCBORによるシリアル化データが含まれていなければなりません。
@@ -46,51 +45,6 @@ use crate::loading::{DataSource, Load};
 pub fn cbor(
     engine: &mut Engine,
     /// CBORファイルへの[パス]($syntax/#paths)、または生のCBORバイト列。
-=======
-/// Reads structured data from a CBOR file.
-///
-/// The file must contain a valid CBOR serialization. The CBOR values will be
-/// converted into corresponding Typst values as listed in the
-/// [table below](#conversion).
-///
-/// The function returns a dictionary, an array or, depending on the CBOR file,
-/// another CBOR data type.
-///
-/// # Conversion details { #conversion }
-///
-/// | CBOR value | Converted into Typst   |
-/// | ---------- | ---------------------- |
-/// | integer    | [`int`] (or [`float`]) |
-/// | bytes      | [`bytes`]              |
-/// | float      | [`float`]              |
-/// | text       | [`str`]                |
-/// | bool       | [`bool`]               |
-/// | null       | `{none}`               |
-/// | array      | [`array`]              |
-/// | map        | [`dictionary`]         |
-///
-/// | Typst value                           | Converted into CBOR          |
-/// | ------------------------------------- | ---------------------------- |
-/// | types that can be converted from CBOR | corresponding CBOR value     |
-/// | [`symbol`]                            | text                         |
-/// | [`content`]                           | a map describing the content |
-/// | other types ([`length`], etc.)        | text via [`repr`]            |
-///
-/// ## Notes
-///
-/// - Be aware that CBOR integers larger than 2<sup>63</sup>-1 or smaller than
-///   -2<sup>63</sup> will be converted to floating point numbers, which may
-///   result in an approximative value.
-///
-/// - CBOR tags are not supported, and an error will be thrown.
-///
-/// - The `repr` function is [for debugging purposes only]($repr/#debugging-only),
-///   and its output is not guaranteed to be stable across Typst versions.
-#[func(scope, title = "CBOR")]
-pub fn cbor(
-    engine: &mut Engine,
-    /// A [path]($syntax/#paths) to a CBOR file or raw CBOR bytes.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     source: Spanned<DataSource>,
 ) -> SourceResult<Value> {
     let loaded = source.load(engine.world)?;
@@ -101,42 +55,24 @@ pub fn cbor(
 
 #[scope]
 impl cbor {
-<<<<<<< HEAD
     /// CBORバイト列から構造化データを読み込む。
     #[func(title = "Decode CBOR")]
     #[deprecated(
         message = "`cbor.decode`は非推奨です。代わりにバイト列を直接`cbor`に渡してください。",
-=======
-    /// Reads structured data from CBOR bytes.
-    #[func(title = "Decode CBOR")]
-    #[deprecated(
-        message = "`cbor.decode` is deprecated, directly pass bytes to `cbor` instead",
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
         until = "0.15.0"
     )]
     pub fn decode(
         engine: &mut Engine,
-<<<<<<< HEAD
         /// CBORデータ。
-=======
-        /// CBOR data.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
         data: Spanned<Bytes>,
     ) -> SourceResult<Value> {
         cbor(engine, data.map(DataSource::Bytes))
     }
 
-<<<<<<< HEAD
     /// 構造化データをCBORバイト列にエンコードする。
     #[func(title = "Encode CBOR")]
     pub fn encode(
         /// エンコード対象の値。
-=======
-    /// Encode structured data into CBOR bytes.
-    #[func(title = "Encode CBOR")]
-    pub fn encode(
-        /// Value to be encoded.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
         value: Spanned<Value>,
     ) -> SourceResult<Bytes> {
         let Spanned { v: value, span } = value;
diff --git a/crates/typst-library/src/loading/csv.rs b/crates/typst-library/src/loading/csv.rs
index d7bfa20f33..5f03f89559 100644
--- a/crates/typst-library/src/loading/csv.rs
+++ b/crates/typst-library/src/loading/csv.rs
@@ -6,7 +6,6 @@ use crate::engine::Engine;
 use crate::foundations::{Array, Dict, IntoValue, Type, Value, cast, func, scope};
 use crate::loading::{DataSource, Load, Readable};
 
-<<<<<<< HEAD
 /// CSVファイルから構造化データを読み込む。
 ///
 /// CSVファイルは読み込まれ、文字列からなる2次元配列にパースされます。
@@ -15,16 +14,6 @@ use crate::loading::{DataSource, Load, Readable};
 /// ヘッダー行は削除されません。
 ///
 /// # 例
-=======
-/// Reads structured data from a CSV file.
-///
-/// The CSV file will be read and parsed into a 2-dimensional array of strings:
-/// Each row in the CSV file will be represented as an array of strings, and all
-/// rows will be collected into a single array. Header rows will not be
-/// stripped.
-///
-/// # Example
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 /// ```example
 /// #let results = csv("example.csv")
 ///
@@ -37,7 +26,6 @@ use crate::loading::{DataSource, Load, Readable};
 #[func(scope, title = "CSV")]
 pub fn csv(
     engine: &mut Engine,
-<<<<<<< HEAD
     /// CSVファイルの[パス]($syntax/#paths)、または生のCSVバイト列。
     source: Spanned<DataSource>,
     /// CSVファイルの列を区切る区切り文字。
@@ -52,22 +40,6 @@ pub fn csv(
     /// - `dictionary`に設定すると、
     ///   各行はヘッダーのキーと文字列を対応付けた辞書として表現されます。
     ///   このオプションは、CSVファイルにヘッダー行が存在する場合にのみ意味があります。
-=======
-    /// A [path]($syntax/#paths) to a CSV file or raw CSV bytes.
-    source: Spanned<DataSource>,
-    /// The delimiter that separates columns in the CSV file.
-    /// Must be a single ASCII character.
-    #[named]
-    #[default]
-    delimiter: Delimiter,
-    /// How to represent the file's rows.
-    ///
-    /// - If set to `array`, each row is represented as a plain array of
-    ///   strings.
-    /// - If set to `dictionary`, each row is represented as a dictionary
-    ///   mapping from header keys to strings. This option only makes sense when
-    ///   a header row is present in the CSV file.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     #[named]
     #[default(RowType::Array)]
     row_type: RowType,
@@ -121,22 +93,14 @@ pub fn csv(
 
 #[scope]
 impl csv {
-<<<<<<< HEAD
     /// CSVの文字列やバイト列から構造化データを読み込む。
     #[func(title = "Decode CSV")]
     #[deprecated(
         message = "`csv.decode`は非推奨です。代わりにバイト列を直接`csv`に渡してください。",
-=======
-    /// Reads structured data from a CSV string/bytes.
-    #[func(title = "Decode CSV")]
-    #[deprecated(
-        message = "`csv.decode` is deprecated, directly pass bytes to `csv` instead",
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
         until = "0.15.0"
     )]
     pub fn decode(
         engine: &mut Engine,
-<<<<<<< HEAD
         /// CSVデータ。
         data: Spanned<Readable>,
         /// CSVファイルの列を区切る区切り文字。
@@ -151,22 +115,6 @@ impl csv {
         /// - `dictionary`に設定すると、
         ///   各行はヘッダーのキーと文字列を対応付けた辞書として表現されます。
         ///   このオプションは、CSVファイルにヘッダー行が存在する場合にのみ意味があります。
-=======
-        /// CSV data.
-        data: Spanned<Readable>,
-        /// The delimiter that separates columns in the CSV file.
-        /// Must be a single ASCII character.
-        #[named]
-        #[default]
-        delimiter: Delimiter,
-        /// How to represent the file's rows.
-        ///
-        /// - If set to `array`, each row is represented as a plain array of
-        ///   strings.
-        /// - If set to `dictionary`, each row is represented as a dictionary
-        ///   mapping from header keys to strings. This option only makes sense
-        ///   when a header row is present in the CSV file.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
         #[named]
         #[default(RowType::Array)]
         row_type: RowType,
diff --git a/crates/typst-library/src/loading/json.rs b/crates/typst-library/src/loading/json.rs
index c5690c9159..d03dd3dc0e 100644
--- a/crates/typst-library/src/loading/json.rs
+++ b/crates/typst-library/src/loading/json.rs
@@ -6,7 +6,6 @@ use crate::engine::Engine;
 use crate::foundations::{Str, Value, func, scope};
 use crate::loading::{DataSource, Load, Readable};
 
-<<<<<<< HEAD
 /// JSONファイルから構造化データを読み込む。
 ///
 /// 読み込むファイルにはオブジェクトや配列などの有効なJSON値が含まれていなければなりません。
@@ -18,21 +17,6 @@ use crate::loading::{DataSource, Load, Readable};
 /// `temperature`、`unit`、および`weather`というキーを持つオブジェクトを含んでいます。
 ///
 /// # 例
-=======
-/// Reads structured data from a JSON file.
-///
-/// The file must contain a valid JSON value, such as object or array. The JSON
-/// values will be converted into corresponding Typst values as listed in the
-/// [table below](#conversion).
-///
-/// The function returns a dictionary, an array or, depending on the JSON file,
-/// another JSON data type.
-///
-/// The JSON files in the example contain objects with the keys `temperature`,
-/// `unit`, and `weather`.
-///
-/// # Example
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 /// ```example
 /// #let forecast(day) = block[
 ///   #box(square(
@@ -57,7 +41,6 @@ use crate::loading::{DataSource, Load, Readable};
 /// #forecast(json("tuesday.json"))
 /// ```
 ///
-<<<<<<< HEAD
 /// # 変換の詳細 { #conversion }
 ///
 /// | JSONの値 | Typstへの変換先 |
@@ -91,43 +74,6 @@ use crate::loading::{DataSource, Load, Readable};
 pub fn json(
     engine: &mut Engine,
     /// JSONファイルの[パス]($syntax/#paths)、または生のJSONバイト列。
-=======
-/// # Conversion details { #conversion }
-///
-/// | JSON value | Converted into Typst |
-/// | ---------- | -------------------- |
-/// | `null`     | `{none}`             |
-/// | bool       | [`bool`]             |
-/// | number     | [`float`] or [`int`] |
-/// | string     | [`str`]              |
-/// | array      | [`array`]            |
-/// | object     | [`dictionary`]       |
-///
-/// | Typst value                           | Converted into JSON              |
-/// | ------------------------------------- | -------------------------------- |
-/// | types that can be converted from JSON | corresponding JSON value         |
-/// | [`bytes`]                             | string via [`repr`]              |
-/// | [`symbol`]                            | string                           |
-/// | [`content`]                           | an object describing the content |
-/// | other types ([`length`], etc.)        | string via [`repr`]              |
-///
-/// ## Notes
-/// - In most cases, JSON numbers will be converted to floats or integers
-///   depending on whether they are whole numbers. However, be aware that
-///   integers larger than 2<sup>63</sup>-1 or smaller than -2<sup>63</sup> will
-///   be converted to floating-point numbers, which may result in an
-///   approximative value.
-///
-/// - Bytes are not encoded as JSON arrays for performance and readability
-///   reasons. Consider using [`cbor.encode`] for binary data.
-///
-/// - The `repr` function is [for debugging purposes only]($repr/#debugging-only),
-///   and its output is not guaranteed to be stable across Typst versions.
-#[func(scope, title = "JSON")]
-pub fn json(
-    engine: &mut Engine,
-    /// A [path]($syntax/#paths) to a JSON file or raw JSON bytes.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     source: Spanned<DataSource>,
 ) -> SourceResult<Value> {
     let loaded = source.load(engine.world)?;
@@ -141,46 +87,26 @@ pub fn json(
 
 #[scope]
 impl json {
-<<<<<<< HEAD
     /// JSONの文字列やバイト列から構造化データを読み込む。
     #[func(title = "Decode JSON")]
     #[deprecated(
         message = "`json.decode`は非推奨です。代わりにバイト列を直接`json`に渡してください。",
-=======
-    /// Reads structured data from a JSON string/bytes.
-    #[func(title = "Decode JSON")]
-    #[deprecated(
-        message = "`json.decode` is deprecated, directly pass bytes to `json` instead",
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
         until = "0.15.0"
     )]
     pub fn decode(
         engine: &mut Engine,
-<<<<<<< HEAD
         /// JSONデータ。
-=======
-        /// JSON data.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
         data: Spanned<Readable>,
     ) -> SourceResult<Value> {
         json(engine, data.map(Readable::into_source))
     }
 
-<<<<<<< HEAD
     /// 構造化データをJSON文字列にエンコードする。
     #[func(title = "Encode JSON")]
     pub fn encode(
         /// エンコード対象の値。
         value: Spanned<Value>,
         /// JSONを改行およびインデント付きで整形表示するかどうか。
-=======
-    /// Encodes structured data into a JSON string.
-    #[func(title = "Encode JSON")]
-    pub fn encode(
-        /// Value to be encoded.
-        value: Spanned<Value>,
-        /// Whether to pretty print the JSON with newlines and indentation.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
         #[named]
         #[default(true)]
         pretty: bool,
diff --git a/crates/typst-library/src/loading/read.rs b/crates/typst-library/src/loading/read.rs
index aca99e8d91..de7cb5b4fc 100644
--- a/crates/typst-library/src/loading/read.rs
+++ b/crates/typst-library/src/loading/read.rs
@@ -6,7 +6,6 @@ use crate::engine::Engine;
 use crate::foundations::{Cast, func};
 use crate::loading::{DataSource, Load, Readable};
 
-<<<<<<< HEAD
 /// ファイルからプレーンテキストやデータを読み込む。
 ///
 /// デフォルトでは、ファイルはUTF-8として読み込まれ、[文字列]($str)として返されます。
@@ -14,15 +13,6 @@ use crate::loading::{DataSource, Load, Readable};
 /// `{encoding: none}`を指定した場合、この関数は代わりに生の[bytes]を返します。
 ///
 /// # 例
-=======
-/// Reads plain text or data from a file.
-///
-/// By default, the file will be read as UTF-8 and returned as a [string]($str).
-///
-/// If you specify `{encoding: none}`, this returns raw [bytes] instead.
-///
-/// # Example
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 /// ```example
 /// An example for a HTML file: \
 /// #let text = read("example.html")
@@ -34,7 +24,6 @@ use crate::loading::{DataSource, Load, Readable};
 #[func]
 pub fn read(
     engine: &mut Engine,
-<<<<<<< HEAD
     /// ファイルのパス。
     ///
     /// 詳細については、[パスのセクション]($syntax/#paths)を参照してください。
@@ -42,15 +31,6 @@ pub fn read(
     /// ファイルを読み込む際に使用するエンコーディング。
     ///
     /// `{none}`に設定すると、この関数は生のバイトを返します。
-=======
-    /// Path to a file.
-    ///
-    /// For more details, see the [Paths section]($syntax/#paths).
-    path: Spanned<EcoString>,
-    /// The encoding to read the file with.
-    ///
-    /// If set to `{none}`, this function returns raw bytes.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     #[named]
     #[default(Some(Encoding::Utf8))]
     encoding: Option<Encoding>,
@@ -62,16 +42,9 @@ pub fn read(
     })
 }
 
-<<<<<<< HEAD
 /// ファイルのエンコーディング。
 #[derive(Debug, Copy, Clone, Eq, PartialEq, Hash, Cast)]
 pub enum Encoding {
     /// Unicode UTF-8エンコーディング。
-=======
-/// An encoding of a file.
-#[derive(Debug, Copy, Clone, Eq, PartialEq, Hash, Cast)]
-pub enum Encoding {
-    /// The Unicode UTF-8 encoding.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     Utf8,
 }
diff --git a/crates/typst-library/src/loading/toml.rs b/crates/typst-library/src/loading/toml.rs
index 9644cc6270..792fe2b6d7 100644
--- a/crates/typst-library/src/loading/toml.rs
+++ b/crates/typst-library/src/loading/toml.rs
@@ -6,7 +6,6 @@ use crate::engine::Engine;
 use crate::foundations::{Dict, Str, func, scope};
 use crate::loading::{DataSource, Load, Readable};
 
-<<<<<<< HEAD
 /// TOMLファイルから構造化データを読み込む。
 ///
 /// 読み込むファイルには有効なTOMLテーブルが含まれていなければなりません。
@@ -18,19 +17,6 @@ use crate::loading::{DataSource, Load, Readable};
 /// `title`、`version`、および`authors`のキーを持つテーブルで構成されています。
 ///
 /// # 例
-=======
-/// Reads structured data from a TOML file.
-///
-/// The file must contain a valid TOML table. The TOML values will be converted
-/// into corresponding Typst values as listed in the [table below](#conversion).
-///
-/// The function returns a dictionary representing the TOML table.
-///
-/// The TOML file in the example consists of a table with the keys `title`,
-/// `version`, and `authors`.
-///
-/// # Example
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 /// ```example
 /// #let details = toml("details.toml")
 ///
@@ -40,7 +26,6 @@ use crate::loading::{DataSource, Load, Readable};
 ///   .join(", ", last: " and "))
 /// ```
 ///
-<<<<<<< HEAD
 /// # 変換の詳細 { #conversion }
 ///
 /// まず、TOML文書はテーブルです。その他の値はテーブルに入れて
@@ -79,47 +64,6 @@ use crate::loading::{DataSource, Load, Readable};
 pub fn toml(
     engine: &mut Engine,
     /// TOMLファイルの[パス]($syntax/#paths)、または生のTOMLバイト列。
-=======
-/// # Conversion details { #conversion }
-///
-/// First of all, TOML documents are tables. Other values must be put in a table
-/// to be encoded or decoded.
-///
-/// | TOML value | Converted into Typst |
-/// | ---------- | -------------------- |
-/// | string     | [`str`]              |
-/// | integer    | [`int`]              |
-/// | float      | [`float`]            |
-/// | boolean    | [`bool`]             |
-/// | datetime   | [`datetime`]         |
-/// | array      | [`array`]            |
-/// | table      | [`dictionary`]       |
-///
-/// | Typst value                           | Converted into TOML            |
-/// | ------------------------------------- | ------------------------------ |
-/// | types that can be converted from TOML | corresponding TOML value       |
-/// | `{none}`                              | ignored                        |
-/// | [`bytes`]                             | string via [`repr`]            |
-/// | [`symbol`]                            | string                         |
-/// | [`content`]                           | a table describing the content |
-/// | other types ([`length`], etc.)        | string via [`repr`]            |
-///
-/// ## Notes
-/// - Be aware that TOML integers larger than 2<sup>63</sup>-1 or smaller
-///   than -2<sup>63</sup> cannot be represented losslessly in Typst, and an
-///   error will be thrown according to the
-///   [specification](https://toml.io/en/v1.0.0#integer).
-///
-/// - Bytes are not encoded as TOML arrays for performance and readability
-///   reasons. Consider using [`cbor.encode`] for binary data.
-///
-/// - The `repr` function is [for debugging purposes only]($repr/#debugging-only),
-///   and its output is not guaranteed to be stable across Typst versions.
-#[func(scope, title = "TOML")]
-pub fn toml(
-    engine: &mut Engine,
-    /// A [path]($syntax/#paths) to a TOML file or raw TOML bytes.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     source: Spanned<DataSource>,
 ) -> SourceResult<Dict> {
     let loaded = source.load(engine.world)?;
@@ -129,32 +73,20 @@ pub fn toml(
 
 #[scope]
 impl toml {
-<<<<<<< HEAD
     /// TOMLの文字列やバイト列から構造化データを読み込む。
     #[func(title = "Decode TOML")]
     #[deprecated(
         message = "`toml.decode`は非推奨です。代わりにバイト列を直接`toml`に渡してください。",
-=======
-    /// Reads structured data from a TOML string/bytes.
-    #[func(title = "Decode TOML")]
-    #[deprecated(
-        message = "`toml.decode` is deprecated, directly pass bytes to `toml` instead",
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
         until = "0.15.0"
     )]
     pub fn decode(
         engine: &mut Engine,
-<<<<<<< HEAD
         /// TOMLデータ。
-=======
-        /// TOML data.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
         data: Spanned<Readable>,
     ) -> SourceResult<Dict> {
         toml(engine, data.map(Readable::into_source))
     }
 
-<<<<<<< HEAD
     /// 構造化データをTOML文字列にエンコードする。
     #[func(title = "Encode TOML")]
     pub fn encode(
@@ -163,16 +95,6 @@ impl toml {
         /// TOML文書はテーブルなので、辞書のみが適しています。
         value: Spanned<Dict>,
         /// TOMLを整形表示するかどうか。
-=======
-    /// Encodes structured data into a TOML string.
-    #[func(title = "Encode TOML")]
-    pub fn encode(
-        /// Value to be encoded.
-        ///
-        /// TOML documents are tables. Therefore, only dictionaries are suitable.
-        value: Spanned<Dict>,
-        /// Whether to pretty-print the resulting TOML.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
         #[named]
         #[default(true)]
         pretty: bool,
diff --git a/crates/typst-library/src/loading/xml.rs b/crates/typst-library/src/loading/xml.rs
index f0cf839798..4dc7104160 100644
--- a/crates/typst-library/src/loading/xml.rs
+++ b/crates/typst-library/src/loading/xml.rs
@@ -6,7 +6,6 @@ use crate::engine::Engine;
 use crate::foundations::{Array, Dict, IntoValue, Str, Value, dict, func, scope};
 use crate::loading::{DataSource, Load, Readable};
 
-<<<<<<< HEAD
 /// XMLファイルから構造化データを読み込む。
 ///
 /// XMLファイルは辞書と文字列からなる配列にパースされます。
@@ -23,24 +22,6 @@ use crate::loading::{DataSource, Load, Readable};
 /// これらは`p`タグとして表現されています。
 ///
 /// # 例
-=======
-/// Reads structured data from an XML file.
-///
-/// The XML file is parsed into an array of dictionaries and strings. XML nodes
-/// can be elements or strings. Elements are represented as dictionaries with
-/// the following keys:
-///
-/// - `tag`: The name of the element as a string.
-/// - `attrs`: A dictionary of the element's attributes as strings.
-/// - `children`: An array of the element's child nodes.
-///
-/// The XML file in the example contains a root `news` tag with multiple
-/// `article` tags. Each article has a `title`, `author`, and `content` tag. The
-/// `content` tag contains one or more paragraphs, which are represented as `p`
-/// tags.
-///
-/// # Example
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 /// ```example
 /// #let find-child(elem, tag) = {
 ///   elem.children
@@ -76,11 +57,7 @@ use crate::loading::{DataSource, Load, Readable};
 #[func(scope, title = "XML")]
 pub fn xml(
     engine: &mut Engine,
-<<<<<<< HEAD
     /// XMLファイルの[パス]($syntax/#paths)または生のXMLバイト列。
-=======
-    /// A [path]($syntax/#paths) to an XML file or raw XML bytes.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     source: Spanned<DataSource>,
 ) -> SourceResult<Value> {
     let loaded = source.load(engine.world)?;
@@ -96,26 +73,15 @@ pub fn xml(
 
 #[scope]
 impl xml {
-<<<<<<< HEAD
     /// XMLの文字列やバイト列から構造化データを読み込む。
     #[func(title = "Decode XML")]
     #[deprecated(
         message = "`xml.decode`は非推奨です。代わりにバイト列を直接`xml`に渡してください。",
-=======
-    /// Reads structured data from an XML string/bytes.
-    #[func(title = "Decode XML")]
-    #[deprecated(
-        message = "`xml.decode` is deprecated, directly pass bytes to `xml` instead",
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
         until = "0.15.0"
     )]
     pub fn decode(
         engine: &mut Engine,
-<<<<<<< HEAD
         /// XMLデータ。
-=======
-        /// XML data.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
         data: Spanned<Readable>,
     ) -> SourceResult<Value> {
         xml(engine, data.map(Readable::into_source))
diff --git a/crates/typst-library/src/loading/yaml.rs b/crates/typst-library/src/loading/yaml.rs
index b4b201d66e..0fb7b83fbd 100644
--- a/crates/typst-library/src/loading/yaml.rs
+++ b/crates/typst-library/src/loading/yaml.rs
@@ -6,7 +6,6 @@ use crate::engine::Engine;
 use crate::foundations::{Str, Value, func, scope};
 use crate::loading::{DataSource, Load, Readable};
 
-<<<<<<< HEAD
 /// YAMLファイルから構造化データを読み込む。
 ///
 /// 読み込むファイルには有効なYAMLオブジェクトまたは配列が含まれていなければなりません。
@@ -19,22 +18,6 @@ use crate::loading::{DataSource, Load, Readable};
 /// サブマッピングのシーケンスが含まれています。
 ///
 /// # 例
-=======
-/// Reads structured data from a YAML file.
-///
-/// The file must contain a valid YAML object or array. The YAML values will be
-/// converted into corresponding Typst values as listed in the
-/// [table below](#conversion).
-///
-/// The function returns a dictionary, an array or, depending on the YAML file,
-/// another YAML data type.
-///
-/// The YAML files in the example contain objects with authors as keys,
-/// each with a sequence of their own submapping with the keys
-/// "title" and "published".
-///
-/// # Example
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 /// ```example
 /// #let bookshelf(contents) = {
 ///   for (author, works) in contents {
@@ -50,7 +33,6 @@ use crate::loading::{DataSource, Load, Readable};
 /// )
 /// ```
 ///
-<<<<<<< HEAD
 /// # 変換の詳細 { #conversion }
 ///
 /// | YAMLの値                              | Typstへの変換先       |
@@ -86,45 +68,6 @@ use crate::loading::{DataSource, Load, Readable};
 pub fn yaml(
     engine: &mut Engine,
     /// YAMLファイルの[パス]($syntax/#paths)、または生のYAMLバイト列。
-=======
-/// # Conversion details { #conversion }
-///
-/// | YAML value                             | Converted into Typst |
-/// | -------------------------------------- | -------------------- |
-/// | null-values (`null`, `~` or empty ` `) | `{none}`             |
-/// | boolean                                | [`bool`]             |
-/// | number                                 | [`float`] or [`int`] |
-/// | string                                 | [`str`]              |
-/// | sequence                               | [`array`]            |
-/// | mapping                                | [`dictionary`]       |
-///
-/// | Typst value                           | Converted into YAML              |
-/// | ------------------------------------- | -------------------------------- |
-/// | types that can be converted from YAML | corresponding YAML value         |
-/// | [`bytes`]                             | string via [`repr`]              |
-/// | [`symbol`]                            | string                           |
-/// | [`content`]                           | a mapping describing the content |
-/// | other types ([`length`], etc.)        | string via [`repr`]              |
-///
-/// ## Notes
-/// - In most cases, YAML numbers will be converted to floats or integers
-///   depending on whether they are whole numbers. However, be aware that
-///   integers larger than 2<sup>63</sup>-1 or smaller than -2<sup>63</sup> will
-///   be converted to floating-point numbers, which may result in an
-///   approximative value.
-///
-/// - Custom YAML tags are ignored, though the loaded value will still be present.
-///
-/// - Bytes are not encoded as YAML sequences for performance and readability
-///   reasons. Consider using [`cbor.encode`] for binary data.
-///
-/// - The `repr` function is [for debugging purposes only]($repr/#debugging-only),
-///   and its output is not guaranteed to be stable across Typst versions.
-#[func(scope, title = "YAML")]
-pub fn yaml(
-    engine: &mut Engine,
-    /// A [path]($syntax/#paths) to a YAML file or raw YAML bytes.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     source: Spanned<DataSource>,
 ) -> SourceResult<Value> {
     let loaded = source.load(engine.world)?;
@@ -135,42 +78,24 @@ pub fn yaml(
 
 #[scope]
 impl yaml {
-<<<<<<< HEAD
     /// YAMLの文字列やバイト列から構造化データを読み込む。
     #[func(title = "Decode YAML")]
     #[deprecated(
         message = "`yaml.decode`は非推奨です。代わりにバイト列を直接`yaml`に渡してください。",
-=======
-    /// Reads structured data from a YAML string/bytes.
-    #[func(title = "Decode YAML")]
-    #[deprecated(
-        message = "`yaml.decode` is deprecated, directly pass bytes to `yaml` instead",
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
         until = "0.15.0"
     )]
     pub fn decode(
         engine: &mut Engine,
-<<<<<<< HEAD
         /// YAMLデータ。
-=======
-        /// YAML data.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
         data: Spanned<Readable>,
     ) -> SourceResult<Value> {
         yaml(engine, data.map(Readable::into_source))
     }
 
-<<<<<<< HEAD
     /// 構造化データをYAML文字列にエンコードする。
     #[func(title = "Encode YAML")]
     pub fn encode(
         /// エンコード対象の値。
-=======
-    /// Encode structured data into a YAML string.
-    #[func(title = "Encode YAML")]
-    pub fn encode(
-        /// Value to be encoded.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
         value: Spanned<Value>,
     ) -> SourceResult<Str> {
         let Spanned { v: value, span } = value;
diff --git a/crates/typst-library/src/math/accent.rs b/crates/typst-library/src/math/accent.rs
index 3894ce0b02..a32bec0fbf 100644
--- a/crates/typst-library/src/math/accent.rs
+++ b/crates/typst-library/src/math/accent.rs
@@ -5,24 +5,13 @@ use icu_properties::maps::CodePointMapData;
 use icu_provider::AsDeserializingBufferProvider;
 use icu_provider_blob::BlobDataProvider;
 
-<<<<<<< HEAD
-use crate::diag::bail;
-use crate::foundations::{Content, NativeElement, SymbolElem, cast, elem, func};
+use crate::foundations::{Content, NativeElement, Str, SymbolElem, cast, elem, func};
 use crate::layout::{Length, Rel};
 use crate::math::Mathy;
 
 /// 対象の要素にアクセント記号を付ける。
 ///
 /// # 例
-=======
-use crate::foundations::{Content, NativeElement, Str, SymbolElem, cast, elem, func};
-use crate::layout::{Length, Rel};
-use crate::math::Mathy;
-
-/// Attaches an accent to a base.
-///
-/// # Example
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 /// ```example
 /// $grave(a) = accent(a, `)$ \
 /// $arrow(a) = accent(a, arrow)$ \
@@ -30,13 +19,8 @@ use crate::math::Mathy;
 /// ```
 #[elem(Mathy)]
 pub struct AccentElem {
-<<<<<<< HEAD
     /// アクセント記号が適用される対象の要素。
     /// 複数の文字から構成される場合もあります。
-=======
-    /// The base to which the accent is applied. May consist of multiple
-    /// letters.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     ///
     /// ```example
     /// $arrow(A B C)$
@@ -44,7 +28,6 @@ pub struct AccentElem {
     #[required]
     pub base: Content,
 
-<<<<<<< HEAD
     /// 対象の要素に適用するアクセント記号。
     ///
     /// サポートされているアクセント記号には以下のものがあります。
@@ -74,37 +57,6 @@ pub struct AccentElem {
     pub accent: Accent,
 
     /// 対象の要素の幅に対するアクセント記号の相対的な大きさ。
-=======
-    /// The accent to apply to the base.
-    ///
-    /// Supported accents include:
-    ///
-    /// | Accent        | Name            | Codepoint |
-    /// | ------------- | --------------- | --------- |
-    /// | Grave         | `grave`         | <code>&DiacriticalGrave;</code> |
-    /// | Acute         | `acute`         | `´`       |
-    /// | Circumflex    | `hat`           | `^`       |
-    /// | Tilde         | `tilde`         | `~`       |
-    /// | Macron        | `macron`        | `¯`       |
-    /// | Dash          | `dash`          | `‾`       |
-    /// | Breve         | `breve`         | `˘`       |
-    /// | Dot           | `dot`           | `.`       |
-    /// | Double dot, Diaeresis | `dot.double`, `diaer` | `¨` |
-    /// | Triple dot    | `dot.triple`    | <code>&tdot;</code> |
-    /// | Quadruple dot | `dot.quad`      | <code>&DotDot;</code> |
-    /// | Circle        | `circle`        | `∘`       |
-    /// | Double acute  | `acute.double`  | `˝`       |
-    /// | Caron         | `caron`         | `ˇ`       |
-    /// | Right arrow   | `arrow`, `->`   | `→`       |
-    /// | Left arrow    | `arrow.l`, `<-` | `←`       |
-    /// | Left/Right arrow | `arrow.l.r`  | `↔`       |
-    /// | Right harpoon | `harpoon`       | `⇀`       |
-    /// | Left harpoon  | `harpoon.lt`    | `↼`       |
-    #[required]
-    pub accent: Accent,
-
-    /// The size of the accent, relative to the width of the base.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     ///
     /// ```example
     /// $dash(A, size: #150%)$
@@ -112,16 +64,9 @@ pub struct AccentElem {
     #[default(Rel::one())]
     pub size: Rel<Length>,
 
-<<<<<<< HEAD
     /// 上付きのアクセント記号を追加する際に、小文字のiおよびjの上の点を取り除くかどうか。
     ///
     /// OpenTypeフィーチャーの`dtls`が有効になります。
-=======
-    /// Whether to remove the dot on top of lowercase i and j when adding a top
-    /// accent.
-    ///
-    /// This enables the `dtls` OpenType feature.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     ///
     /// ```example
     /// $hat(dotless: #false, i)$
@@ -140,8 +85,6 @@ impl Accent {
         Self(Self::combine(c).unwrap_or(c))
     }
 
-<<<<<<< HEAD
-=======
     /// Tries to select the appropriate combining accent for a string, falling
     /// back to the string's lone character if there is no corresponding one.
     ///
@@ -151,7 +94,6 @@ impl Accent {
         Self::combining(s).or_else(|| s.parse::<char>().ok().map(Self))
     }
 
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     /// Whether this accent is a bottom accent or not.
     pub fn is_bottom(&self) -> bool {
         static COMBINING_CLASS_DATA: LazyLock<CodePointMapData<CanonicalCombiningClass>> =
@@ -175,19 +117,11 @@ impl Accent {
 ///
 /// ```ignore
 /// accents! {
-<<<<<<< HEAD
-///     '\u{0300}' | '`' => grave,
-/// //  ^^^^^^^^^    ^^^    ^^^^^
-/// //  |            |      |
-/// //  |            |      +-- The name of the function.
-/// //  |            +--------- The alternative characters that represent the accent.
-=======
 ///     '\u{0300}', "\u{0300}" | "`" => grave,
 /// //  ^^^^^^^^^   ^^^^^^^^^^^^^^^^    ^^^^^
 /// //  |           |                   |
 /// //  |           |                   +-- The name of the function.
 /// //  |           +--------- The list of strings that normalize to the accent.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 /// //  +---------------------- The primary character that represents the accent.
 /// }
 /// ```
@@ -195,14 +129,6 @@ impl Accent {
 /// When combined with the `Accent::combine` function, accent characters can be normalized
 /// to the primary character.
 macro_rules! accents {
-<<<<<<< HEAD
-    ($($primary:literal $(| $alt:literal)* => $name:ident),* $(,)?) => {
-        impl Accent {
-            /// Normalize an accent to a combining one.
-            pub fn combine(c: char) -> Option<char> {
-                Some(match c {
-                    $($primary $(| $alt)* => $primary,)*
-=======
     ($($primary:literal, $($option:literal)|* => $name:ident),* $(,)?) => {
         impl Accent {
             /// Normalize an accent to a combining one.
@@ -215,7 +141,6 @@ macro_rules! accents {
             pub fn combining(value: &str) -> Option<Self> {
                 Some(match value {
                     $($($option)|* => Accent($primary),)*
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
                     _ => return None,
                 })
             }
@@ -250,27 +175,6 @@ macro_rules! accents {
 
 // Keep it synced with the documenting table above.
 accents! {
-<<<<<<< HEAD
-    '\u{0300}' | '`' => grave,
-    '\u{0301}' | '´' => acute,
-    '\u{0302}' | '^' | 'ˆ' => hat,
-    '\u{0303}' | '~' | '∼' | '˜' => tilde,
-    '\u{0304}' | '¯' => macron,
-    '\u{0305}' | '-' | '‾' | '−' => dash,
-    '\u{0306}' | '˘' => breve,
-    '\u{0307}' | '.' | '˙' | '⋅' => dot,
-    '\u{0308}' | '¨' => dot_double,
-    '\u{20db}' => dot_triple,
-    '\u{20dc}' => dot_quad,
-    '\u{030a}' | '∘' | '○' => circle,
-    '\u{030b}' | '˝' => acute_double,
-    '\u{030c}' | 'ˇ' => caron,
-    '\u{20d6}' | '←' => arrow_l,
-    '\u{20d7}' | '→' | '⟶' => arrow,
-    '\u{20e1}' | '↔' | '⟷' => arrow_l_r,
-    '\u{20d0}' | '↼' => harpoon_lt,
-    '\u{20d1}' | '⇀' => harpoon,
-=======
     // Note: Symbols that can have a text presentation must explicitly have that
     // alternative listed here.
     '\u{0300}', "\u{0300}" | "`" => grave,
@@ -292,19 +196,11 @@ accents! {
     '\u{20e1}', "\u{20e1}" | "↔" | "↔\u{fe0e}" | "⟷" => arrow_l_r,
     '\u{20d0}', "\u{20d0}" | "↼" => harpoon_lt,
     '\u{20d1}', "\u{20d1}" | "⇀" => harpoon,
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 }
 
 cast! {
     Accent,
     self => self.0.into_value(),
-<<<<<<< HEAD
-    v: char => Self::new(v),
-    v: Content => match v.to_packed::<SymbolElem>().and_then(|elem| elem.text.parse::<char>().ok()) {
-        Some(c) => Self::new(c),
-        _ => bail!("expected a single-codepoint symbol"),
-    },
-=======
     // The string cast handles
     // - strings: `accent(a, "↔")`
     // - symbol values: `accent(a, <->)`
@@ -314,5 +210,4 @@ cast! {
     v: Content => v.to_packed::<SymbolElem>()
         .and_then(|elem| Accent::normalize(&elem.text))
         .ok_or("expected a single-codepoint symbol")?,
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 }
diff --git a/crates/typst-library/src/math/attach.rs b/crates/typst-library/src/math/attach.rs
index 586501044a..50d3d8a3cf 100644
--- a/crates/typst-library/src/math/attach.rs
+++ b/crates/typst-library/src/math/attach.rs
@@ -2,11 +2,7 @@ use crate::foundations::{Content, Packed, elem};
 use crate::layout::{Length, Rel};
 use crate::math::{EquationElem, Mathy};
 
-<<<<<<< HEAD
 /// オプションのアタッチメントを持つベースとなる関数。
-=======
-/// A base with optional attachments.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 ///
 /// ```example
 /// $ attach(
@@ -16,7 +12,6 @@ use crate::math::{EquationElem, Mathy};
 /// ```
 #[elem(Mathy)]
 pub struct AttachElem {
-<<<<<<< HEAD
     /// アタッチメントを取り付けるベース。
     #[required]
     pub base: Content,
@@ -41,35 +36,6 @@ pub struct AttachElem {
     pub tr: Option<Content>,
 
     /// 右下のアタッチメント（ベースの後）。
-=======
-    /// The base to which things are attached.
-    #[required]
-    pub base: Content,
-
-    /// The top attachment, smartly positioned at top-right or above the base.
-    ///
-    /// You can wrap the base in `{limits()}` or `{scripts()}` to override the
-    /// smart positioning.
-    pub t: Option<Content>,
-
-    /// The bottom attachment, smartly positioned at the bottom-right or below
-    /// the base.
-    ///
-    /// You can wrap the base in `{limits()}` or `{scripts()}` to override the
-    /// smart positioning.
-    pub b: Option<Content>,
-
-    /// The top-left attachment (before the base).
-    pub tl: Option<Content>,
-
-    /// The bottom-left attachment (before base).
-    pub bl: Option<Content>,
-
-    /// The top-right attachment (after the base).
-    pub tr: Option<Content>,
-
-    /// The bottom-right attachment (after the base).
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     pub br: Option<Content>,
 }
 
@@ -112,68 +78,41 @@ impl Packed<AttachElem> {
     }
 }
 
-<<<<<<< HEAD
 /// グループ化されたプライム記号。
-=======
-/// Grouped primes.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 ///
 /// ```example
 /// $ a'''_b = a^'''_b $
 /// ```
 ///
-<<<<<<< HEAD
 /// # 構文
 /// この関数には専用の構文があり、primes関数の代わりにアポストロフィー記号を使います。
 /// これらは自動的に前の要素に付加され、次の上付き文字のレベルに移動します。
 #[elem(Mathy)]
 pub struct PrimesElem {
     /// グループ化するプライム記号の数。
-=======
-/// # Syntax
-/// This function has dedicated syntax: use apostrophes instead of primes. They
-/// will automatically attach to the previous element, moving superscripts to
-/// the next level.
-#[elem(Mathy)]
-pub struct PrimesElem {
-    /// The number of grouped primes.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     #[required]
     pub count: usize,
 }
 
-<<<<<<< HEAD
 /// アタッチメントを添え字として表示することをベースに強制。
-=======
-/// Forces a base to display attachments as scripts.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 ///
 /// ```example
 /// $ scripts(sum)_1^2 != sum_1^2 $
 /// ```
 #[elem(Mathy)]
 pub struct ScriptsElem {
-<<<<<<< HEAD
     /// 添え字を取り付けるベース。
-=======
-    /// The base to attach the scripts to.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     #[required]
     pub body: Content,
 }
 
-<<<<<<< HEAD
 /// アタッチメントをlimitsとして表示することをベースに強制。
-=======
-/// Forces a base to display attachments as limits.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 ///
 /// ```example
 /// $ limits(A)_1^2 != A_1^2 $
 /// ```
 #[elem(Mathy)]
 pub struct LimitsElem {
-<<<<<<< HEAD
     /// limitsを取り付けるベース。
     #[required]
     pub body: Content,
@@ -181,37 +120,16 @@ pub struct LimitsElem {
     /// インライン数式でもlimits表示を強制するかどうか。
     ///
     /// （例えばshowルールを用いて）limitsをグローバルに適用する場合、通常は無効にすることをおすすめします。
-=======
-    /// The base to attach the limits to.
-    #[required]
-    pub body: Content,
-
-    /// Whether to also force limits in inline equations.
-    ///
-    /// When applying limits globally (e.g., through a show rule), it is
-    /// typically a good idea to disable this.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     #[default(true)]
     pub inline: bool,
 }
 
-<<<<<<< HEAD
 /// グリフを伸縮します。
 ///
 /// この関数は、上部および下部アタッチメントがフィットするよう、自動的にアタッチメントのベースを伸縮させることにも使えます。
 ///
 /// 伸縮可能なグリフは限られており、どのグリフが伸縮可能かは使用する数式フォントに依存するため注意してください。
 /// ただし、この点に関して多くの数式フォントで違いはありません。
-=======
-/// Stretches a glyph.
-///
-/// This function can also be used to automatically stretch the base of an
-/// attachment, so that it fits the top and bottom attachments.
-///
-/// Note that only some glyphs can be stretched, and which ones can depend on
-/// the math font being used. However, most math fonts are the same in this
-/// regard.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 ///
 /// ```example
 /// $ H stretch(=)^"define" U + p V $
@@ -221,20 +139,11 @@ pub struct LimitsElem {
 /// ```
 #[elem(Mathy)]
 pub struct StretchElem {
-<<<<<<< HEAD
     /// 伸縮させるグリフ。
     #[required]
     pub body: Content,
 
     /// グリフおよびそのアタッチメントを基準とした伸縮の大きさ。
-=======
-    /// The glyph to stretch.
-    #[required]
-    pub body: Content,
-
-    /// The size to stretch to, relative to the maximum size of the glyph and
-    /// its attachments.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     #[default(Rel::one())]
     pub size: Rel<Length>,
 }
diff --git a/crates/typst-library/src/math/cancel.rs b/crates/typst-library/src/math/cancel.rs
index f3cb4cd8c5..a136d4c90e 100644
--- a/crates/typst-library/src/math/cancel.rs
+++ b/crates/typst-library/src/math/cancel.rs
@@ -3,19 +3,11 @@ use crate::layout::{Abs, Angle, Length, Ratio, Rel};
 use crate::math::Mathy;
 use crate::visualize::Stroke;
 
-<<<<<<< HEAD
 /// 数式の一部分上に対角線を表示。
 ///
 /// 項の除去を示すのによく使われます。
 ///
 /// # 例
-=======
-/// Displays a diagonal line over a part of an equation.
-///
-/// This is commonly used to show the elimination of a term.
-///
-/// # Example
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 /// ```example
 /// >>> #set page(width: 140pt)
 /// Here, we can simplify:
@@ -24,22 +16,12 @@ use crate::visualize::Stroke;
 /// ```
 #[elem(Mathy)]
 pub struct CancelElem {
-<<<<<<< HEAD
     /// 線が配置されるべきコンテンツ。
     #[required]
     pub body: Content,
 
     /// 「キャンセル」したい要素全体をまたぐ対角線を基準とした相対的な線の長さ。
     /// `{100%}`という値は、要素の対角線と正確に一致する長さになります。
-=======
-    /// The content over which the line should be placed.
-    #[required]
-    pub body: Content,
-
-    /// The length of the line, relative to the length of the diagonal spanning
-    /// the whole element being "cancelled". A value of `{100%}` would then have
-    /// the line span precisely the element's diagonal.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     ///
     /// ```example
     /// >>> #set page(width: 140pt)
@@ -49,14 +31,8 @@ pub struct CancelElem {
     #[default(Rel::new(Ratio::one(), Abs::pt(3.0).into()))]
     pub length: Rel<Length>,
 
-<<<<<<< HEAD
     /// 打ち消し線を（y軸に関して）反転させるべきかどうか。
     /// デフォルト角度設定では、反転により打ち消し線が右上ではなく左上を指すようになります。
-=======
-    /// Whether the cancel line should be inverted (flipped along the y-axis).
-    /// For the default angle setting, inverted means the cancel line
-    /// points to the top left instead of top right.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     ///
     /// ```example
     /// >>> #set page(width: 140pt)
@@ -66,13 +42,8 @@ pub struct CancelElem {
     #[default(false)]
     pub inverted: bool,
 
-<<<<<<< HEAD
     /// 要素上で交差する、相対する2つの打ち消し線を描画するかどうか。
     /// これは`inverted`を上書きします。
-=======
-    /// Whether two opposing cancel lines should be drawn, forming a cross over
-    /// the element. Overrides `inverted`.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     ///
     /// ```example
     /// >>> #set page(width: 140pt)
@@ -81,24 +52,12 @@ pub struct CancelElem {
     #[default(false)]
     pub cross: bool,
 
-<<<<<<< HEAD
     /// 打ち消し線をどれくらい回転させるか。
     ///
     /// - 角度が与えられた場合、y軸方向を0度として時計回りに与えられた角度だけ線が回転します。
     /// - `{auto}`の場合、デフォルトの角度を用いた線となります。すなわち、コンテンツのボックスの右上がりの対角線に沿うものになります。
     /// - `angle => angle`の形の関数が与えられた場合、y軸方向を0度として、その関数が返す角度で線が回転します。
     /// 関数は入力としてデフォルトの角度を受け取ります。
-=======
-    /// How much to rotate the cancel line.
-    ///
-    /// - If given an angle, the line is rotated by that angle clockwise with
-    ///   respect to the y-axis.
-    /// - If `{auto}`, the line assumes the default angle; that is, along the
-    ///   rising diagonal of the content box.
-    /// - If given a function `angle => angle`, the line is rotated, with
-    ///   respect to the y-axis, by the angle returned by that function. The
-    ///   function receives the default angle as its input.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     ///
     /// ```example
     /// >>> #set page(width: 140pt)
@@ -111,11 +70,7 @@ pub struct CancelElem {
     /// ```
     pub angle: Smart<CancelAngle>,
 
-<<<<<<< HEAD
     /// 打ち消し線の[ストローク]($stroke)をどうするか。
-=======
-    /// How to [stroke]($stroke) the cancel line.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     ///
     /// ```example
     /// >>> #set page(width: 140pt)
diff --git a/crates/typst-library/src/math/equation.rs b/crates/typst-library/src/math/equation.rs
index a2f641e9c7..46db04c6ea 100644
--- a/crates/typst-library/src/math/equation.rs
+++ b/crates/typst-library/src/math/equation.rs
@@ -18,7 +18,6 @@ use crate::math::MathSize;
 use crate::model::{Numbering, Outlinable, ParLine, Refable, Supplement};
 use crate::text::{FontFamily, FontList, FontWeight, LocalName, Locale, TextElem};
 
-<<<<<<< HEAD
 /// 数式。
 ///
 /// 数式は、テキスト内にインラインで表示でき、独立したブロックとしても表示できます。
@@ -26,15 +25,6 @@ use crate::text::{FontFamily, FontList, FontWeight, LocalName, Locale, TextElem}
 /// 開始ドル記号の直後と終了ドル記号の直前に少なくとも1つのスペースを挿入してください。
 ///
 /// # 例
-=======
-/// A mathematical equation.
-///
-/// Can be displayed inline with text or as a separate block. An equation
-/// becomes block-level through the presence of whitespace after the opening
-/// dollar sign and whitespace before the closing dollar sign.
-///
-/// # Example
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 /// ```example
 /// #set text(font: "New Computer Modern")
 ///
@@ -47,7 +37,6 @@ use crate::text::{FontFamily, FontList, FontWeight, LocalName, Locale, TextElem}
 /// $ sum_(k=1)^n k = (n(n+1)) / 2 $
 /// ```
 ///
-<<<<<<< HEAD
 /// デフォルトでは、ブロックレベルの数式はページをまたいで分割されません。
 /// これは`{show math.equation: set block(breakable: true)}`を使用して変更できます。
 ///
@@ -66,25 +55,6 @@ pub struct EquationElem {
     /// ブロックレベル数式への[番号付け]($numbering)方法。
     ///
     /// 1つの数値を受け取る[番号付けパターンまたは関数]($numbering)を受け入れます。
-=======
-/// By default, block-level equations will not break across pages. This can be
-/// changed through `{show math.equation: set block(breakable: true)}`.
-///
-/// # Syntax
-/// This function also has dedicated syntax: Write mathematical markup within
-/// dollar signs to create an equation. Starting and ending the equation with
-/// whitespace lifts it into a separate block that is centered horizontally.
-/// For more details about math syntax, see the
-/// [main math page]($category/math).
-#[elem(Locatable, Tagged, Synthesize, ShowSet, Count, LocalName, Refable, Outlinable)]
-pub struct EquationElem {
-    /// Whether the equation is displayed as a separate block.
-    #[default(false)]
-    pub block: bool,
-
-    /// How to number block-level equations. Accepts a
-    /// [numbering pattern or function]($numbering) taking a single number.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     ///
     /// ```example
     /// #set math.equation(numbering: "(1)")
@@ -97,21 +67,12 @@ pub struct EquationElem {
     /// ```
     pub numbering: Option<Numbering>,
 
-<<<<<<< HEAD
     /// 数式番号の配置。
     ///
     /// デフォルトでは、数式の配置は`{end + horizon}`です。
     /// 水平方向の成分には`{right}`、`{left}`、
     /// またはテキスト方向の`{start}`と`{end}`を使用できます。
     /// 垂直方向の成分には、`{top}`、`{horizon}`、または`{bottom}`を使用できます。
-=======
-    /// The alignment of the equation numbering.
-    ///
-    /// By default, the alignment is `{end + horizon}`. For the horizontal
-    /// component, you can use `{right}`, `{left}`, or `{start}` and `{end}`
-    /// of the text direction; for the vertical component, you can use
-    /// `{top}`, `{horizon}`, or `{bottom}`.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     ///
     /// ```example
     /// #set math.equation(numbering: "(1)", number-align: bottom)
@@ -123,21 +84,12 @@ pub struct EquationElem {
     #[default(SpecificAlignment::Both(OuterHAlignment::End, VAlignment::Horizon))]
     pub number_align: SpecificAlignment<OuterHAlignment, VAlignment>,
 
-<<<<<<< HEAD
     /// 数式に用いる補足語。
     ///
     /// 見出しを参照する際、補足語が参照番号の前に追加されます。
     ///
     /// 関数を指定した場合、参照された数式が引数として渡され、
     /// その関数は表示されるコンテンツを返す必要があります。
-=======
-    /// A supplement for the equation.
-    ///
-    /// For references to equations, this is added before the referenced number.
-    ///
-    /// If a function is specified, it is passed the referenced equation and
-    /// should return content.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     ///
     /// ```example
     /// #set math.equation(numbering: "(1)", supplement: [Eq.])
@@ -150,39 +102,22 @@ pub struct EquationElem {
     /// ```
     pub supplement: Smart<Option<Supplement>>,
 
-<<<<<<< HEAD
     /// 数式の別説明。
     ///
     /// 数式全体を自然言語で説明する必要があり、補助技術向けに利用されます。
     /// 詳細は[アクセシビリティガイドのテキスト表現]($guides/accessibility/#textual-representations)
     /// を参照してください。
-=======
-    /// An alternative description of the mathematical equation.
-    ///
-    /// This should describe the full equation in natural language and will be
-    /// made available to Assistive Technology. You can learn more in the
-    /// [Textual Representations section of the Accessibility
-    /// Guide]($guides/accessibility/#textual-representations).
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     ///
     /// ```example
     /// #math.equation(
     ///   alt: "integral from 1 to infinity of a x squared plus b with respect to x",
-<<<<<<< HEAD
-    ///   $ integral_1^oo a x^2 + b med d x $,
-=======
     ///   block: true,
     ///   $ integral_1^oo a x^2 + b dif x $,
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     /// )
     /// ```
     pub alt: Option<EcoString>,
 
-<<<<<<< HEAD
     /// 数式のコンテンツ。
-=======
-    /// The contents of the equation.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     #[required]
     pub body: Content,
 
diff --git a/crates/typst-library/src/math/frac.rs b/crates/typst-library/src/math/frac.rs
index 389261d768..feef5893c5 100644
--- a/crates/typst-library/src/math/frac.rs
+++ b/crates/typst-library/src/math/frac.rs
@@ -4,21 +4,14 @@ use crate::diag::bail;
 use crate::foundations::{Cast, Content, Value, elem};
 use crate::math::Mathy;
 
-<<<<<<< HEAD
 /// 分数。
 ///
 /// # 例
-=======
-/// A mathematical fraction.
-///
-/// # Example
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 /// ```example
 /// $ 1/2 < (x+1)/2 $
 /// $ ((x+1)) / 2 = frac(a, b) $
 /// ```
 ///
-<<<<<<< HEAD
 /// # 構文
 /// この関数には専用の構文もあります。
 /// 隣接する式をスラッシュで区切ると、分数になります。
@@ -37,45 +30,17 @@ pub struct FracElem {
     /// 分数のレイアウト方法。
     ///
     /// ```example:"スタイル"
-=======
-/// # Syntax
-/// This function also has dedicated syntax: Use a slash to turn neighbouring
-/// expressions into a fraction. Multiple atoms can be grouped into a single
-/// expression using round grouping parentheses. Such parentheses are removed
-/// from the output, but you can nest multiple to force them.
-#[elem(title = "Fraction", Mathy)]
-pub struct FracElem {
-    /// The fraction's numerator.
-    #[required]
-    pub num: Content,
-
-    /// The fraction's denominator.
-    #[required]
-    pub denom: Content,
-
-    /// How the fraction should be laid out.
-    ///
-    /// ```example:"Styles"
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     /// $ frac(x, y, style: "vertical") $
     /// $ frac(x, y, style: "skewed") $
     /// $ frac(x, y, style: "horizontal") $
     /// ```
     ///
-<<<<<<< HEAD
     /// ```example:"デフォルトの設定"
-=======
-    /// ```example:"Setting the default"
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     /// #set math.frac(style: "skewed")
     /// $ a / b $
     /// ```
     ///
-<<<<<<< HEAD
     /// ```example:"グループ化括弧の扱い"
-=======
-    /// ```example:"Handling of grouping parentheses"
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     /// // Grouping parentheses are removed.
     /// #set math.frac(style: "vertical")
     /// $ (a + b) / b $
@@ -89,11 +54,7 @@ pub struct FracElem {
     /// $ (a + b) / b $
     /// ```
     ///
-<<<<<<< HEAD
     /// ```example:"インライン数式とブロック数式でのスタイル"
-=======
-    /// ```example:"Different styles in inline vs block equations"
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     /// // This changes the style for inline equations only.
     /// #show math.equation.where(block: false): set math.frac(style: "horizontal")
     ///
@@ -121,7 +82,6 @@ pub struct FracElem {
 /// Fraction style
 #[derive(Debug, Default, Copy, Clone, Eq, PartialEq, Hash, Cast)]
 pub enum FracStyle {
-<<<<<<< HEAD
     /// 分子と分母を上下に配置し、横棒で区切ります。
     #[default]
     Vertical,
@@ -134,40 +94,17 @@ pub enum FracStyle {
 /// 二項係数。
 ///
 /// # 例
-=======
-    /// Stacked numerator and denominator with a bar.
-    #[default]
-    Vertical,
-    /// Numerator and denominator separated by a slash.
-    Skewed,
-    /// Numerator and denominator placed inline and parentheses are not
-    /// absorbed.
-    Horizontal,
-}
-
-/// A binomial expression.
-///
-/// # Example
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 /// ```example
 /// $ binom(n, k) $
 /// $ binom(n, k_1, k_2, k_3, ..., k_m) $
 /// ```
 #[elem(title = "Binomial", Mathy)]
 pub struct BinomElem {
-<<<<<<< HEAD
     /// 二項係数の上側の数。
     #[required]
     pub upper: Content,
 
     /// 二項係数の下側の数。
-=======
-    /// The binomial's upper index.
-    #[required]
-    pub upper: Content,
-
-    /// The binomial's lower index.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     #[required]
     #[variadic]
     #[parse(
diff --git a/crates/typst-library/src/math/lr.rs b/crates/typst-library/src/math/lr.rs
index 8501c616f3..88900a861a 100644
--- a/crates/typst-library/src/math/lr.rs
+++ b/crates/typst-library/src/math/lr.rs
@@ -2,7 +2,6 @@ use crate::foundations::{Content, NativeElement, SymbolElem, elem, func};
 use crate::layout::{Length, Rel};
 use crate::math::Mathy;
 
-<<<<<<< HEAD
 /// 区切り文字の拡大縮小。
 ///
 /// 対応が取れている区切り文字はデフォルトで拡大縮小しますが、これは対応が取れていない区切り文字を拡大縮小させたり、区切り文字の拡大縮小をより正確に制御するのに便利です。
@@ -13,19 +12,6 @@ pub struct LrElem {
     pub size: Rel<Length>,
 
     /// 区切り文字を含めた、区切られるコンテンツ。
-=======
-/// Scales delimiters.
-///
-/// While matched delimiters scale by default, this can be used to scale
-/// unmatched delimiters and to control the delimiter scaling more precisely.
-#[elem(title = "Left/Right", Mathy)]
-pub struct LrElem {
-    /// The size of the brackets, relative to the height of the wrapped content.
-    #[default(Rel::one())]
-    pub size: Rel<Length>,
-
-    /// The delimited content, including the delimiters.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     #[required]
     #[parse(
         let mut arguments = args.all::<Content>()?.into_iter();
@@ -36,156 +22,93 @@ pub struct LrElem {
     pub body: Content,
 }
 
-<<<<<<< HEAD
 /// 最も近くで囲んでいる`{lr()}`グループに対して、垂直方向に区切り文字を拡大縮小します。
-=======
-/// Scales delimiters vertically to the nearest surrounding `{lr()}` group.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 ///
 /// ```example
 /// $ { x mid(|) sum_(i=1)^n w_i|f_i (x)| < 1 } $
 /// ```
 #[elem(Mathy)]
 pub struct MidElem {
-<<<<<<< HEAD
     /// 拡大縮小させるコンテンツ。
-=======
-    /// The content to be scaled.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     #[required]
     pub body: Content,
 }
 
-<<<<<<< HEAD
 /// 式に床関数を作用させます。
-=======
-/// Floors an expression.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 ///
 /// ```example
 /// $ floor(x/2) $
 /// ```
 #[func]
 pub fn floor(
-<<<<<<< HEAD
     /// ラップしたコンテンツの高さを基準とした括弧の大きさ。
     #[named]
     size: Option<Rel<Length>>,
     /// 床関数を作用させる式。
-=======
-    /// The size of the brackets, relative to the height of the wrapped content.
-    #[named]
-    size: Option<Rel<Length>>,
-    /// The expression to floor.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     body: Content,
 ) -> Content {
     delimited(body, '⌊', '⌋', size)
 }
 
-<<<<<<< HEAD
 /// 式に天井関数を作用させます。
-=======
-/// Ceils an expression.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 ///
 /// ```example
 /// $ ceil(x/2) $
 /// ```
 #[func]
 pub fn ceil(
-<<<<<<< HEAD
     /// ラップしたコンテンツの高さを基準とした括弧の大きさ。
     #[named]
     size: Option<Rel<Length>>,
     /// 天井関数を作用させる式。
-=======
-    /// The size of the brackets, relative to the height of the wrapped content.
-    #[named]
-    size: Option<Rel<Length>>,
-    /// The expression to ceil.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     body: Content,
 ) -> Content {
     delimited(body, '⌈', '⌉', size)
 }
 
-<<<<<<< HEAD
 /// 式を丸めます。
-=======
-/// Rounds an expression.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 ///
 /// ```example
 /// $ round(x/2) $
 /// ```
 #[func]
 pub fn round(
-<<<<<<< HEAD
     /// ラップしたコンテンツの高さを基準とした括弧の大きさ。
     #[named]
     size: Option<Rel<Length>>,
     /// 丸める式。
-=======
-    /// The size of the brackets, relative to the height of the wrapped content.
-    #[named]
-    size: Option<Rel<Length>>,
-    /// The expression to round.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     body: Content,
 ) -> Content {
     delimited(body, '⌊', '⌉', size)
 }
 
-<<<<<<< HEAD
 /// 式の絶対値を取ります。
-=======
-/// Takes the absolute value of an expression.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 ///
 /// ```example
 /// $ abs(x/2) $
 /// ```
 #[func]
 pub fn abs(
-<<<<<<< HEAD
     /// ラップしたコンテンツの高さを基準とした括弧の大きさ。
     #[named]
     size: Option<Rel<Length>>,
     /// 絶対値を取る式。
-=======
-    /// The size of the brackets, relative to the height of the wrapped content.
-    #[named]
-    size: Option<Rel<Length>>,
-    /// The expression to take the absolute value of.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     body: Content,
 ) -> Content {
     delimited(body, '|', '|', size)
 }
 
-<<<<<<< HEAD
 /// 式のノルムを取ります。
-=======
-/// Takes the norm of an expression.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 ///
 /// ```example
 /// $ norm(x/2) $
 /// ```
 #[func]
 pub fn norm(
-<<<<<<< HEAD
     /// ラップしたコンテンツの高さを基準とした括弧の大きさ。
     #[named]
     size: Option<Rel<Length>>,
     /// ノルムを取る式。
-=======
-    /// The size of the brackets, relative to the height of the wrapped content.
-    #[named]
-    size: Option<Rel<Length>>,
-    /// The expression to take the norm of.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     body: Content,
 ) -> Content {
     delimited(body, '‖', '‖', size)
diff --git a/crates/typst-library/src/math/matrix.rs b/crates/typst-library/src/math/matrix.rs
index e51f0e4448..edb89d99c5 100644
--- a/crates/typst-library/src/math/matrix.rs
+++ b/crates/typst-library/src/math/matrix.rs
@@ -15,7 +15,6 @@ use crate::visualize::Stroke;
 const DEFAULT_ROW_GAP: Em = Em::new(0.2);
 const DEFAULT_COL_GAP: Em = Em::new(0.5);
 
-<<<<<<< HEAD
 /// 列ベクトル。
 ///
 /// ベクトルの要素内のコンテンツは[`align`]($math.vec.align)パラメーターか`&`記号を用いて配置できます。
@@ -24,36 +23,16 @@ const DEFAULT_COL_GAP: Em = Em::new(0.5);
 /// ベクトルを表す記号の組版には、[`arrow`]($math.accent)や[`bold`]($math.bold)がよく用いられます。
 ///
 /// # 例
-=======
-/// A column vector.
-///
-/// Content in the vector's elements can be aligned with the
-/// [`align`]($math.vec.align) parameter, or the `&` symbol.
-///
-/// This function is for typesetting vector components. To typeset a symbol that
-/// represents a vector, [`arrow`]($math.accent) and [`bold`]($math.bold) are
-/// commonly used.
-///
-/// # Example
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 /// ```example
 /// $ vec(a, b, c) dot vec(1, 2, 3)
 ///     = a + 2b + 3c $
 /// ```
 #[elem(title = "Vector", Mathy)]
 pub struct VecElem {
-<<<<<<< HEAD
     /// 用いる区切り文字。
     ///
     /// 単一の文字で左区切り文字を指定する場合、右区切り文字は自動的に推論されます。
     /// それ以外の場合は、左区切り文字と右区切り文字を含む配列を指定します。
-=======
-    /// The delimiter to use.
-    ///
-    /// Can be a single character specifying the left delimiter, in which case
-    /// the right delimiter is inferred. Otherwise, can be an array containing a
-    /// left and a right delimiter.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     ///
     /// ```example
     /// #set math.vec(delim: "[")
@@ -62,11 +41,7 @@ pub struct VecElem {
     #[default(DelimiterPair::PAREN)]
     pub delim: DelimiterPair,
 
-<<<<<<< HEAD
     /// 各要素の水平方向の配置。
-=======
-    /// The horizontal alignment that each element should have.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     ///
     /// ```example
     /// #set math.vec(align: right)
@@ -75,11 +50,7 @@ pub struct VecElem {
     #[default(HAlignment::Center)]
     pub align: HAlignment,
 
-<<<<<<< HEAD
     /// 要素間の間隔。
-=======
-    /// The gap between elements.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     ///
     /// ```example
     /// #set math.vec(gap: 1em)
@@ -88,16 +59,11 @@ pub struct VecElem {
     #[default(DEFAULT_ROW_GAP.into())]
     pub gap: Rel<Length>,
 
-<<<<<<< HEAD
     /// ベクトルの要素。
-=======
-    /// The elements of the vector.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     #[variadic]
     pub children: Vec<Content>,
 }
 
-<<<<<<< HEAD
 /// 行列。
 ///
 /// 行内の要素はカンマで区切り、行自身はセミコロンで区切らなければなりません。
@@ -107,21 +73,6 @@ pub struct VecElem {
 /// セル内のコンテンツは[`align`]($math.mat.align)パラメーターを用いて配置できます。 また、同じ行にあるコンテンツは`&`記号を用いて配置できます。
 ///
 /// # 例
-=======
-/// A matrix.
-///
-/// The elements of a row should be separated by commas, while the rows
-/// themselves should be separated by semicolons. The semicolon syntax merges
-/// preceding arguments separated by commas into an array. You can also use this
-/// special syntax of math function calls to define custom functions that take
-/// 2D data.
-///
-/// Content in cells can be aligned with the [`align`]($math.mat.align)
-/// parameter, or content in cells that are in the same row can be aligned with
-/// the `&` symbol.
-///
-/// # Example
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 /// ```example
 /// $ mat(
 ///   1, 2, ..., 10;
@@ -132,18 +83,10 @@ pub struct VecElem {
 /// ```
 #[elem(title = "Matrix", Mathy)]
 pub struct MatElem {
-<<<<<<< HEAD
     /// 用いる区切り文字。
     ///
     /// 単一の文字で左区切り文字を指定する場合、右区切り文字は自動的に推論されます。
     /// それ以外の場合は、左区切り文字と右区切り文字を含む配列を指定します。
-=======
-    /// The delimiter to use.
-    ///
-    /// Can be a single character specifying the left delimiter, in which case
-    /// the right delimiter is inferred. Otherwise, can be an array containing a
-    /// left and a right delimiter.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     ///
     /// ```example
     /// #set math.mat(delim: "[")
@@ -152,11 +95,7 @@ pub struct MatElem {
     #[default(DelimiterPair::PAREN)]
     pub delim: DelimiterPair,
 
-<<<<<<< HEAD
     /// 各セルの水平方向の配置。
-=======
-    /// The horizontal alignment that each cell should have.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     ///
     /// ```example
     /// #set math.mat(align: right)
@@ -165,7 +104,6 @@ pub struct MatElem {
     #[default(HAlignment::Center)]
     pub align: HAlignment,
 
-<<<<<<< HEAD
     /// 行列内に補助線を描画。
     ///
     /// - `{none}`: 線は描画されません。
@@ -184,28 +122,6 @@ pub struct MatElem {
     ///     単一の数値を指定する場合と同様に、負数の場合は末尾から数え始めます。
     ///   - `stroke`: 線の[ストローク]($stroke)。
     ///     `{auto}`が指定された場合、0.05emの太さで四角い線端になります。
-=======
-    /// Draws augmentation lines in a matrix.
-    ///
-    /// - `{none}`: No lines are drawn.
-    /// - A single number: A vertical augmentation line is drawn
-    ///   after the specified column number. Negative numbers start from the end.
-    /// - A dictionary: With a dictionary, multiple augmentation lines can be
-    ///   drawn both horizontally and vertically. Additionally, the style of the
-    ///   lines can be set. The dictionary can contain the following keys:
-    ///   - `hline`: The offsets at which horizontal lines should be drawn.
-    ///     For example, an offset of `2` would result in a horizontal line
-    ///     being drawn after the second row of the matrix. Accepts either an
-    ///     integer for a single line, or an array of integers
-    ///     for multiple lines. Like for a single number, negative numbers start from the end.
-    ///   - `vline`: The offsets at which vertical lines should be drawn.
-    ///     For example, an offset of `2` would result in a vertical line being
-    ///     drawn after the second column of the matrix. Accepts either an
-    ///     integer for a single line, or an array of integers
-    ///     for multiple lines. Like for a single number, negative numbers start from the end.
-    ///   - `stroke`: How to [stroke]($stroke) the line. If set to `{auto}`,
-    ///     takes on a thickness of 0.05 em and square line caps.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     ///
     /// ```example:"Basic usage"
     /// $ mat(1, 0, 1; 0, 1, 2; augment: #2) $
@@ -219,15 +135,9 @@ pub struct MatElem {
     #[fold]
     pub augment: Option<Augment>,
 
-<<<<<<< HEAD
     /// 行間と列間の間隔。
     ///
     /// これは`row-gap`と`column-gap`を同じ値で設定する省略記法です。
-=======
-    /// The gap between rows and columns.
-    ///
-    /// This is a shorthand to set `row-gap` and `column-gap` to the same value.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     ///
     /// ```example
     /// #set math.mat(gap: 1em)
@@ -236,11 +146,7 @@ pub struct MatElem {
     #[external]
     pub gap: Rel<Length>,
 
-<<<<<<< HEAD
     /// 行間の間隔。
-=======
-    /// The gap between rows.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     ///
     /// ```example
     /// #set math.mat(row-gap: 1em)
@@ -253,11 +159,7 @@ pub struct MatElem {
     #[default(DEFAULT_ROW_GAP.into())]
     pub row_gap: Rel<Length>,
 
-<<<<<<< HEAD
     /// 列間の間隔。
-=======
-    /// The gap between columns.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     ///
     /// ```example
     /// #set math.mat(column-gap: 1em)
@@ -267,11 +169,7 @@ pub struct MatElem {
     #[default(DEFAULT_COL_GAP.into())]
     pub column_gap: Rel<Length>,
 
-<<<<<<< HEAD
     /// 行列の各行を要素とする配列の配列。
-=======
-    /// An array of arrays with the rows of the matrix.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     ///
     /// ```example
     /// #let data = ((1, 2, 3), (4, 5, 6))
@@ -306,19 +204,11 @@ pub struct MatElem {
     pub rows: Vec<Vec<Content>>,
 }
 
-<<<<<<< HEAD
 /// 場合分け。
 ///
 /// `&`記号を用いると異なる分岐に属するコンテンツを整列できます。
 ///
 /// # 例
-=======
-/// A case distinction.
-///
-/// Content across different branches can be aligned with the `&` symbol.
-///
-/// # Example
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 /// ```example
 /// $ f(x, y) := cases(
 ///   1 "if" (x dot y)/2 <= 0,
@@ -329,18 +219,10 @@ pub struct MatElem {
 /// ```
 #[elem(Mathy)]
 pub struct CasesElem {
-<<<<<<< HEAD
     /// 使用する区切り文字。
     ///
     /// 単一の文字で左区切り文字を指定する場合、右区切り文字は自動的に推論されます。
     /// それ以外の場合は、左区切り文字と右区切り文字を含む配列を指定します。
-=======
-    /// The delimiter to use.
-    ///
-    /// Can be a single character specifying the left delimiter, in which case
-    /// the right delimiter is inferred. Otherwise, can be an array containing a
-    /// left and a right delimiter.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     ///
     /// ```example
     /// #set math.cases(delim: "[")
@@ -349,11 +231,7 @@ pub struct CasesElem {
     #[default(DelimiterPair::BRACE)]
     pub delim: DelimiterPair,
 
-<<<<<<< HEAD
     /// 場合分けの向きを反転させるかどうか。
-=======
-    /// Whether the direction of cases should be reversed.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     ///
     /// ```example
     /// #set math.cases(reverse: true)
@@ -362,11 +240,7 @@ pub struct CasesElem {
     #[default(false)]
     pub reverse: bool,
 
-<<<<<<< HEAD
     /// 分岐間の間隔。
-=======
-    /// The gap between branches.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     ///
     /// ```example
     /// #set math.cases(gap: 1em)
@@ -375,11 +249,7 @@ pub struct CasesElem {
     #[default(DEFAULT_ROW_GAP.into())]
     pub gap: Rel<Length>,
 
-<<<<<<< HEAD
     /// 場合分けの各分岐を表す子要素。
-=======
-    /// The branches of the case distinction.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     #[variadic]
     pub children: Vec<Content>,
 }
diff --git a/crates/typst-library/src/math/mod.rs b/crates/typst-library/src/math/mod.rs
index 1599718a51..d5bc4a9b57 100644
--- a/crates/typst-library/src/math/mod.rs
+++ b/crates/typst-library/src/math/mod.rs
@@ -120,7 +120,6 @@ impl AlignPointElem {
     }
 }
 
-<<<<<<< HEAD
 /// 特定の数式クラスを強制的に適用。
 ///
 /// これは、特定の記号を異なるクラスのように扱うのに便利です。例えば、ある記号を関係のように振る舞わせられます。
@@ -128,17 +127,6 @@ impl AlignPointElem {
 /// 添え字の取り付け方は[`{limits}`](math.limits)や[`{scripts}`](math.scripts)を使って常に上書きできることに注意してください。
 ///
 /// # 例
-=======
-/// Forced use of a certain math class.
-///
-/// This is useful to treat certain symbols as if they were of a different
-/// class, e.g. to make a symbol behave like a relation. The class of a symbol
-/// defines the way it is laid out, including spacing around it, and how its
-/// scripts are attached by default. Note that the latter can always be
-/// overridden using [`{limits}`](math.limits) and [`{scripts}`](math.scripts).
-///
-/// # Example
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 /// ```example
 /// #let loves = math.class(
 ///   "relation",
@@ -149,19 +137,11 @@ impl AlignPointElem {
 /// ```
 #[elem(Mathy)]
 pub struct ClassElem {
-<<<<<<< HEAD
     /// コンテンツに適用するクラス。
     #[required]
     pub class: MathClass,
 
     /// クラスを適用するコンテンツ。
-=======
-    /// The class to apply to the content.
-    #[required]
-    pub class: MathClass,
-
-    /// The content to which the class is applied.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     #[required]
     pub body: Content,
 }
diff --git a/crates/typst-library/src/math/op.rs b/crates/typst-library/src/math/op.rs
index 3498d9cc2c..02c1d1ad1e 100644
--- a/crates/typst-library/src/math/op.rs
+++ b/crates/typst-library/src/math/op.rs
@@ -5,22 +5,15 @@ use crate::layout::HElem;
 use crate::math::{Mathy, THIN, upright};
 use crate::text::TextElem;
 
-<<<<<<< HEAD
 /// 数式中のテキスト演算子。
 ///
 /// # 例
-=======
-/// A text operator in an equation.
-///
-/// # Example
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 /// ```example
 /// $ tan x = (sin x)/(cos x) $
 /// $ op("custom",
 ///      limits: #true)_(n->oo) n $
 /// ```
 ///
-<<<<<<< HEAD
 /// # 定義済み演算子 { #predefined }
 /// Typstではあらかじめ以下の演算子が定義されています。
 /// `arccos`、`arcsin`、`arctan`、`arg`、`cos`、`cosh`、`cot`、`coth`、`csc`、`csch`、`ctg`、`deg`、`det`、`dim`、`exp`、`gcd`、`lcm`、`hom`、`id`、`im`、`inf`、`ker`、`lg`、`lim`、`liminf`、`limsup`、`ln`、`log`、`max`、`min`、`mod`、`Pr`、`sec`、`sech`、`sin`、`sinc`、`sinh`、`sup`、`tan`、`tanh`、`tg`、`tr`。
@@ -31,21 +24,6 @@ pub struct OpElem {
     pub text: Content,
 
     /// ディスプレイモードのときに演算子のアタッチメントをlimitsのように表示するかどうか。
-=======
-/// # Predefined Operators { #predefined }
-/// Typst predefines the operators `arccos`, `arcsin`, `arctan`, `arg`, `cos`,
-/// `cosh`, `cot`, `coth`, `csc`, `csch`, `ctg`, `deg`, `det`, `dim`, `exp`,
-/// `gcd`, `lcm`, `hom`, `id`, `im`, `inf`, `ker`, `lg`, `lim`, `liminf`,
-/// `limsup`, `ln`, `log`, `max`, `min`, `mod`, `Pr`, `sec`, `sech`, `sin`,
-/// `sinc`, `sinh`, `sup`, `tan`, `tanh`, `tg` and `tr`.
-#[elem(title = "Text Operator", Mathy)]
-pub struct OpElem {
-    /// The operator's text.
-    #[required]
-    pub text: Content,
-
-    /// Whether the operator should show attachments as limits in display mode.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     #[default(false)]
     pub limits: bool,
 }
diff --git a/crates/typst-library/src/math/root.rs b/crates/typst-library/src/math/root.rs
index 62a81a72b8..8ad4207ba7 100644
--- a/crates/typst-library/src/math/root.rs
+++ b/crates/typst-library/src/math/root.rs
@@ -3,11 +3,7 @@ use typst_syntax::Span;
 use crate::foundations::{Content, NativeElement, elem, func};
 use crate::math::Mathy;
 
-<<<<<<< HEAD
 /// 平方根。
-=======
-/// A square root.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 ///
 /// ```example
 /// $ sqrt(3 - 2 sqrt(2)) = sqrt(2) - 1 $
@@ -15,40 +11,24 @@ use crate::math::Mathy;
 #[func(title = "Square Root")]
 pub fn sqrt(
     span: Span,
-<<<<<<< HEAD
     /// 平方根を取る対象の式。
-=======
-    /// The expression to take the square root of.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     radicand: Content,
 ) -> Content {
     RootElem::new(radicand).pack().spanned(span)
 }
 
-<<<<<<< HEAD
 /// 冪根。
-=======
-/// A general root.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 ///
 /// ```example
 /// $ root(3, x) $
 /// ```
 #[elem(Mathy)]
 pub struct RootElem {
-<<<<<<< HEAD
     /// 被開方数の何乗根を取るか。
     #[positional]
     pub index: Option<Content>,
 
     /// 根を取る対象の式。
-=======
-    /// Which root of the radicand to take.
-    #[positional]
-    pub index: Option<Content>,
-
-    /// The expression to take the root of.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     #[required]
     pub radicand: Content,
 }
diff --git a/crates/typst-library/src/math/style.rs b/crates/typst-library/src/math/style.rs
index 16e84f3fe9..e4740fc31c 100644
--- a/crates/typst-library/src/math/style.rs
+++ b/crates/typst-library/src/math/style.rs
@@ -3,149 +3,90 @@ use codex::styling::MathVariant;
 use crate::foundations::{Cast, Content, func};
 use crate::math::EquationElem;
 
-<<<<<<< HEAD
 /// 数式中の太字フォントスタイル。
-=======
-/// Bold font style in math.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 ///
 /// ```example
 /// $ bold(A) := B^+ $
 /// ```
 #[func(keywords = ["mathbf"])]
 pub fn bold(
-<<<<<<< HEAD
     /// スタイルを適用するコンテンツ。
-=======
-    /// The content to style.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     body: Content,
 ) -> Content {
     body.set(EquationElem::bold, true)
 }
 
-<<<<<<< HEAD
 /// 数式中の立体（非斜体）フォントスタイル。
-=======
-/// Upright (non-italic) font style in math.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 ///
 /// ```example
 /// $ upright(A) != A $
 /// ```
 #[func(keywords = ["mathup"])]
 pub fn upright(
-<<<<<<< HEAD
     /// スタイルを適用するコンテンツ。
-=======
-    /// The content to style.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     body: Content,
 ) -> Content {
     body.set(EquationElem::italic, Some(false))
 }
 
-<<<<<<< HEAD
 /// 数式中の斜体フォントスタイル。
 ///
 /// これがローマ字とギリシャ文字の小文字のデフォルトです。
 #[func(keywords = ["mathit"])]
 pub fn italic(
     /// スタイルを適用するコンテンツ。
-=======
-/// Italic font style in math.
-///
-/// For roman letters and greek lowercase letters, this is already the default.
-#[func(keywords = ["mathit"])]
-pub fn italic(
-    /// The content to style.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     body: Content,
 ) -> Content {
     body.set(EquationElem::italic, Some(true))
 }
 
-<<<<<<< HEAD
 /// 数式中のセリフ（ローマン）フォントスタイル。
 ///
 /// これがデフォルトです。
 #[func(keywords = ["mathrm"])]
 pub fn serif(
     /// スタイルを適用するコンテンツ。
-=======
-/// Serif (roman) font style in math.
-///
-/// This is already the default.
-#[func(keywords = ["mathrm"])]
-pub fn serif(
-    /// The content to style.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     body: Content,
 ) -> Content {
     body.set(EquationElem::variant, Some(MathVariant::Plain))
 }
 
-<<<<<<< HEAD
 /// 数式中のサンセリフフォントスタイル。
-=======
-/// Sans-serif font style in math.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 ///
 /// ```example
 /// $ sans(A B C) $
 /// ```
 #[func(title = "Sans Serif", keywords = ["mathsf"])]
 pub fn sans(
-<<<<<<< HEAD
     /// スタイルを適用するコンテンツ。
-=======
-    /// The content to style.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     body: Content,
 ) -> Content {
     body.set(EquationElem::variant, Some(MathVariant::SansSerif))
 }
 
-<<<<<<< HEAD
 /// 数式中のカリグラフィーフォントスタイル。
-=======
-/// Calligraphic (chancery) font style in math.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 ///
 /// ```example
 /// Let $cal(P)$ be the set of ...
 /// ```
 ///
-<<<<<<< HEAD
 /// これは大半の数式フォントにおけるデフォルトのカリグラフィー／スクリプトスタイルです。
 /// もう一方のスタイル（roundhand）の指定方法については[`scr`]($math.scr)を参照してください。
 #[func(title = "Calligraphic", keywords = ["mathcal", "chancery"])]
 pub fn cal(
     /// スタイルを適用するコンテンツ。
-=======
-/// This is the default calligraphic/script style for most math fonts. See
-/// [`scr`]($math.scr) for more on how to get the other style (roundhand).
-#[func(title = "Calligraphic", keywords = ["mathcal", "chancery"])]
-pub fn cal(
-    /// The content to style.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     body: Content,
 ) -> Content {
     body.set(EquationElem::variant, Some(MathVariant::Chancery))
 }
 
-<<<<<<< HEAD
 /// 数式中のスクリプト（roundhand）フォントスタイル。
-=======
-/// Script (roundhand) font style in math.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 ///
 /// ```example
 /// $scr(L)$ is not the set of linear
 /// maps $cal(L)$.
 /// ```
 ///
-<<<<<<< HEAD
 /// フォントが`cal`と`scr`を区別できるようにする方法は2つあります。
 /// 1つはUnicodeの字形指示列を用いる方法です。
 /// これはTypstでそのまま動作しますが、現時点でこの方式をサポートする数式フォントはわずかです。
@@ -155,19 +96,6 @@ pub fn cal(
 /// 以下の例のように独自の`scr`関数を定義するとTypstで使用できます。
 ///
 /// ```example:"スタイリスティックセット1による再現"
-=======
-/// There are two ways that fonts can support differentiating `cal` and `scr`.
-/// The first is using Unicode variation sequences. This works out of the box
-/// in Typst, however only a few math fonts currently support this.
-///
-/// The other way is using [font features]($text.features). For example, the
-/// roundhand style might be available in a font through the
-/// _[stylistic set]($text.stylistic-set) 1_ (`ss01`) feature. To use it in
-/// Typst, you could then define your own version of `scr` like in the example
-/// below.
-///
-/// ```example:"Recreation using stylistic set 1"
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 /// #let scr(it) = text(
 ///   stylistic-set: 1,
 ///   $cal(it)$,
@@ -177,68 +105,41 @@ pub fn cal(
 /// ```
 #[func(title = "Script Style", keywords = ["mathscr", "roundhand"])]
 pub fn scr(
-<<<<<<< HEAD
     /// スタイルを適用するコンテンツ。
-=======
-    /// The content to style.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     body: Content,
 ) -> Content {
     body.set(EquationElem::variant, Some(MathVariant::Roundhand))
 }
 
-<<<<<<< HEAD
 /// 数式中のフラクトゥールフォントスタイル。
-=======
-/// Fraktur font style in math.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 ///
 /// ```example
 /// $ frak(P) $
 /// ```
 #[func(title = "Fraktur", keywords = ["mathfrak"])]
 pub fn frak(
-<<<<<<< HEAD
     /// スタイルを適用するコンテンツ。
-=======
-    /// The content to style.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     body: Content,
 ) -> Content {
     body.set(EquationElem::variant, Some(MathVariant::Fraktur))
 }
 
-<<<<<<< HEAD
 /// 数式中の等幅フォントスタイル。
-=======
-/// Monospace font style in math.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 ///
 /// ```example
 /// $ mono(x + y = z) $
 /// ```
 #[func(title = "Monospace", keywords = ["mathtt"])]
 pub fn mono(
-<<<<<<< HEAD
     /// スタイルを適用するコンテンツ。
-=======
-    /// The content to style.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     body: Content,
 ) -> Content {
     body.set(EquationElem::variant, Some(MathVariant::Monospace))
 }
 
-<<<<<<< HEAD
 /// 数式中の黒板太字（double-struck）フォントスタイル。
 ///
 /// 大文字のラテン文字では、黒板太字は、[symbols]($category/symbols/sym)にあるように、`NN`や`RR`のような形式でも使用できます。
-=======
-/// Blackboard bold (double-struck) font style in math.
-///
-/// For uppercase latin letters, blackboard bold is additionally available
-/// through [symbols]($category/symbols/sym) of the form `NN` and `RR`.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 ///
 /// ```example
 /// $ bb(b) $
@@ -247,41 +148,23 @@ pub fn mono(
 /// ```
 #[func(title = "Blackboard Bold", keywords = ["mathbb"])]
 pub fn bb(
-<<<<<<< HEAD
     /// スタイルを適用するコンテンツ。
-=======
-    /// The content to style.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     body: Content,
 ) -> Content {
     body.set(EquationElem::variant, Some(MathVariant::DoubleStruck))
 }
 
-<<<<<<< HEAD
 /// 数式中でディスプレイスタイルを強制します。
 ///
 /// これはブロック数式における標準サイズです。
-=======
-/// Forced display style in math.
-///
-/// This is the normal size for block equations.
-///
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 /// ```example
 /// $sum_i x_i/2 = display(sum_i x_i/2)$
 /// ```
 #[func(title = "Display Size", keywords = ["displaystyle"])]
 pub fn display(
-<<<<<<< HEAD
     /// 大きさを指定したいコンテンツ。
     body: Content,
     /// 通常の下付き文字や上付き文字のように、指数に高さ制限を課すかどうか。
-=======
-    /// The content to size.
-    body: Content,
-    /// Whether to impose a height restriction for exponents, like regular sub-
-    /// and superscripts do.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     #[named]
     #[default(false)]
     cramped: bool,
@@ -290,15 +173,9 @@ pub fn display(
         .set(EquationElem::cramped, cramped)
 }
 
-<<<<<<< HEAD
 /// 数式中でインライン（テキスト）スタイルを強制します。
 ///
 /// これはインライン数式における標準サイズです。
-=======
-/// Forced inline (text) style in math.
-///
-/// This is the normal size for inline equations.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 ///
 /// ```example
 /// $ sum_i x_i/2
@@ -306,16 +183,9 @@ pub fn display(
 /// ```
 #[func(title = "Inline Size", keywords = ["textstyle"])]
 pub fn inline(
-<<<<<<< HEAD
     /// 大きさを指定したいコンテンツ。
     body: Content,
     /// 通常の下付き文字や上付き文字のように、指数に高さ制限を課すかどうか。
-=======
-    /// The content to size.
-    body: Content,
-    /// Whether to impose a height restriction for exponents, like regular sub-
-    /// and superscripts do.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     #[named]
     #[default(false)]
     cramped: bool,
@@ -324,31 +194,18 @@ pub fn inline(
         .set(EquationElem::cramped, cramped)
 }
 
-<<<<<<< HEAD
 /// 数式中でスクリプトスタイルを強制します。
 ///
 /// これは、冪乗、下付き文字、上付き文字で使用される小さいサイズです。
-=======
-/// Forced script style in math.
-///
-/// This is the smaller size used in powers or sub- or superscripts.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 ///
 /// ```example
 /// $sum_i x_i/2 = script(sum_i x_i/2)$
 /// ```
 #[func(title = "Script Size", keywords = ["scriptstyle"])]
 pub fn script(
-<<<<<<< HEAD
     /// 大きさを指定したいコンテンツ。
     body: Content,
     /// 通常の下付き文字や上付き文字のように、指数に高さ制限を課すかどうか。
-=======
-    /// The content to size.
-    body: Content,
-    /// Whether to impose a height restriction for exponents, like regular sub-
-    /// and superscripts do.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     #[named]
     #[default(true)]
     cramped: bool,
@@ -357,32 +214,18 @@ pub fn script(
         .set(EquationElem::cramped, cramped)
 }
 
-<<<<<<< HEAD
 /// 数式中で第2スクリプトスタイルを強制します。
 ///
 /// これは、第2レベルの下付き文字や上付き文字（添え字の添え字）で使用される最も小さいサイズです。
-=======
-/// Forced second script style in math.
-///
-/// This is the smallest size, used in second-level sub- and superscripts
-/// (script of the script).
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 ///
 /// ```example
 /// $sum_i x_i/2 = sscript(sum_i x_i/2)$
 /// ```
 #[func(title = "Script-Script Size", keywords = ["scriptscriptstyle"])]
 pub fn sscript(
-<<<<<<< HEAD
     /// 大きさを指定したいコンテンツ。
     body: Content,
     /// 通常の下付き文字や上付き文字のように、指数に高さ制限を課すかどうか。
-=======
-    /// The content to size.
-    body: Content,
-    /// Whether to impose a height restriction for exponents, like regular sub-
-    /// and superscripts do.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     #[named]
     #[default(true)]
     cramped: bool,
diff --git a/crates/typst-library/src/math/underover.rs b/crates/typst-library/src/math/underover.rs
index 2740546483..5bdba427fe 100644
--- a/crates/typst-library/src/math/underover.rs
+++ b/crates/typst-library/src/math/underover.rs
@@ -1,227 +1,133 @@
 use crate::foundations::{Content, elem};
 use crate::math::Mathy;
 
-<<<<<<< HEAD
 /// コンテンツの下にある水平方向の線。
-=======
-/// A horizontal line under content.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 ///
 /// ```example
 /// $ underline(1 + 2 + ... + 5) $
 /// ```
 #[elem(Mathy)]
 pub struct UnderlineElem {
-<<<<<<< HEAD
     /// 線の上にあるコンテンツ。
-=======
-    /// The content above the line.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     #[required]
     pub body: Content,
 }
 
-<<<<<<< HEAD
 /// コンテンツの上にある水平方向の線。
-=======
-/// A horizontal line over content.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 ///
 /// ```example
 /// $ overline(1 + 2 + ... + 5) $
 /// ```
 #[elem(Mathy)]
 pub struct OverlineElem {
-<<<<<<< HEAD
     /// 線の下にあるコンテンツ。
-=======
-    /// The content below the line.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     #[required]
     pub body: Content,
 }
 
-<<<<<<< HEAD
 /// コンテンツの下にある水平方向の波括弧。その下にオプションで注釈ができます。
-=======
-/// A horizontal brace under content, with an optional annotation below.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 ///
 /// ```example
 /// $ underbrace(0 + 1 + dots.c + n, n + 1 "numbers") $
 /// ```
 #[elem(Mathy)]
 pub struct UnderbraceElem {
-<<<<<<< HEAD
     /// 波括弧の上にあるコンテンツ。
     #[required]
     pub body: Content,
 
     /// 波括弧の下にあるオプションのコンテンツ。
-=======
-    /// The content above the brace.
-    #[required]
-    pub body: Content,
-
-    /// The optional content below the brace.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     #[positional]
     pub annotation: Option<Content>,
 }
 
-<<<<<<< HEAD
 /// コンテンツの上にある水平方向の波括弧。その上にオプションで注釈ができます。
-=======
-/// A horizontal brace over content, with an optional annotation above.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 ///
 /// ```example
 /// $ overbrace(0 + 1 + dots.c + n, n + 1 "numbers") $
 /// ```
 #[elem(Mathy)]
 pub struct OverbraceElem {
-<<<<<<< HEAD
     /// 波括弧の下にあるコンテンツ。
     #[required]
     pub body: Content,
 
     /// 波括弧の上にあるオプションのコンテンツ。
-=======
-    /// The content below the brace.
-    #[required]
-    pub body: Content,
-
-    /// The optional content above the brace.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     #[positional]
     pub annotation: Option<Content>,
 }
 
-<<<<<<< HEAD
 /// コンテンツの下にある水平方向の角括弧。その下にオプションで注釈ができます。
-=======
-/// A horizontal bracket under content, with an optional annotation below.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 ///
 /// ```example
 /// $ underbracket(0 + 1 + dots.c + n, n + 1 "numbers") $
 /// ```
 #[elem(Mathy)]
 pub struct UnderbracketElem {
-<<<<<<< HEAD
     /// 角括弧の上にあるコンテンツ。
     #[required]
     pub body: Content,
 
     /// 角括弧の下にあるオプションのコンテンツ。
-=======
-    /// The content above the bracket.
-    #[required]
-    pub body: Content,
-
-    /// The optional content below the bracket.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     #[positional]
     pub annotation: Option<Content>,
 }
 
-<<<<<<< HEAD
 /// コンテンツの上にある水平方向の角括弧。その上にオプションで注釈ができます。
-=======
-/// A horizontal bracket over content, with an optional annotation above.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 ///
 /// ```example
 /// $ overbracket(0 + 1 + dots.c + n, n + 1 "numbers") $
 /// ```
 #[elem(Mathy)]
 pub struct OverbracketElem {
-<<<<<<< HEAD
     /// 角括弧の下にあるコンテンツ。
     #[required]
     pub body: Content,
 
     /// 角括弧の上にあるオプションのコンテンツ。
-=======
-    /// The content below the bracket.
-    #[required]
-    pub body: Content,
-
-    /// The optional content above the bracket.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     #[positional]
     pub annotation: Option<Content>,
 }
 
-<<<<<<< HEAD
 /// コンテンツの下にある水平方向の丸括弧。その下にオプションで注釈ができます。
-=======
-/// A horizontal parenthesis under content, with an optional annotation below.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 ///
 /// ```example
 /// $ underparen(0 + 1 + dots.c + n, n + 1 "numbers") $
 /// ```
 #[elem(Mathy)]
 pub struct UnderparenElem {
-<<<<<<< HEAD
     /// 丸括弧の上にあるコンテンツ。
     #[required]
     pub body: Content,
 
     /// 丸括弧の下にあるオプションのコンテンツ。
-=======
-    /// The content above the parenthesis.
-    #[required]
-    pub body: Content,
-
-    /// The optional content below the parenthesis.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     #[positional]
     pub annotation: Option<Content>,
 }
 
-<<<<<<< HEAD
 /// コンテンツの上にある水平方向の丸括弧。その上にオプションで注釈ができます。
-=======
-/// A horizontal parenthesis over content, with an optional annotation above.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 ///
 /// ```example
 /// $ overparen(0 + 1 + dots.c + n, n + 1 "numbers") $
 /// ```
 #[elem(Mathy)]
 pub struct OverparenElem {
-<<<<<<< HEAD
     /// 丸括弧の下にあるコンテンツ。
     #[required]
     pub body: Content,
 
     /// 丸括弧の上にあるオプションのコンテンツ。
-=======
-    /// The content below the parenthesis.
-    #[required]
-    pub body: Content,
-
-    /// The optional content above the parenthesis.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     #[positional]
     pub annotation: Option<Content>,
 }
 
-<<<<<<< HEAD
 /// コンテンツの下にある水平方向の亀甲括弧。その下にオプションで注釈ができます。
-=======
-/// A horizontal tortoise shell bracket under content, with an optional
-/// annotation below.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 ///
 /// ```example
 /// $ undershell(0 + 1 + dots.c + n, n + 1 "numbers") $
 /// ```
 #[elem(Mathy)]
 pub struct UndershellElem {
-<<<<<<< HEAD
     /// 亀甲括弧の上にあるコンテンツ。
     #[required]
     pub body: Content,
@@ -231,38 +137,17 @@ pub struct UndershellElem {
     pub annotation: Option<Content>,
 }
 /// コンテンツの上にある水平方向の亀甲括弧。その上にオプションで注釈ができます。
-=======
-    /// The content above the tortoise shell bracket.
-    #[required]
-    pub body: Content,
-
-    /// The optional content below the tortoise shell bracket.
-    #[positional]
-    pub annotation: Option<Content>,
-}
-
-/// A horizontal tortoise shell bracket over content, with an optional
-/// annotation above.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 ///
 /// ```example
 /// $ overshell(0 + 1 + dots.c + n, n + 1 "numbers") $
 /// ```
 #[elem(Mathy)]
 pub struct OvershellElem {
-<<<<<<< HEAD
     /// 亀甲括弧の下にあるコンテンツ。
     #[required]
     pub body: Content,
 
     /// 亀甲括弧の上にあるオプションのコンテンツ。
-=======
-    /// The content below the tortoise shell bracket.
-    #[required]
-    pub body: Content,
-
-    /// The optional content above the tortoise shell bracket.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     #[positional]
     pub annotation: Option<Content>,
 }
diff --git a/crates/typst-library/src/model/bibliography.rs b/crates/typst-library/src/model/bibliography.rs
index 7a873628ff..be695c64ab 100644
--- a/crates/typst-library/src/model/bibliography.rs
+++ b/crates/typst-library/src/model/bibliography.rs
@@ -4,10 +4,6 @@ use std::fmt::{self, Debug, Formatter};
 use std::num::NonZeroUsize;
 use std::path::Path;
 use std::sync::{Arc, LazyLock};
-<<<<<<< HEAD
-=======
-
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 use comemo::{Track, Tracked};
 use ecow::{EcoString, EcoVec, eco_format};
 use hayagriva::archive::ArchivedStyle;
@@ -43,7 +39,6 @@ use crate::model::{
 use crate::routines::Routines;
 use crate::text::{Lang, LocalName, Region, SmallcapsElem, SubElem, SuperElem, TextElem};
 
-<<<<<<< HEAD
 /// 参考文献 / 引用文献リスト。
 ///
 /// 次の2つの形式のどちらかの参考文献ファイルへのパスを指定してこの関数を呼び出すと、新しい参考文献リストを作成できます。
@@ -71,41 +66,6 @@ use crate::text::{Lang, LocalName, Region, SmallcapsElem, SubElem, SuperElem, Te
 /// | 物理学 | `{"american-physics-society"}` |
 ///
 /// # 例
-=======
-/// A bibliography / reference listing.
-///
-/// You can create a new bibliography by calling this function with a path
-/// to a bibliography file in either one of two formats:
-///
-/// - A Hayagriva `.yaml`/`.yml` file. Hayagriva is a new bibliography
-///   file format designed for use with Typst. Visit its
-///   [documentation](https://github.com/typst/hayagriva/blob/main/docs/file-format.md)
-///   for more details.
-/// - A BibLaTeX `.bib` file.
-///
-/// As soon as you add a bibliography somewhere in your document, you can start
-/// citing things with reference syntax (`[@key]`) or explicit calls to the
-/// [citation]($cite) function (`[#cite(<key>)]`). The bibliography will only
-/// show entries for works that were referenced in the document.
-///
-/// # Styles
-/// Typst offers a wide selection of built-in
-/// [citation and bibliography styles]($bibliography.style). Beyond those, you
-/// can add and use custom [CSL](https://citationstyles.org/) (Citation Style
-/// Language) files. Wondering which style to use? Here are some good defaults
-/// based on what discipline you're working in:
-///
-/// | Fields          | Typical Styles                                         |
-/// |-----------------|--------------------------------------------------------|
-/// | Engineering, IT | `{"ieee"}`                                             |
-/// | Psychology, Life Sciences | `{"apa"}`                                    |
-/// | Social sciences | `{"chicago-author-date"}`                              |
-/// | Humanities      | `{"mla"}`, `{"chicago-notes"}`, `{"harvard-cite-them-right"}` |
-/// | Economics       | `{"harvard-cite-them-right"}`                          |
-/// | Physics         | `{"american-physics-society"}`                         |
-///
-/// # Example
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 /// ```example
 /// This was already noted by
 /// pirates long ago. @arrgh
@@ -117,7 +77,6 @@ use crate::text::{Lang, LocalName, Region, SmallcapsElem, SubElem, SuperElem, Te
 /// ```
 #[elem(Locatable, Synthesize, ShowSet, LocalName)]
 pub struct BibliographyElem {
-<<<<<<< HEAD
     /// 1つまたは複数のHayagriva`.yaml`やBibLaTeX`.bib`ファイルへのパスや生バイト。
     ///
     /// 以下の形式で指定できます。
@@ -125,16 +84,6 @@ pub struct BibliographyElem {
     ///   パスに関する詳細は[パスの章]($syntax/#paths)をご参照ください。
     /// - 参考文献情報がデコードできる生バイト。
     /// - 上記を要素とする配列。
-=======
-    /// One or multiple paths to or raw bytes for Hayagriva `.yaml` and/or
-    /// BibLaTeX `.bib` files.
-    ///
-    /// This can be a:
-    /// - A path string to load a bibliography file from the given path. For
-    ///   more details about paths, see the [Paths section]($syntax/#paths).
-    /// - Raw bytes from which the bibliography should be decoded.
-    /// - An array where each item is one of the above.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     #[required]
     #[parse(
         let sources = args.expect("sources")?;
@@ -142,7 +91,6 @@ pub struct BibliographyElem {
     )]
     pub sources: Derived<OneOrMultiple<DataSource>, Bibliography>,
 
-<<<<<<< HEAD
     /// 参考文献のタイトル。
     ///
     /// - `{auto}`に設定すると、[テキストの言語]($text.lang)に適したタイトルが表示されます。これがデフォルトです。
@@ -168,37 +116,6 @@ pub struct BibliographyElem {
     /// - [CSL ファイル](https://citationstyles.org/)へのパスを示す文字列。
     ///   パスに関する詳細は[Pathセクション]($syntax/#paths)を参照してください。
     /// - CSLスタイルがデコードされるべき生バイト。
-=======
-    /// The title of the bibliography.
-    ///
-    /// - When set to `{auto}`, an appropriate title for the
-    ///   [text language]($text.lang) will be used. This is the default.
-    /// - When set to `{none}`, the bibliography will not have a title.
-    /// - A custom title can be set by passing content.
-    ///
-    /// The bibliography's heading will not be numbered by default, but you can
-    /// force it to be with a show-set rule:
-    /// `{show bibliography: set heading(numbering: "1.")}`
-    pub title: Smart<Option<Content>>,
-
-    /// Whether to include all works from the given bibliography files, even
-    /// those that weren't cited in the document.
-    ///
-    /// To selectively add individual cited works without showing them, you can
-    /// also use the `cite` function with [`form`]($cite.form) set to `{none}`.
-    #[default(false)]
-    pub full: bool,
-
-    /// The bibliography style.
-    ///
-    /// This can be:
-    /// - A string with the name of one of the built-in styles (see below). Some
-    ///   of the styles listed below appear twice, once with their full name and
-    ///   once with a short alias.
-    /// - A path string to a [CSL file](https://citationstyles.org/). For more
-    ///   details about paths, see the [Paths section]($syntax/#paths).
-    /// - Raw bytes from which a CSL style should be decoded.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     #[parse(match args.named::<Spanned<CslSource>>("style")? {
         Some(source) => Some(CslStyle::load(engine, source)?),
         None => None,
@@ -209,20 +126,12 @@ pub struct BibliographyElem {
     })]
     pub style: Derived<CslSource, CslStyle>,
 
-<<<<<<< HEAD
     /// 参考文献の言語設定。
-=======
-    /// The language setting where the bibliography is.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     #[internal]
     #[synthesized]
     pub lang: Lang,
 
-<<<<<<< HEAD
     /// 参考文献の地域設定。
-=======
-    /// The region setting where the bibliography is.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     #[internal]
     #[synthesized]
     pub region: Option<Region>,
diff --git a/crates/typst-library/src/model/cite.rs b/crates/typst-library/src/model/cite.rs
index 75153e9291..d7d4ea605b 100644
--- a/crates/typst-library/src/model/cite.rs
+++ b/crates/typst-library/src/model/cite.rs
@@ -10,20 +10,11 @@ use crate::model::bibliography::Works;
 use crate::model::{CslSource, CslStyle};
 use crate::text::{Lang, Region, TextElem};
 
-<<<<<<< HEAD
 /// 参考文献の引用。
 ///
 /// 引用を始める前に、文書のどこかで[bibliography]を追加しておく必要があります。
 ///
 /// # 例
-=======
-/// Cite a work from the bibliography.
-///
-/// Before you starting citing, you need to add a [bibliography] somewhere in
-/// your document.
-///
-/// # Example
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 /// ```example
 /// This was already noted by
 /// pirates long ago. @arrgh
@@ -37,13 +28,8 @@ use crate::text::{Lang, Region, TextElem};
 /// #bibliography("works.bib")
 /// ```
 ///
-<<<<<<< HEAD
 /// ソース名にスラッシュなど`<>`構文では認識されない文字が含まれている場合は、
 /// 代わりにlabelを明示的に呼び出すことで参照できます。
-=======
-/// If your source name contains certain characters such as slashes, which are
-/// not recognized by the `<>` syntax, you can explicitly call `label` instead.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 ///
 /// ```typ
 /// Computer Modern is an example of a modernist serif typeface.
@@ -51,7 +37,6 @@ use crate::text::{Lang, Region, TextElem};
 /// >>> #bibliography("works.bib")
 /// ```
 ///
-<<<<<<< HEAD
 /// # 構文
 /// この関数は間接的に専用の構文を持っています。
 /// [References]($ref)は参考文献を引用するために使用可能です。
@@ -59,16 +44,6 @@ use crate::text::{Lang, Region, TextElem};
 #[elem(Locatable, Synthesize)]
 pub struct CiteElem {
     /// 引用する文献を特定するラベルである参照キー。
-=======
-/// # Syntax
-/// This function indirectly has dedicated syntax. [References]($ref) can be
-/// used to cite works from the bibliography. The label then corresponds to the
-/// citation key.
-#[elem(Locatable, Synthesize)]
-pub struct CiteElem {
-    /// The citation key that identifies the entry in the bibliography that
-    /// shall be cited, as a label.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     ///
     /// ```example
     /// // All the same
@@ -81,15 +56,9 @@ pub struct CiteElem {
     #[required]
     pub key: Label,
 
-<<<<<<< HEAD
     /// ページ番号や章番号などの引用の補足語。
     ///
     /// Referencesの構文では、角括弧で囲むことで補足語を追加できます。
-=======
-    /// A supplement for the citation such as page or chapter number.
-    ///
-    /// In reference syntax, the supplement can be added in square brackets:
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     ///
     /// ```example
     /// This has been proven. @distress[p.~7]
@@ -98,20 +67,10 @@ pub struct CiteElem {
     /// ```
     pub supplement: Option<Content>,
 
-<<<<<<< HEAD
     /// 作成する引用の種類。異なる形式は異なるシナリオで有用です。
     /// 通常の引用は文末に置くソースとして有用ですが、"prose"引用は文章の途中に置くのに適しています。
     ///
     /// もし`{none}`と設定すると、引用文献は参考文献リストに含まれますが、文章内には表示されません。
-=======
-    /// The kind of citation to produce. Different forms are useful in different
-    /// scenarios: A normal citation is useful as a source at the end of a
-    /// sentence, while a "prose" citation is more suitable for inclusion in the
-    /// flow of text.
-    ///
-    /// If set to `{none}`, the cited work is included in the bibliography, but
-    /// nothing will be displayed.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     ///
     /// ```example
     /// #cite(<netwok>, form: "prose")
@@ -122,7 +81,6 @@ pub struct CiteElem {
     /// ```
     #[default(Some(CitationForm::Normal))]
     pub form: Option<CitationForm>,
-<<<<<<< HEAD
     /// 引用スタイル。
     ///
     /// 以下のいずれかの方法で指定します。
@@ -132,20 +90,6 @@ pub struct CiteElem {
     /// - [CSLファイル](https://citationstyles.org/)へのパスを示す文字列。
     ///   パスに関する詳細は[パスの章]($syntax/#paths)を参照してください。
     /// - CSLスタイルがデコードされるべき生バイト。
-=======
-
-    /// The citation style.
-    ///
-    /// This can be:
-    /// - `{auto}` to automatically use the
-    ///   [bibliography's style]($bibliography.style) for citations.
-    /// - A string with the name of one of the built-in styles (see below). Some
-    ///   of the styles listed below appear twice, once with their full name and
-    ///   once with a short alias.
-    /// - A path string to a [CSL file](https://citationstyles.org/). For more
-    ///   details about paths, see the [Paths section]($syntax/#paths).
-    /// - Raw bytes from which a CSL style should be decoded.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     #[parse(match args.named::<Spanned<Smart<CslSource>>>("style")? {
         Some(Spanned { v: Smart::Custom(source), span }) => Some(Smart::Custom(
             CslStyle::load(engine, Spanned::new(source, span))?
@@ -180,7 +124,6 @@ cast! {
     v: Content => v.unpack::<Self>().map_err(|_| "expected citation")?,
 }
 
-<<<<<<< HEAD
 /// 引用の形式。
 #[derive(Debug, Default, Copy, Clone, Eq, PartialEq, Hash, Cast)]
 pub enum CitationForm {
@@ -194,21 +137,6 @@ pub enum CitationForm {
     /// 引用文献の著者らのみを表示する。
     Author,
     /// 引用文献の発行年のみを表示する。
-=======
-/// The form of the citation.
-#[derive(Debug, Default, Copy, Clone, Eq, PartialEq, Hash, Cast)]
-pub enum CitationForm {
-    /// Display in the standard way for the active style.
-    #[default]
-    Normal,
-    /// Produces a citation that is suitable for inclusion in a sentence.
-    Prose,
-    /// Mimics a bibliography entry, with full information about the cited work.
-    Full,
-    /// Shows only the cited work's author(s).
-    Author,
-    /// Shows only the cited work's year.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     Year,
 }
 
diff --git a/crates/typst-library/src/model/document.rs b/crates/typst-library/src/model/document.rs
index 9d338488fc..880c5cbde3 100644
--- a/crates/typst-library/src/model/document.rs
+++ b/crates/typst-library/src/model/document.rs
@@ -8,21 +8,12 @@ use crate::foundations::{
 };
 use crate::text::{Locale, TextElem};
 
-<<<<<<< HEAD
 /// 文書とそのメタデータのルート要素。
 ///
 /// 全ての文書は、自動的に`document`（文書）要素でラップされます。
 /// この文書要素は自分で作成できません。
 /// この関数は、[setルール]($styling/#set-rules)と組み合わせて文書のメタデータを指定する場合にのみ使用されます。
 /// setルールは、レイアウトコンテナの内部に置いてはいけません。
-=======
-/// The root element of a document and its metadata.
-///
-/// All documents are automatically wrapped in a `document` element. You cannot
-/// create a document element yourself. This function is only used with
-/// [set rules]($styling/#set-rules) to specify document metadata. Such a set
-/// rule must not occur inside of any layout container.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 ///
 /// ```example
 /// #set document(title: [Hello])
@@ -31,7 +22,6 @@ use crate::text::{Locale, TextElem};
 /// embeds metadata into the PDF!
 /// ```
 ///
-<<<<<<< HEAD
 /// この関数で設定したメタデータは、文書内には表示されません。
 /// 代わりに、コンパイルされたPDFファイル内に埋め込まれます。
 #[elem(Construct)]
@@ -67,47 +57,6 @@ pub struct DocumentElem {
     /// PDFに埋め込むためには、yearの値が0以上でなくてはなりません。
     ///
     /// バイト単位で同一に再現できるPDFを出力したい場合には、`{auto}`以外の値を設定してください。
-=======
-/// Note that metadata set with this function is not rendered within the
-/// document. Instead, it is embedded in the compiled PDF file.
-#[elem(Construct)]
-pub struct DocumentElem {
-    /// The document's title. This is rendered as the title of the PDF viewer
-    /// window or the browser tab of the page.
-    ///
-    /// Adding a title is important for accessibility, as it makes it easier to
-    /// navigate to your document and identify it among other open documents.
-    /// When exporting to PDF/UA, a title is required.
-    ///
-    /// While this can be arbitrary content, PDF viewers only support plain text
-    /// titles, so the conversion might be lossy.
-    #[ghost]
-    pub title: Option<Content>,
-
-    /// The document's authors.
-    #[ghost]
-    pub author: OneOrMultiple<EcoString>,
-
-    /// The document's description.
-    #[ghost]
-    pub description: Option<Content>,
-
-    /// The document's keywords.
-    #[ghost]
-    pub keywords: OneOrMultiple<EcoString>,
-
-    /// The document's creation date.
-    ///
-    /// If this is `{auto}` (default), Typst uses the current date and time.
-    /// Setting it to `{none}` prevents Typst from embedding any creation date
-    /// into the PDF metadata.
-    ///
-    /// The year component must be at least zero in order to be embedded into a
-    /// PDF.
-    ///
-    /// If you want to create byte-by-byte reproducible PDFs, set this to
-    /// something other than `{auto}`.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     #[ghost]
     pub date: Smart<Option<Datetime>>,
 }
diff --git a/crates/typst-library/src/model/emph.rs b/crates/typst-library/src/model/emph.rs
index f987cad1f1..ffc060d240 100644
--- a/crates/typst-library/src/model/emph.rs
+++ b/crates/typst-library/src/model/emph.rs
@@ -1,7 +1,6 @@
 use crate::foundations::{Content, elem};
 use crate::introspection::{Locatable, Tagged};
 
-<<<<<<< HEAD
 /// イタリック体への切り替えによるコンテンツの強調。
 ///
 /// - 現在の[テキストスタイル]($text.style)が`{"normal"}`の場合、これを
@@ -10,16 +9,6 @@ use crate::introspection::{Locatable, Tagged};
 ///   `{"normal"}`に戻します。
 ///
 /// # 例
-=======
-/// Emphasizes content by toggling italics.
-///
-/// - If the current [text style]($text.style) is `{"normal"}`, this turns it
-///   into `{"italic"}`.
-/// - If it is already `{"italic"}` or `{"oblique"}`, it turns it back to
-///   `{"normal"}`.
-///
-/// # Example
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 /// ```example
 /// This is _emphasized._ \
 /// This is #emph[too.]
@@ -31,7 +20,6 @@ use crate::introspection::{Locatable, Tagged};
 /// This is _emphasized_ differently.
 /// ```
 ///
-<<<<<<< HEAD
 /// # 構文
 /// この関数には専用の構文もあります。
 /// 強調したいコンテンツをアンダースコア（`_`）で囲むだけです。
@@ -40,15 +28,6 @@ use crate::introspection::{Locatable, Tagged};
 #[elem(title = "Emphasis", keywords = ["italic"], Locatable, Tagged)]
 pub struct EmphElem {
     /// 強調するコンテンツ。
-=======
-/// # Syntax
-/// This function also has dedicated syntax: To emphasize content, simply
-/// enclose it in underscores (`_`). Note that this only works at word
-/// boundaries. To emphasize part of a word, you have to use the function.
-#[elem(title = "Emphasis", keywords = ["italic"], Locatable, Tagged)]
-pub struct EmphElem {
-    /// The content to emphasize.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     #[required]
     pub body: Content,
 }
diff --git a/crates/typst-library/src/model/enum.rs b/crates/typst-library/src/model/enum.rs
index dd5d18b74c..44c220ad9e 100644
--- a/crates/typst-library/src/model/enum.rs
+++ b/crates/typst-library/src/model/enum.rs
@@ -8,19 +8,11 @@ use crate::introspection::{Locatable, Tagged};
 use crate::layout::{Alignment, Em, HAlignment, Length, VAlignment};
 use crate::model::{ListItemLike, ListLike, Numbering, NumberingPattern};
 
-<<<<<<< HEAD
 /// 番号付きリスト。
 ///
 /// 一連の項目を縦に並べて表示し、それぞれに連番を付けます。
 ///
 /// # 例
-=======
-/// A numbered list.
-///
-/// Displays a sequence of items vertically and numbers them consecutively.
-///
-/// # Example
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 /// ```example
 /// Automatically numbered:
 /// + Preparations
@@ -41,13 +33,8 @@ use crate::model::{ListItemLike, ListLike, Numbering, NumberingPattern};
 /// #enum[First][Second]
 /// ```
 ///
-<<<<<<< HEAD
 /// setルールを用いることで、
 /// 全てのリストを異なる番号付けスタイルに簡単に切り替えられます。
-=======
-/// You can easily switch all your enumerations to a different numbering style
-/// with a set rule.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 /// ```example
 /// #set enum(numbering: "a)")
 ///
@@ -55,13 +42,8 @@ use crate::model::{ListItemLike, ListLike, Numbering, NumberingPattern};
 /// + Don't forget step two
 /// ```
 ///
-<<<<<<< HEAD
 /// また、[`enum.item`]($enum.item)を使用して、
 /// リストの各項目の番号を自由にカスタマイズできます。
-=======
-/// You can also use [`enum.item`] to programmatically customize the number of
-/// each item in the enumeration:
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 ///
 /// ```example
 /// #enum(
@@ -71,7 +53,6 @@ use crate::model::{ListItemLike, ListLike, Numbering, NumberingPattern};
 /// )
 /// ```
 ///
-<<<<<<< HEAD
 /// # 構文
 /// この関数には専用の構文もあります。
 ///
@@ -96,32 +77,6 @@ pub struct EnumElem {
     /// 項目間に空行がなく連続している場合、この値は`{true}`に設定されますが、
     /// 項目間が空行で区切られている場合は`{false}`に設定されます。
     /// マークアップで定義された間隔はsetルールで上書きすることは出来ません。
-=======
-/// # Syntax
-/// This functions also has dedicated syntax:
-///
-/// - Starting a line with a plus sign creates an automatically numbered
-///   enumeration item.
-/// - Starting a line with a number followed by a dot creates an explicitly
-///   numbered enumeration item.
-///
-/// Enumeration items can contain multiple paragraphs and other block-level
-/// content. All content that is indented more than an item's marker becomes
-/// part of that item.
-#[elem(scope, title = "Numbered List", Locatable, Tagged)]
-pub struct EnumElem {
-    /// Defines the default [spacing]($enum.spacing) of the enumeration. If it
-    /// is `{false}`, the items are spaced apart with
-    /// [paragraph spacing]($par.spacing). If it is `{true}`, they use
-    /// [paragraph leading]($par.leading) instead. This makes the list more
-    /// compact, which can look better if the items are short.
-    ///
-    /// In markup mode, the value of this parameter is determined based on
-    /// whether items are separated with a blank line. If items directly follow
-    /// each other, this is set to `{true}`; if items are separated by a blank
-    /// line, this is set to `{false}`. The markup-defined tightness cannot be
-    /// overridden with set rules.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     ///
     /// ```example
     /// + If an enum has a lot of text, and
@@ -135,21 +90,12 @@ pub struct EnumElem {
     #[default(true)]
     pub tight: bool,
 
-<<<<<<< HEAD
     /// リストをどのように番号付けするかを指定します。
     /// [番号付けパターンまたは関数]($numbering)を受け付けます。
     ///
     /// 番号付けのパターンに複数のカウント記号が含まれている場合、
     /// それらはネストされたリストに適用されます。
     /// 関数が指定された場合、`full`が`{false}`の場合は1つの引数を受け取り、`{true}`の場合は複数の引数を受け取ります。
-=======
-    /// How to number the enumeration. Accepts a
-    /// [numbering pattern or function]($numbering).
-    ///
-    /// If the numbering pattern contains multiple counting symbols, they apply
-    /// to nested enums. If given a function, the function receives one argument
-    /// if `full` is `{false}` and multiple arguments if `full` is `{true}`.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     ///
     /// ```example
     /// #set enum(numbering: "1.a)")
@@ -166,11 +112,7 @@ pub struct EnumElem {
     #[default(Numbering::Pattern(NumberingPattern::from_str("1.").unwrap()))]
     pub numbering: Numbering,
 
-<<<<<<< HEAD
     /// リストの開始番号を指定します。
-=======
-    /// Which number to start the enumeration with.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     ///
     /// ```example
     /// #enum(
@@ -181,14 +123,8 @@ pub struct EnumElem {
     /// ```
     pub start: Smart<u64>,
 
-<<<<<<< HEAD
     /// 親リストの番号も含めて、
     /// 完全な番号付けを表示するかどうかを指定します。
-=======
-    /// Whether to display the full numbering, including the numbers of
-    /// all parent enumerations.
-    ///
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     ///
     /// ```example
     /// #set enum(numbering: "1.a)", full: true)
@@ -200,11 +136,7 @@ pub struct EnumElem {
     #[default(false)]
     pub full: bool,
 
-<<<<<<< HEAD
     /// このリストの番号付けを逆順にするかどうかを指定します。
-=======
-    /// Whether to reverse the numbering for this enumeration.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     ///
     /// ```example
     /// #set enum(reversed: true)
@@ -215,7 +147,6 @@ pub struct EnumElem {
     #[default(false)]
     pub reversed: bool,
 
-<<<<<<< HEAD
     /// 各項目のインデント。
     pub indent: Length,
 
@@ -241,33 +172,6 @@ pub struct EnumElem {
     /// しかし、このオプションを使用することで、この動作を上書きできます。
     /// （また、[unordered list]($list)は異なる方法を用いており、直接`marker`コンテンツに配置を指定することで、
     /// これを実現していることに注意してください）
-=======
-    /// The indentation of each item.
-    pub indent: Length,
-
-    /// The space between the numbering and the body of each item.
-    #[default(Em::new(0.5).into())]
-    pub body_indent: Length,
-
-    /// The spacing between the items of the enumeration.
-    ///
-    /// If set to `{auto}`, uses paragraph [`leading`]($par.leading) for tight
-    /// enumerations and paragraph [`spacing`]($par.spacing) for wide
-    /// (non-tight) enumerations.
-    pub spacing: Smart<Length>,
-
-    /// The alignment that enum numbers should have.
-    ///
-    /// By default, this is set to `{end + top}`, which aligns enum numbers
-    /// towards end of the current text direction (in left-to-right script,
-    /// for example, this is the same as `{right}`) and at the top of the line.
-    /// The choice of `{end}` for horizontal alignment of enum numbers is
-    /// usually preferred over `{start}`, as numbers then grow away from the
-    /// text instead of towards it, avoiding certain visual issues. This option
-    /// lets you override this behaviour, however. (Also to note is that the
-    /// [unordered list]($list) uses a different method for this, by giving the
-    /// `marker` content an alignment directly.).
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     ///
     /// ````example
     /// #set enum(number-align: start + bottom)
@@ -283,17 +187,10 @@ pub struct EnumElem {
     #[default(HAlignment::End + VAlignment::Top)]
     pub number_align: Alignment,
 
-<<<<<<< HEAD
     /// 番号付きリストの項目。
     ///
     /// enum構文を使用する場合、forループのような構造を挟んでも、
     /// 隣接する項目は自動的にリストとしてまとめられます。
-=======
-    /// The numbered list's items.
-    ///
-    /// When using the enum syntax, adjacent items are automatically collected
-    /// into enumerations, even through constructs like for loops.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     ///
     /// ```example
     /// #for phase in (
@@ -318,7 +215,6 @@ impl EnumElem {
     type EnumItem;
 }
 
-<<<<<<< HEAD
 /// 番号付きリストの項目。
 #[elem(name = "item", title = "Numbered List Item", Tagged)]
 pub struct EnumItem {
@@ -327,16 +223,6 @@ pub struct EnumItem {
     pub number: Smart<u64>,
 
     /// 項目の本文。
-=======
-/// An enumeration item.
-#[elem(name = "item", title = "Numbered List Item", Tagged)]
-pub struct EnumItem {
-    /// The item's number.
-    #[positional]
-    pub number: Smart<u64>,
-
-    /// The item's body.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     #[required]
     pub body: Content,
 }
diff --git a/crates/typst-library/src/model/figure.rs b/crates/typst-library/src/model/figure.rs
index 960261b00b..6dda384c77 100644
--- a/crates/typst-library/src/model/figure.rs
+++ b/crates/typst-library/src/model/figure.rs
@@ -22,7 +22,6 @@ use crate::model::{Numbering, NumberingPattern, Outlinable, Refable, Supplement}
 use crate::text::{Lang, Locale, TextElem};
 use crate::visualize::ImageElem;
 
-<<<<<<< HEAD
 /// 任意でキャプションを持つ図表。
 ///
 /// 自動的にその種類を検出し、それぞれに応じて番号付けします。
@@ -30,16 +29,6 @@ use crate::visualize::ImageElem;
 ///
 /// # 例
 /// 以下の例は、画像を含む基本的な図表を示しています。
-=======
-/// A figure with an optional caption.
-///
-/// Automatically detects its kind to select the correct counting track. For
-/// example, figures containing images will be numbered separately from figures
-/// containing tables.
-///
-/// # Examples
-/// The example below shows a basic figure with an image:
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 /// ```example
 /// @glacier shows a glacier. Glaciers
 /// are complex systems.
@@ -50,13 +39,8 @@ use crate::visualize::ImageElem;
 /// ) <glacier>
 /// ```
 ///
-<<<<<<< HEAD
 /// 図表に [tables]($table) を挿入してキャプションも付けられます。
 /// 図表は表を含むことを検出し、自動的に別のカウンターを使用します。
-=======
-/// You can also insert [tables]($table) into figures to give them a caption.
-/// The figure will detect this and automatically use a separate counter.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 ///
 /// ```example
 /// #figure(
@@ -69,7 +53,6 @@ use crate::visualize::ImageElem;
 /// )
 /// ```
 ///
-<<<<<<< HEAD
 /// この動作は、図表の種類である `kind` を明示的に指定することで上書き可能です。
 /// 同じ種類の図表は全て共通のカウンターを共有します。
 ///
@@ -78,38 +61,15 @@ use crate::visualize::ImageElem;
 /// 図表をページ上部または下部に配置するには、[`placement`]($figure.placement)引数を使用します。
 ///
 /// 図表が大きすぎてそのコンテンツがページをまたいで分割可能な場合（例えば大きな表が含まれている場合）、このshowルールで図表自体もページをまたいで分割可能です。
-=======
-/// This behaviour can be overridden by explicitly specifying the figure's
-/// `kind`. All figures of the same kind share a common counter.
-///
-/// # Figure behaviour
-/// By default, figures are placed within the flow of content. To make them
-/// float to the top or bottom of the page, you can use the
-/// [`placement`]($figure.placement) argument.
-///
-/// If your figure is too large and its contents are breakable across pages
-/// (e.g. if it contains a large table), then you can make the figure itself
-/// breakable across pages as well with this show rule:
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 /// ```typ
 /// #show figure: set block(breakable: true)
 /// ```
 ///
-<<<<<<< HEAD
 /// 分割できるブロックと分割できないブロックの詳細については、[block]($block.breakable)のドキュメントを参照してください。
 ///
 /// # キャプションの改変
 /// 図表のキャプションの外観は、関連するキャプション機能で改変できます。
 /// 以下の例では、全てのキャプションを斜体で強調しています。
-=======
-/// See the [block]($block.breakable) documentation for more information about
-/// breakable and non-breakable blocks.
-///
-/// # Caption customization
-/// You can modify the appearance of the figure's caption with its associated
-/// [`caption`]($figure.caption) function. In the example below, we emphasize
-/// all captions:
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 ///
 /// ```example
 /// #show figure.caption: emph
@@ -120,15 +80,8 @@ use crate::visualize::ImageElem;
 /// )
 /// ```
 ///
-<<<<<<< HEAD
 /// [`where`]($function.where)セレクターを使うことで、このようなルールを特定の種類の図表に適用可能です。
 /// 例えば、次のようなshow-setルールを記述することで、図表の種類が表の場合はキャプションを表の上に、他の種類ではキャプションを下に配置できます。
-=======
-/// By using a [`where`]($function.where) selector, we can scope such rules to
-/// specific kinds of figures. For example, to position the caption above
-/// tables, but keep it below for all other kinds of figures, we could write the
-/// following show-set rule:
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 ///
 /// ```example
 /// #show figure.where(
@@ -141,7 +94,6 @@ use crate::visualize::ImageElem;
 /// )
 /// ```
 ///
-<<<<<<< HEAD
 /// # アクセシビリティ
 /// [`alt`]($figure.alt)パラメーターを使用して、
 /// スクリーンリーダーやその他の支援技術（AT）のための図表の[代替説明]($guides/accessibility/#textual-representations)を提供できます。
@@ -188,58 +140,6 @@ pub struct FigureElem {
     /// - `{bottom}`： ページの下部に置かれる。
     ///
     /// 本文のコンテンツと図表の間隔は`place`関数の [`clearance`]($place.clearance) 引数によって制御します。
-=======
-/// # Accessibility
-/// You can use the [`alt`]($figure.alt) parameter to provide an [alternative
-/// description]($guides/accessibility/#textual-representations) of the figure
-/// for screen readers and other Assistive Technology (AT). Refer to [its
-/// documentation]($figure.alt) to learn more.
-///
-/// You can use figures to add alternative descriptions to paths, shapes, or
-/// visualizations that do not have their own `alt` parameter. If your graphic
-/// is purely decorative and does not have a semantic meaning, consider wrapping
-/// it in [`pdf.artifact`] instead, which will hide it from AT when exporting to
-/// PDF.
-///
-/// AT will always read the figure at the point where it appears in the
-/// document, regardless of its [`placement`]($figure.placement). Put its markup
-/// where it would make the most sense in the reading order.
-#[elem(scope, Locatable, Tagged, Synthesize, Count, ShowSet, Refable, Outlinable)]
-pub struct FigureElem {
-    /// The content of the figure. Often, an [image].
-    #[required]
-    pub body: Content,
-
-    /// An alternative description of the figure.
-    ///
-    /// When you add an alternative description, AT will read both it and the
-    /// caption (if any). However, the content of the figure itself will be
-    /// skipped.
-    ///
-    /// When the body of your figure is an [image]($image) with its own `alt`
-    /// text set, this parameter should not be used on the figure element.
-    /// Likewise, do not use this parameter when the figure contains a table,
-    /// code, or other content that is already accessible. In such cases, the
-    /// content of the figure will be read by AT, and adding an alternative
-    /// description would lead to a loss of information.
-    ///
-    /// You can learn how to write good alternative descriptions in the
-    /// [Accessibility Guide]($guides/accessibility/#textual-representations).
-    pub alt: Option<EcoString>,
-
-    /// The figure's placement on the page.
-    ///
-    /// - `{none}`: The figure stays in-flow exactly where it was specified
-    ///   like other content.
-    /// - `{auto}`: The figure picks `{top}` or `{bottom}` depending on which
-    ///   is closer.
-    /// - `{top}`: The figure floats to the top of the page.
-    /// - `{bottom}`: The figure floats to the bottom of the page.
-    ///
-    /// The gap between the main flow content and the floating figure is
-    /// controlled by the [`clearance`]($place.clearance) argument on the
-    /// `place` function.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     ///
     /// ```example
     /// #set page(height: 200pt)
@@ -257,20 +157,11 @@ pub struct FigureElem {
     /// ```
     pub placement: Option<Smart<VAlignment>>,
 
-<<<<<<< HEAD
     /// どの包含スコープに対して図を配置するか。
     ///
     /// これを`{"parent"}`に設定すると、段組みをまたいで、ページの幅を全て使用した図表を作成します。
     ///
     /// もし`placement`を`{none}`とした場合には、何の効果もありません。
-=======
-    /// Relative to which containing scope the figure is placed.
-    ///
-    /// Set this to `{"parent"}` to create a full-width figure in a two-column
-    /// document.
-    ///
-    /// Has no effect if `placement` is `{none}`.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     ///
     /// ```example
     /// #set page(height: 250pt, columns: 2)
@@ -286,7 +177,6 @@ pub struct FigureElem {
     /// ```
     pub scope: PlacementScope,
 
-<<<<<<< HEAD
     /// 図表のキャプション。
     pub caption: Option<Packed<FigureCaption>>,
 
@@ -307,32 +197,6 @@ pub struct FigureElem {
     /// [`table`]($table)、[`raw`]($raw)、[`image`]($image)以外の要素関数に設定した場合は、図表の補足語（supplement）を手動で指定する必要があります。
     ///
     /// ```example:"図表の種類のカスタマイズ"
-=======
-    /// The figure's caption.
-    pub caption: Option<Packed<FigureCaption>>,
-
-    /// The kind of figure this is.
-    ///
-    /// All figures of the same kind share a common counter.
-    ///
-    /// If set to `{auto}`, the figure will try to automatically determine its
-    /// kind based on the type of its body. Automatically detected kinds are
-    /// [tables]($table) and [code]($raw). In other cases, the inferred kind is
-    /// that of an [image].
-    ///
-    /// Setting this to something other than `{auto}` will override the
-    /// automatic detection. This can be useful if
-    /// - you wish to create a custom figure type that is not an
-    ///   [image], a [table] or [code]($raw),
-    /// - you want to force the figure to use a specific counter regardless of
-    ///   its content.
-    ///
-    /// You can set the kind to be an element function or a string. If you set
-    /// it to an element function other than [`table`], [`raw`], or [`image`],
-    /// you will need to manually specify the figure's supplement.
-    ///
-    /// ```example:"Customizing the figure kind"
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     /// #figure(
     ///   circle(radius: 10pt),
     ///   caption: [A curious atom.],
@@ -341,7 +205,6 @@ pub struct FigureElem {
     /// )
     /// ```
     ///
-<<<<<<< HEAD
     /// カウンターの値を変更して番号をスキップしたり、
     /// カウンターをリセットしたりしたい場合は、[`where`]($function.where)セレクターを使用して、
     /// 各種類の図表に対応する[カウンター]($counter)へアクセスできます。
@@ -351,17 +214,6 @@ pub struct FigureElem {
     /// - 独自の種類の場合: `{counter(figure.where(kind: kind))}`
     ///
     /// ```example:"特定の種類に対する図表カウンターの変更"
-=======
-    /// If you want to modify a counter to skip a number or reset the counter,
-    /// you can access the [counter] of each kind of figure with a
-    /// [`where`]($function.where) selector:
-    ///
-    /// - For [tables]($table): `{counter(figure.where(kind: table))}`
-    /// - For [images]($image): `{counter(figure.where(kind: image))}`
-    /// - For a custom kind: `{counter(figure.where(kind: kind))}`
-    ///
-    /// ```example:"Modifying the figure counter for specific kinds"
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     /// #figure(
     ///   table(columns: 2, $n$, $1$),
     ///   caption: [The first table.],
@@ -382,7 +234,6 @@ pub struct FigureElem {
     /// )
     /// ```
     ///
-<<<<<<< HEAD
     /// `counter`フィールドにアクセスすることで、showルール内で適切なカウンターが活用できます。
     /// これについては、
     /// [`figure.caption`要素の`body`フィールド]($figure.caption.body)のドキュメントに例があります。
@@ -394,23 +245,6 @@ pub struct FigureElem {
     /// 独自の図表タイプを使用している場合は、補足語を手動で指定する必要があります。
     ///
     /// 関数が指定された場合、その関数は指定された種類の最初の子孫要素（通常は図の本体）に渡され、コンテンツを返す必要があります。
-=======
-    /// To conveniently use the correct counter in a show rule, you can access
-    /// the `counter` field. There is an example of this in the documentation
-    /// [of the `figure.caption` element's `body` field]($figure.caption.body).
-    pub kind: Smart<FigureKind>,
-
-    /// The figure's supplement.
-    ///
-    /// If set to `{auto}`, the figure will try to automatically determine the
-    /// correct supplement based on the `kind` and the active
-    /// [text language]($text.lang). If you are using a custom figure type, you
-    /// will need to manually specify the supplement.
-    ///
-    /// If a function is specified, it is passed the first descendant of the
-    /// specified `kind` (typically, the figure's body) and should return
-    /// content.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     ///
     /// ```example
     /// #figure(
@@ -422,7 +256,6 @@ pub struct FigureElem {
     /// ```
     pub supplement: Smart<Option<Supplement>>,
 
-<<<<<<< HEAD
     /// 番号の付け方。[番号付けのパターンや関数]($numbering)を受け付けます。
     #[default(Some(NumberingPattern::from_str("1").unwrap().into()))]
     pub numbering: Option<Numbering>,
@@ -443,30 +276,6 @@ pub struct FigureElem {
     /// - 独自の図表kindに対して: `{counter(figure.where(kind: kind))}`
     ///
     /// 数字をスキップしたり、カウンターをリセットしたい場合は、これらのカウンターを修正する必要があります。
-=======
-    /// How to number the figure. Accepts a
-    /// [numbering pattern or function]($numbering) taking a single number.
-    #[default(Some(NumberingPattern::from_str("1").unwrap().into()))]
-    pub numbering: Option<Numbering>,
-
-    /// The vertical gap between the body and caption.
-    #[default(Em::new(0.65).into())]
-    pub gap: Length,
-
-    /// Whether the figure should appear in an [`outline`] of figures.
-    #[default(true)]
-    pub outlined: bool,
-
-    /// Convenience field to get access to the counter for this figure.
-    ///
-    /// The counter only depends on the `kind`:
-    /// - For [tables]($table): `{counter(figure.where(kind: table))}`
-    /// - For [images]($image): `{counter(figure.where(kind: image))}`
-    /// - For a custom kind: `{counter(figure.where(kind: kind))}`
-    ///
-    /// These are the counters you'll need to modify if you want to skip a
-    /// number or reset the counter.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     #[synthesized]
     pub counter: Option<Counter>,
 
@@ -642,23 +451,12 @@ impl Outlinable for Packed<FigureElem> {
     }
 }
 
-<<<<<<< HEAD
 /// 図のキャプション。
 /// この要素は、全ての図や特定の種類の図のキャプションの外観を改変するために、
 /// setルールやshowルールで使用可能です。
 ///
 /// キャプションは、`pos`と`body`に加えて、図の`kind`や`supplement`、`counter`、`numbering`もフィールドとして提供します。
 /// これらの要素を[`where`]($function.where)セレクターやshowルールで使用することで、独自のキャプションを構築できます。
-=======
-/// The caption of a figure. This element can be used in set and show rules to
-/// customize the appearance of captions for all figures or figures of a
-/// specific kind.
-///
-/// In addition to its `position` and `body`, the `caption` also provides the
-/// figure's `kind`, `supplement`, `counter`, and `numbering` as fields. These
-/// parts can be used in [`where`]($function.where) selectors and show rules to
-/// build a completely custom caption.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 ///
 /// ```example
 /// #show figure.caption: emph
@@ -670,11 +468,7 @@ impl Outlinable for Packed<FigureElem> {
 /// ```
 #[elem(name = "caption", Locatable, Tagged, Synthesize)]
 pub struct FigureCaption {
-<<<<<<< HEAD
     /// 図表の中のキャプションの位置。`{top}`や`{bottom}`を入力してください。
-=======
-    /// The caption's position in the figure. Either `{top}` or `{bottom}`.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     ///
     /// ```example
     /// #show figure.where(
@@ -702,17 +496,10 @@ pub struct FigureCaption {
     #[default(OuterVAlignment::Bottom)]
     pub position: OuterVAlignment,
 
-<<<<<<< HEAD
     /// 番号とキャプション名の間に表示する区切り文字。
     ///
     /// `{auto}`に設定すると、区切り文字は
     /// [language]($text.lang)と[region]($text.region)に応じて決まります。
-=======
-    /// The separator which will appear between the number and body.
-    ///
-    /// If set to `{auto}`, the separator will be adapted to the current
-    /// [language]($text.lang) and [region]($text.region).
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     ///
     /// ```example
     /// #set figure.caption(separator: [ --- ])
@@ -724,17 +511,10 @@ pub struct FigureCaption {
     /// ```
     pub separator: Smart<Content>,
 
-<<<<<<< HEAD
     /// キャプション名。
     ///
     /// キャプションを独自のものへ改変するために
     /// `kind`、`supplement`、`counter`、`numbering`、`location`が同時に使えます。
-=======
-    /// The caption's body.
-    ///
-    /// Can be used alongside `kind`, `supplement`, `counter`, `numbering`, and
-    /// `location` to completely customize the caption.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     ///
     /// ```example
     /// #show figure.caption: it => [
diff --git a/crates/typst-library/src/model/footnote.rs b/crates/typst-library/src/model/footnote.rs
index 6ac05bba2d..76c4e59f1e 100644
--- a/crates/typst-library/src/model/footnote.rs
+++ b/crates/typst-library/src/model/footnote.rs
@@ -16,7 +16,6 @@ use crate::model::{Destination, DirectLinkElem, Numbering, NumberingPattern, Par
 use crate::text::{LocalName, SuperElem, TextElem, TextSize};
 use crate::visualize::{LineElem, Stroke};
 
-<<<<<<< HEAD
 /// 脚注。
 ///
 /// 脚注を用いて追加のコメントや参考文献を同じページに記述します。
@@ -31,40 +30,16 @@ use crate::visualize::{LineElem, Stroke};
 /// また、showルールを適用して、本文中の脚注マーカー（上付き番号）のみをカスタマイズできます。
 ///
 /// # 例
-=======
-/// A footnote.
-///
-/// Includes additional remarks and references on the same page with footnotes.
-/// A footnote will insert a superscript number that links to the note at the
-/// bottom of the page. Notes are numbered sequentially throughout your document
-/// and can break across multiple pages.
-///
-/// To customize the appearance of the entry in the footnote listing, see
-/// [`footnote.entry`]. The footnote itself is realized as a normal superscript,
-/// so you can use a set rule on the [`super`] function to customize it. You can
-/// also apply a show rule to customize only the footnote marker (superscript
-/// number) in the running text.
-///
-/// # Example
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 /// ```example
 /// Check the docs for more details.
 /// #footnote[https://typst.app/docs]
 /// ```
 ///
-<<<<<<< HEAD
 /// 脚注は、マークアップにおいて前の単語との間にスペースがあったとしても、
 /// 自動的にその単語に付加されます。
 /// スペースを強制するには、文字列の`[#" "]`や明示的な[horizontal spacing]($h)を使用できます。
 ///
 /// 脚注にラベルをつけることにより、脚注に対して複数の参照を持てます。
-=======
-/// The footnote automatically attaches itself to the preceding word, even if
-/// there is a space before it in the markup. To force space, you can use the
-/// string `[#" "]` or explicit [horizontal spacing]($h).
-///
-/// By giving a label to a footnote, you can have multiple references to it.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 ///
 /// ```example
 /// You can edit Typst documents online.
@@ -73,26 +48,15 @@ use crate::visualize::{LineElem, Stroke};
 /// And the online app. #footnote(<fn>)
 /// ```
 ///
-<<<<<<< HEAD
 /// _注意:_ `footnote`が呼び出されるスコープ内でのsetルールやshowルールは、脚注のコンテンツに適用されない場合があります。
 /// 詳細については[こちら][issue]を参照してください。
 ///
 /// # アクセシビリティ
 /// 脚注は、マークアップと同様に、参照位置の直後で支援技術（AT）に読み上げられます。
-=======
-/// _Note:_ Set and show rules in the scope where `footnote` is called may not
-/// apply to the footnote's content. See [here][issue] for more information.
-///
-/// # Accessibility
-/// Footnotes will be read by Assistive Technology (AT) immediately after the
-/// spot in the text where they are referenced, just like how they appear in
-/// markup.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 ///
 /// [issue]: https://github.com/typst/typst/issues/1467#issuecomment-1588799440
 #[elem(scope, Locatable, Tagged, Count)]
 pub struct FootnoteElem {
-<<<<<<< HEAD
     /// 脚注の番号付け方法。
     /// 単一の数値を受け取る[番号付けパターンまたは関数]($numbering)を受け付けます。
     ///
@@ -100,15 +64,6 @@ pub struct FootnoteElem {
     /// ページごとに脚注を番号付けしたい場合は、
     /// ページの[header]($page.header)で脚注の[counter]をリセットできます。
     /// 将来的には、これを簡単に実現する方法が提供されるかもしれません。
-=======
-    /// How to number footnotes. Accepts a
-    /// [numbering pattern or function]($numbering) taking a single number.
-    ///
-    /// By default, the footnote numbering continues throughout your document.
-    /// If you prefer per-page footnote numbering, you can reset the footnote
-    /// [counter] in the page [header]($page.header). In the future, there might
-    /// be a simpler way to achieve this.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     ///
     /// ```example
     /// #set footnote(numbering: "*")
@@ -120,13 +75,8 @@ pub struct FootnoteElem {
     #[default(Numbering::Pattern(NumberingPattern::from_str("1").unwrap()))]
     pub numbering: Numbering,
 
-<<<<<<< HEAD
     /// 脚注に挿入するコンテンツ。
     /// この脚注が参照すべき他の脚注のラベルも指定できます。
-=======
-    /// The content to put into the footnote. Can also be the label of another
-    /// footnote this one should point to.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     #[required]
     pub body: FootnoteBody,
 }
@@ -218,12 +168,7 @@ impl Count for Packed<FootnoteElem> {
     }
 }
 
-<<<<<<< HEAD
 /// 脚注の本文は、コンテンツか、別の脚注を参照するラベルのいずれかです。
-=======
-/// The body of a footnote can be either some content or a label referencing
-/// another footnote.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 #[derive(Debug, Clone, PartialEq, Hash)]
 pub enum FootnoteBody {
     Content(Content),
@@ -240,17 +185,10 @@ cast! {
     v: Label => Self::Reference(v),
 }
 
-<<<<<<< HEAD
 /// 脚注リストの項目。
 ///
 /// この関数は直接呼び出されることを意図していません。
 /// 代わりに、setルールやshowルールで脚注リストをカスタマイズするために使用されます。
-=======
-/// An entry in a footnote list.
-///
-/// This function is not intended to be called directly. Instead, it is used in
-/// set and show rules to customize footnote listings.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 ///
 /// ```example
 /// #show footnote.entry: set text(red)
@@ -260,7 +198,6 @@ cast! {
 /// has red text!
 /// ```
 ///
-<<<<<<< HEAD
 /// _注意:_ 脚注項目のプロパティは、
 /// 各ページラン（ページ間に明示的な改ページがないページ群）全体で一貫している必要があります。
 /// このため、脚注項目に対するsetルールやshowルールは普通、ドキュメントの最初の部分など、
@@ -269,16 +206,6 @@ cast! {
 pub struct FootnoteEntry {
     /// この項目の脚注。
     /// その位置を指定して、脚注カウンターの状態を決定できます。
-=======
-/// _Note:_ Footnote entry properties must be uniform across each page run (a
-/// page run is a sequence of pages without an explicit pagebreak in between).
-/// For this reason, set and show rules for footnote entries should be defined
-/// before any page content, typically at the very start of the document.
-#[elem(name = "entry", title = "Footnote Entry", Locatable, Tagged, ShowSet)]
-pub struct FootnoteEntry {
-    /// The footnote for this entry. Its location can be used to determine
-    /// the footnote counter state.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     ///
     /// ```example
     /// #show footnote.entry: it => {
@@ -296,11 +223,7 @@ pub struct FootnoteEntry {
     #[required]
     pub note: Packed<FootnoteElem>,
 
-<<<<<<< HEAD
     /// 文書の本文と脚注リストの間の区切り記号。
-=======
-    /// The separator between the document body and the footnote listing.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     ///
     /// ```example
     /// #set footnote.entry(
@@ -324,11 +247,7 @@ pub struct FootnoteEntry {
     )]
     pub separator: Content,
 
-<<<<<<< HEAD
     /// 文書の本文と区切り記号の間の余白の量。
-=======
-    /// The amount of clearance between the document body and the separator.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     ///
     /// ```example
     /// #set footnote.entry(clearance: 3em)
@@ -341,11 +260,7 @@ pub struct FootnoteEntry {
     #[default(Em::new(1.0).into())]
     pub clearance: Length,
 
-<<<<<<< HEAD
     /// 脚注項目同士の間隔。
-=======
-    /// The gap between footnote entries.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     ///
     /// ```example
     /// #set footnote.entry(gap: 0.8em)
@@ -357,11 +272,7 @@ pub struct FootnoteEntry {
     #[default(Em::new(0.5).into())]
     pub gap: Length,
 
-<<<<<<< HEAD
     /// 各脚注項目の字下げ。
-=======
-    /// The indent of each footnote entry.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     ///
     /// ```example
     /// #set footnote.entry(indent: 0em)
diff --git a/crates/typst-library/src/model/heading.rs b/crates/typst-library/src/model/heading.rs
index acd29a3f60..e41627fbe2 100644
--- a/crates/typst-library/src/model/heading.rs
+++ b/crates/typst-library/src/model/heading.rs
@@ -13,7 +13,6 @@ use crate::layout::{BlockElem, Em, Length};
 use crate::model::{Numbering, Outlinable, Refable, Supplement};
 use crate::text::{FontWeight, LocalName, TextElem, TextSize};
 
-<<<<<<< HEAD
 /// セクションの見出し。
 ///
 /// 見出しを使うことで、文書をセクションとして構造化できます。
@@ -36,33 +35,6 @@ use crate::text::{FontWeight, LocalName, TextElem, TextSize};
 /// これにより、見出しがページ末に残り本文が次ページに送られる「孤立」状態を防げます。
 ///
 /// # 例
-=======
-/// A section heading.
-///
-/// With headings, you can structure your document into sections. Each heading
-/// has a _level,_ which starts at one and is unbounded upwards. This level
-/// indicates the logical role of the following content (section, subsection,
-/// etc.) A top-level heading indicates a top-level section of the document (not
-/// the document's title). To insert a title, use the [`title`]($title) element
-/// instead.
-///
-/// Typst can automatically number your headings for you. To enable numbering,
-/// specify how you want your headings to be numbered with a
-/// [numbering pattern or function]($numbering).
-///
-/// Independently of the numbering, Typst can also automatically generate an
-/// [outline] of all headings for you. To exclude one or more headings from this
-/// outline, you can set the `outlined` parameter to `{false}`.
-///
-/// When writing a [show rule]($styling/#show-rules) that accesses the
-/// [`body` field]($heading.body) to create a completely custom look for
-/// headings, make sure to wrap the content in a [`block`]($block) (which is
-/// implicitly [sticky]($block.sticky) for headings through a built-in show-set
-/// rule). This prevents headings from becoming "orphans", i.e. remaining
-/// at the end of the page with the following content being on the next page.
-///
-/// # Example
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 /// ```example
 /// #set heading(numbering: "1.a)")
 ///
@@ -73,7 +45,6 @@ use crate::text::{FontWeight, LocalName, TextElem, TextSize};
 /// To start, ...
 /// ```
 ///
-<<<<<<< HEAD
 /// # 構文
 /// 見出しには専用の構文があります。
 /// 行の先頭に等号を1つ以上入力し、その後にスペースを入力することで見出しを作成できます。
@@ -103,42 +74,6 @@ pub struct HeadingElem {
     /// これは主に[showルール]($styling/#show-rules)で利用する際に役立ちます
     /// （[`where`]($function.where)セレクターを使う場合や
     /// 表示された見出しのレベルに直接アクセスする場合など）。
-=======
-/// # Syntax
-/// Headings have dedicated syntax: They can be created by starting a line with
-/// one or multiple equals signs, followed by a space. The number of equals
-/// signs determines the heading's logical nesting depth. The `{offset}` field
-/// can be set to configure the starting depth.
-///
-/// # Accessibility
-/// Headings are important for accessibility, as they help users of Assistive
-/// Technologies (AT) like screen readers to navigate within your document.
-/// Screen reader users will be able to skip from heading to heading, or get an
-/// overview of all headings in the document.
-///
-/// To make your headings accessible, you should not skip heading levels. This
-/// means that you should start with a first-level heading. Also, when the
-/// previous heading was of level 3, the next heading should be of level 3
-/// (staying at the same depth), level 4 (going exactly one level deeper), or
-/// level 1 or 2 (new hierarchically higher headings).
-///
-/// # HTML export
-/// As mentioned above, a top-level heading indicates a top-level section of
-/// the document rather than its title. This is in contrast to the HTML `<h1>`
-/// element of which there should be only one per document.
-///
-/// For this reason, in HTML export, a [`title`] element will turn into an
-/// `<h1>` and headings turn into `<h2>` and lower (a level 1 heading thus turns
-/// into `<h2>`, a level 2 heading into `<h3>`, etc).
-#[elem(Locatable, Tagged, Synthesize, Count, ShowSet, LocalName, Refable, Outlinable)]
-pub struct HeadingElem {
-    /// The absolute nesting depth of the heading, starting from one. If set
-    /// to `{auto}`, it is computed from `{offset + depth}`.
-    ///
-    /// This is primarily useful for usage in [show rules]($styling/#show-rules)
-    /// (either with [`where`]($function.where) selectors or by accessing the
-    /// level directly on a shown heading).
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     ///
     /// ```example
     /// #show heading.where(level: 2): set text(red)
@@ -152,7 +87,6 @@ pub struct HeadingElem {
     /// ```
     pub level: Smart<NonZeroUsize>,
 
-<<<<<<< HEAD
     /// 1から始まる、見出しの相対的なネストの深さ。
     /// この値は`{offset}`と組み合わせて、実際の`{level}`を計算するのに用いられます。
     ///
@@ -165,20 +99,6 @@ pub struct HeadingElem {
 
     /// 各見出しの`{level}`の開始オフセットであり、
     /// 相対的な`{depth}`を絶対的な`{level}`へ変換するために使用されます。
-=======
-    /// The relative nesting depth of the heading, starting from one. This is
-    /// combined with `{offset}` to compute the actual `{level}`.
-    ///
-    /// This is set by the heading syntax, such that `[== Heading]` creates a
-    /// heading with logical depth of 2, but actual level `{offset + 2}`. If you
-    /// construct a heading manually, you should typically prefer this over
-    /// setting the absolute level.
-    #[default(NonZeroUsize::ONE)]
-    pub depth: NonZeroUsize,
-
-    /// The starting offset of each heading's `{level}`, used to turn its
-    /// relative `{depth}` into its absolute `{level}`.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     ///
     /// ```example
     /// = Level 1
@@ -192,14 +112,9 @@ pub struct HeadingElem {
     /// ```
     #[default(0)]
     pub offset: usize,
-<<<<<<< HEAD
+
     /// 見出しを番号付けする方法。
     /// [番号付けパターンまたは関数]($numbering)を指定できます（複数の数値を受け取ります）。
-=======
-
-    /// How to number the heading. Accepts a
-    /// [numbering pattern or function]($numbering) taking multiple numbers.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     ///
     /// ```example
     /// #set heading(numbering: "1.a.")
@@ -210,7 +125,6 @@ pub struct HeadingElem {
     /// ```
     pub numbering: Option<Numbering>,
 
-<<<<<<< HEAD
     /// 解決済みのプレーンテキストの番号。
     ///
     /// このフィールドは内部用で、PDFのしおり作成にのみ使われます。
@@ -218,35 +132,16 @@ pub struct HeadingElem {
     /// カウンターや番号付けパターンを具体的な文字列として解決するために必要です。
     ///
     /// `numbering`が`None`の場合は設定されません。
-=======
-    /// The resolved plain-text numbers.
-    ///
-    /// This field is internal and only used for creating PDF bookmarks. We
-    /// don't currently have access to `World`, `Engine`, or `styles` in export,
-    /// which is needed to resolve the counter and numbering pattern into a
-    /// concrete string.
-    ///
-    /// This remains unset if `numbering` is `None`.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     #[internal]
     #[synthesized]
     pub numbers: EcoString,
 
-<<<<<<< HEAD
     /// 見出しに用いる補足語。
     ///
     /// 見出しを参照する際、補足語が参照番号の前に追加されます。
     ///
     /// 関数を指定した場合、参照された見出しが引数として渡され、
     /// その関数は表示されるコンテンツを返す必要があります。
-=======
-    /// A supplement for the heading.
-    ///
-    /// For references to headings, this is added before the referenced number.
-    ///
-    /// If a function is specified, it is passed the referenced heading and
-    /// should return content.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     ///
     /// ```example
     /// #set heading(numbering: "1.", supplement: [Chapter])
@@ -259,19 +154,11 @@ pub struct HeadingElem {
     /// ```
     pub supplement: Smart<Option<Supplement>>,
 
-<<<<<<< HEAD
     /// 見出しを[目次]($outline)に表示するかどうか。
     ///
     /// なお、このプロパティを`{true}`に設定すると、
     /// PDFへのエクスポート時に、見出しがPDFの目次にしおりとしても表示されます。
     /// この動作を変更するには、`bookmarked`プロパティを使用してください。
-=======
-    /// Whether the heading should appear in the [outline].
-    ///
-    /// Note that this property, if set to `{true}`, ensures the heading is also
-    /// shown as a bookmark in the exported PDF's outline (when exporting to
-    /// PDF). To change that behavior, use the `bookmarked` property.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     ///
     /// ```example
     /// #outline()
@@ -286,7 +173,6 @@ pub struct HeadingElem {
     #[default(true)]
     pub outlined: bool,
 
-<<<<<<< HEAD
     /// エクスポートされたPDFの目次に見出しをしおりとして表示するかどうか。
     /// PNGなどの他のエクスポート形式には影響しません。
     ///
@@ -295,16 +181,6 @@ pub struct HeadingElem {
     /// PDFエクスポート時の目次に表示されることを示します。
     /// このプロパティを`{true}`（しおりあり）または`{false}`（しおりなし）に設定すると、
     /// この動作を無視します。
-=======
-    /// Whether the heading should appear as a bookmark in the exported PDF's
-    /// outline. Doesn't affect other export formats, such as PNG.
-    ///
-    /// The default value of `{auto}` indicates that the heading will only
-    /// appear in the exported PDF's outline if its `outlined` property is set
-    /// to `{true}`, that is, if it would also be listed in Typst's [outline].
-    /// Setting this property to either `{true}` (bookmark) or `{false}` (don't
-    /// bookmark) bypasses that behavior.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     ///
     /// ```example
     /// #heading[Normal heading]
@@ -319,19 +195,11 @@ pub struct HeadingElem {
     #[default(Smart::Auto)]
     pub bookmarked: Smart<bool>,
 
-<<<<<<< HEAD
     /// 見出しの最初の行を除く全ての行に適用されるインデント。
     ///
     /// デフォルト値の`{auto}`では、見出しが[テキスト方向]($text.dir)の
     /// [start]($direction.start)に揃えられている場合、番号の幅をインデントとして
     /// 使用します。中央揃えやそれ以外の配置ではインデントしません。
-=======
-    /// The indent all but the first line of a heading should have.
-    ///
-    /// The default value of `{auto}` uses the width of the numbering as indent
-    /// if the heading is aligned at the [start]($direction.start) of the [text
-    /// direction]($text.dir), and no indent for center and other alignments.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     ///
     /// ```example
     /// #set heading(numbering: "1.")
@@ -343,11 +211,7 @@ pub struct HeadingElem {
     #[default(Smart::Auto)]
     pub hanging_indent: Smart<Length>,
 
-<<<<<<< HEAD
     /// 見出しのタイトル。
-=======
-    /// The heading's title.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     #[required]
     pub body: Content,
 }
@@ -377,14 +241,6 @@ impl Synthesize for Packed<HeadingElem> {
 
         if let Some((numbering, location)) =
             self.numbering.get_ref(styles).as_ref().zip(self.location())
-<<<<<<< HEAD
-        {
-            self.numbers = Some(
-                self.counter()
-                    .display_at_loc(engine, location, styles, numbering)?
-                    .plain_text(),
-            );
-=======
             // We are not early returning on error here because of
             // https://github.com/typst/typst/issues/7428
             //
@@ -398,7 +254,6 @@ impl Synthesize for Packed<HeadingElem> {
             )
         {
             self.numbers = Some(numbers.plain_text());
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
         }
 
         let elem = self.as_mut();
diff --git a/crates/typst-library/src/model/link.rs b/crates/typst-library/src/model/link.rs
index 678336cffe..0a6a1169ae 100644
--- a/crates/typst-library/src/model/link.rs
+++ b/crates/typst-library/src/model/link.rs
@@ -7,13 +7,8 @@ use ecow::{EcoString, eco_format};
 use crate::diag::{SourceResult, StrResult, bail};
 use crate::engine::Engine;
 use crate::foundations::{
-<<<<<<< HEAD
     Args, Construct, Content, Label, Packed, Repr, Selector, ShowSet, Smart,
     StyleChain, Styles, cast, elem,
-=======
-    Args, Construct, Content, Label, Packed, Repr, Selector, ShowSet, Smart, StyleChain,
-    Styles, cast, elem,
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 };
 use crate::introspection::{
     Counter, CounterKey, Introspector, Locatable, Location, Tagged,
@@ -22,21 +17,12 @@ use crate::layout::{PageElem, Position};
 use crate::model::{NumberingPattern, Refable};
 use crate::text::{LocalName, TextElem};
 
-<<<<<<< HEAD
 /// URLや文書中の位置へのリンク。
 ///
 /// デフォルトでは、リンクの外見は通常のテキストと変わりません。
 /// しかし、showルールを使うことで、簡単に任意のスタイルを適用できます。
 ///
 /// # 例
-=======
-/// Links to a URL or a location in the document.
-///
-/// By default, links do not look any different from normal text. However,
-/// you can easily apply a style of your choice with a show rule.
-///
-/// # Example
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 /// ```example
 /// #show link: underline
 ///
@@ -48,7 +34,6 @@ use crate::text::{LocalName, TextElem};
 /// ]
 /// ```
 ///
-<<<<<<< HEAD
 /// # 構文
 /// この関数には専用の構文もあります。
 /// `http://`や`https://`で始まるテキストは、自動的にリンクに変換されます。
@@ -117,90 +102,6 @@ pub struct LinkElem {
     ///   - [整数]($int)型の`page`キーと[`length`]型の`x`座標、`y`座標を持つ辞書。
     ///     ページ番号は1から始まり、
     ///     座標はページの左上隅からの相対位置です。
-=======
-/// # Syntax
-/// This function also has dedicated syntax: Text that starts with `http://` or
-/// `https://` is automatically turned into a link.
-///
-/// # Hyphenation
-/// If you enable hyphenation or justification, by default, it will not apply to
-/// links to prevent unwanted hyphenation in URLs. You can opt out of this
-/// default via `{show link: set text(hyphenate: true)}`.
-///
-/// # Accessibility
-/// The destination of a link should be clear from the link text itself, or at
-/// least from the text immediately surrounding it. In PDF export, Typst will
-/// automatically generate a tooltip description for links based on their
-/// destination. For links to URLs, the URL itself will be used as the tooltip.
-///
-/// # Links in HTML export
-/// In HTML export, a link to a [label] or [location] will be turned into a
-/// fragment link to a named anchor point. To support this, targets without an
-/// existing ID will automatically receive an ID in the DOM. How this works
-/// varies by which kind of HTML node(s) the link target turned into:
-///
-/// - If the link target turned into a single HTML element, that element will
-///   receive the ID. This is, for instance, typically the case when linking to
-///   a top-level heading (which turns into a single `<h2>` element).
-///
-/// - If the link target turned into a single text node, the node will be
-///   wrapped in a `<span>`, which will then receive the ID.
-///
-/// - If the link target turned into multiple nodes, the first node will receive
-///   the ID.
-///
-/// - If the link target turned into no nodes at all, an empty span will be
-///   generated to serve as a link target.
-///
-/// If you rely on a specific DOM structure, you should ensure that the link
-/// target turns into one or multiple elements, as the compiler makes no
-/// guarantees on the precise segmentation of text into text nodes.
-///
-/// If present, the automatic ID generation tries to reuse the link target's
-/// label to create a human-readable ID. A label can be reused if:
-///
-/// - All characters are alphabetic or numeric according to Unicode, or a
-///   hyphen, or an underscore.
-///
-/// - The label does not start with a digit or hyphen.
-///
-/// These rules ensure that the label is both a valid CSS identifier and a valid
-/// URL fragment for linking.
-///
-/// As IDs must be unique in the DOM, duplicate labels might need disambiguation
-/// when reusing them as IDs. The precise rules for this are as follows:
-///
-/// - If a label can be reused and is unique in the document, it will directly
-///   be used as the ID.
-///
-/// - If it's reusable, but not unique, a suffix consisting of a hyphen and an
-///   integer will be added. For instance, if the label `<mylabel>` exists
-///   twice, it would turn into `mylabel-1` and `mylabel-2`.
-///
-/// - Otherwise, a unique ID of the form `loc-` followed by an integer will be
-///   generated.
-#[elem(Locatable)]
-pub struct LinkElem {
-    /// The destination the link points to.
-    ///
-    /// - To link to web pages, `dest` should be a valid URL string. If the URL
-    ///   is in the `mailto:` or `tel:` scheme and the `body` parameter is
-    ///   omitted, the email address or phone number will be the link's body,
-    ///   without the scheme.
-    ///
-    /// - To link to another part of the document, `dest` can take one of three
-    ///   forms:
-    ///   - A [label] attached to an element. If you also want automatic text
-    ///     for the link based on the element, consider using a
-    ///     [reference]($ref) instead.
-    ///
-    ///   - A [`location`] (typically retrieved from [`here`], [`locate`] or
-    ///     [`query`]).
-    ///
-    ///   - A dictionary with a `page` key of type [integer]($int) and `x` and
-    ///     `y` coordinates of type [length]. Pages are counted from one, and
-    ///     the coordinates are relative to the page's top left corner.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     ///
     /// ```example
     /// = Introduction <intro>
@@ -217,17 +118,10 @@ pub struct LinkElem {
     )]
     pub dest: LinkTarget,
 
-<<<<<<< HEAD
     /// リンクとして表示するコンテンツ。
     ///
     /// `dest`がURL文字列の場合、このパラメーターは省略可能です。
     /// この場合、URLがリンクとして表示されます。
-=======
-    /// The content that should become a link.
-    ///
-    /// If `dest` is an URL string, the parameter can be omitted. In this case,
-    /// the URL will be shown as the link.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     #[required]
     #[parse(match &dest {
         LinkTarget::Dest(Destination::Url(url)) => match args.eat()? {
diff --git a/crates/typst-library/src/model/list.rs b/crates/typst-library/src/model/list.rs
index 23aa6872a1..f10dfe13f0 100644
--- a/crates/typst-library/src/model/list.rs
+++ b/crates/typst-library/src/model/list.rs
@@ -10,21 +10,12 @@ use crate::introspection::{Locatable, Tagged};
 use crate::layout::{Em, Length};
 use crate::text::TextElem;
 
-<<<<<<< HEAD
 /// 箇条書きリスト。
 ///
 /// 各項目の先頭にマーカーを付け、
 /// 一連の項目を縦に並べて表示します。
 ///
 /// # 例
-=======
-/// A bullet list.
-///
-/// Displays a sequence of items vertically, with each item introduced by a
-/// marker.
-///
-/// # Example
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 /// ```example
 /// Normal list.
 /// - Text
@@ -45,7 +36,6 @@ use crate::text::TextElem;
 /// )
 /// ```
 ///
-<<<<<<< HEAD
 /// # 構文
 /// この関数には専用の構文もあります。
 /// 行頭にハイフンとスペースを置くことでリスト項目を作成します。
@@ -63,26 +53,6 @@ pub struct ListElem {
     /// 項目間に空行がなく連続している場合、この値は`{true}`に設定されますが、
     /// 項目間が空行で区切られている場合は`{false}`に設定されます。
     /// マークアップで定義された間隔はsetルールで上書きできません。
-=======
-/// # Syntax
-/// This functions also has dedicated syntax: Start a line with a hyphen,
-/// followed by a space to create a list item. A list item can contain multiple
-/// paragraphs and other block-level content. All content that is indented
-/// more than an item's marker becomes part of that item.
-#[elem(scope, title = "Bullet List", Locatable, Tagged)]
-pub struct ListElem {
-    /// Defines the default [spacing]($list.spacing) of the list. If it is
-    /// `{false}`, the items are spaced apart with
-    /// [paragraph spacing]($par.spacing). If it is `{true}`, they use
-    /// [paragraph leading]($par.leading) instead. This makes the list more
-    /// compact, which can look better if the items are short.
-    ///
-    /// In markup mode, the value of this parameter is determined based on
-    /// whether items are separated with a blank line. If items directly follow
-    /// each other, this is set to `{true}`; if items are separated by a blank
-    /// line, this is set to `{false}`. The markup-defined tightness cannot be
-    /// overridden with set rules.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     ///
     /// ```example
     /// - If a list has a lot of text, and
@@ -95,7 +65,6 @@ pub struct ListElem {
     #[default(true)]
     pub tight: bool,
 
-<<<<<<< HEAD
     /// 各項目の先頭に付けるマーカー。
     ///
     /// 単純なコンテンツの代わりに、ネストされたリストに使用する、
@@ -103,15 +72,6 @@ pub struct ListElem {
     /// リストのネストの深さがマーカーの数を超えた場合、使用されるマーカーは循環します。
     /// 完全に制御したい場合は、
     /// リストのネストの深さ（`{0}`から開始する）に応じて、使用するマーカーを決める関数も渡せます。
-=======
-    /// The marker which introduces each item.
-    ///
-    /// Instead of plain content, you can also pass an array with multiple
-    /// markers that should be used for nested lists. If the list nesting depth
-    /// exceeds the number of markers, the markers are cycled. For total
-    /// control, you may pass a function that maps the list's nesting depth
-    /// (starting from `{0}`) to a desired marker.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     ///
     /// ```example
     /// #set list(marker: [--])
@@ -134,7 +94,6 @@ pub struct ListElem {
     ]))]
     pub marker: ListMarker,
 
-<<<<<<< HEAD
     /// 各項目のインデント。
     pub indent: Length,
 
@@ -153,26 +112,6 @@ pub struct ListElem {
     ///
     /// list構文を使用する場合、forループのような構造を挟んでも、
     /// 隣接する項目は自動的にリストとしてまとめられます。
-=======
-    /// The indent of each item.
-    pub indent: Length,
-
-    /// The spacing between the marker and the body of each item.
-    #[default(Em::new(0.5).into())]
-    pub body_indent: Length,
-
-    /// The spacing between the items of the list.
-    ///
-    /// If set to `{auto}`, uses paragraph [`leading`]($par.leading) for tight
-    /// lists and paragraph [`spacing`]($par.spacing) for wide (non-tight)
-    /// lists.
-    pub spacing: Smart<Length>,
-
-    /// The bullet list's children.
-    ///
-    /// When using the list syntax, adjacent items are automatically collected
-    /// into lists, even through constructs like for loops.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     ///
     /// ```example
     /// #for letter in "ABC" [
@@ -182,11 +121,7 @@ pub struct ListElem {
     #[variadic]
     pub children: Vec<Packed<ListItem>>,
 
-<<<<<<< HEAD
     /// ネストの深さ。
-=======
-    /// The nesting depth.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     #[internal]
     #[fold]
     #[ghost]
@@ -199,17 +134,10 @@ impl ListElem {
     type ListItem;
 }
 
-<<<<<<< HEAD
 /// 箇条書きリストの項目。
 #[elem(name = "item", title = "Bullet List Item", Tagged)]
 pub struct ListItem {
     /// 項目の本文。
-=======
-/// A bullet list item.
-#[elem(name = "item", title = "Bullet List Item", Tagged)]
-pub struct ListItem {
-    /// The item's body.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     #[required]
     pub body: Content,
 }
diff --git a/crates/typst-library/src/model/numbering.rs b/crates/typst-library/src/model/numbering.rs
index a847a1094c..f238bf0456 100644
--- a/crates/typst-library/src/model/numbering.rs
+++ b/crates/typst-library/src/model/numbering.rs
@@ -10,7 +10,6 @@ use crate::diag::SourceResult;
 use crate::engine::Engine;
 use crate::foundations::{Context, Func, Str, Value, cast, func};
 
-<<<<<<< HEAD
 /// 順序に応じた番号付け。
 ///
 /// 番号付けは、一連の数値をコンテンツとしてどのように表示するかを定義します。
@@ -21,19 +20,6 @@ use crate::foundations::{Context, Func, Str, Value, cast, func};
 /// そのままの形で繰り返し使用されます。
 ///
 /// # 例
-=======
-/// Applies a numbering to a sequence of numbers.
-///
-/// A numbering defines how a sequence of numbers should be displayed as
-/// content. It is defined either through a pattern string or an arbitrary
-/// function.
-///
-/// A numbering pattern consists of counting symbols, for which the actual
-/// number is substituted, their prefixes, and one suffix. The prefixes and the
-/// suffix are displayed as-is.
-///
-/// # Example
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 /// ```example
 /// #numbering("1.1)", 1, 2, 3) \
 /// #numbering("1.a.i", 1, 2) \
@@ -47,24 +33,12 @@ use crate::foundations::{Context, Func, Str, Value, cast, func};
 /// )
 /// ```
 ///
-<<<<<<< HEAD
 /// # 番号付けのパターン指定と関数指定
 /// Typstではパターン指定または関数指定で番号付けを定義できる場面がいくつかあります。
 /// 例えば、[見出し]($heading)や[図表]($figure)などに番号を付ける際に使用します。
 /// いずれの場合も、指定の形式は後述する[`numbering`]($numbering.numbering)パラメーターと同じです。
 ///
 /// 次の例は、番号付け用の関数が、単に数値を受け取って[`content`]を返す通常の[function]であることを示しています。
-=======
-/// # Numbering patterns and numbering functions
-/// There are multiple instances where you can provide a numbering pattern or
-/// function in Typst. For example, when defining how to number
-/// [headings]($heading) or [figures]($figure). Every time, the expected format
-/// is the same as the one described below for the
-/// [`numbering`]($numbering.numbering) parameter.
-///
-/// The following example illustrates that a numbering function is just a
-/// regular [function] that accepts numbers and returns [`content`].
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 /// ```example
 /// #let unary(.., last) = "|" * last
 /// #set heading(numbering: unary)
@@ -76,7 +50,6 @@ use crate::foundations::{Context, Func, Str, Value, cast, func};
 pub fn numbering(
     engine: &mut Engine,
     context: Tracked<Context>,
-<<<<<<< HEAD
     /// 番号付けの表示形式を定義します。
     ///
     /// **カウント記号**として使用できるパターン文字は `1`, `a`, `A`, `i`, `I`, `α`, `Α`, `一`, `壹`, `あ`, `い`, `ア`, `イ`, `א`, `가`, `ㄱ`, `*`, `١`, `۱`, `१`, `১`, `ক`, `①`, `⓵`があります。
@@ -101,40 +74,6 @@ pub fn numbering(
     ///
     /// 番号付けがパターン指定であり、カウント記号よりも多くの数値が指定された場合、
     /// 最後のカウント記号とそのプレフィックスが繰り返されます。
-=======
-    /// Defines how the numbering works.
-    ///
-    /// **Counting symbols** are `1`, `a`, `A`, `i`, `I`, `α`, `Α`, `一`, `壹`,
-    /// `あ`, `い`, `ア`, `イ`, `א`, `가`, `ㄱ`, `*`, `١`, `۱`, `१`, `১`, `ক`,
-    /// `①`, and `⓵`. They are replaced by the number in the sequence,
-    /// preserving the original case.
-    ///
-    /// The `*` character means that symbols should be used to count, in the
-    /// order of `*`, `†`, `‡`, `§`, `¶`, `‖`. If there are more than six
-    /// items, the number is represented using repeated symbols.
-    ///
-    /// **Suffixes** are all characters after the last counting symbol. They are
-    /// displayed as-is at the end of any rendered number.
-    ///
-    /// **Prefixes** are all characters that are neither counting symbols nor
-    /// suffixes. They are displayed as-is at in front of their rendered
-    /// equivalent of their counting symbol.
-    ///
-    /// This parameter can also be an arbitrary function that gets each number
-    /// as an individual argument. When given a function, the `numbering`
-    /// function just forwards the arguments to that function. While this is not
-    /// particularly useful in itself, it means that you can just give arbitrary
-    /// numberings to the `numbering` function without caring whether they are
-    /// defined as a pattern or function.
-    numbering: Numbering,
-    /// The numbers to apply the numbering to. Must be non-negative.
-    ///
-    /// In general, numbers are counted from one. A number of zero indicates
-    /// that the first element has not yet appeared.
-    ///
-    /// If `numbering` is a pattern and more numbers than counting symbols are
-    /// given, the last counting symbol with its prefix is repeated.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     #[variadic]
     numbers: Vec<u64>,
 ) -> SourceResult<Value> {
diff --git a/crates/typst-library/src/model/outline.rs b/crates/typst-library/src/model/outline.rs
index ffb6f700eb..e613292117 100644
--- a/crates/typst-library/src/model/outline.rs
+++ b/crates/typst-library/src/model/outline.rs
@@ -23,24 +23,12 @@ use crate::layout::{
 use crate::model::{HeadingElem, NumberingPattern, ParElem, Refable};
 use crate::pdf::PdfMarkerTag;
 use crate::text::{LocalName, SpaceElem, TextElem};
-<<<<<<< HEAD
 /// 目次や図表などのアウトライン。
 ///
 /// この関数は、指定した[`depth`]($outline.depth)までに登場する要素を文書内から抽出し、その一覧（アウトライン）を生成します。
 /// 各要素には、その見出しやキャプションとともに、その要素の番号やページ番号がアウトライン形式で表示されます。
 ///
 /// # 例
-=======
-
-/// A table of contents, figures, or other elements.
-///
-/// This function generates a list of all occurrences of an element in the
-/// document, up to a given [`depth`]($outline.depth). The element's numbering
-/// and page number will be displayed in the outline alongside its title or
-/// caption.
-///
-/// # Example
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 /// ```example
 /// #set heading(numbering: "1.")
 /// #outline()
@@ -53,7 +41,6 @@ use crate::text::{LocalName, SpaceElem, TextElem};
 /// #lorem(10)
 /// ```
 ///
-<<<<<<< HEAD
 /// # 見出し以外のアウトライン { #alternative-outlines }
 /// デフォルト設定では、この関数は目次（セクション見出しのアウトライン）を生成します。
 /// `target`パラメーターを設定することで、見出し以外の要素のアウトラインも生成できます。
@@ -63,20 +50,6 @@ use crate::text::{LocalName, SpaceElem, TextElem};
 ///
 /// [`where`]($function.where)セレクターを使わずに`figure`のみの指定もできますが、その場合は画像や表、
 /// またその他の素材も含む_全て_の図表がアウトラインに表示されます。
-=======
-/// # Alternative outlines
-/// In its default configuration, this function generates a table of contents.
-/// By setting the `target` parameter, the outline can be used to generate a
-/// list of other kinds of elements than headings.
-///
-/// In the example below, we list all figures containing images by setting
-/// `target` to `{figure.where(kind: image)}`. Just the same, we could have set
-/// it to `{figure.where(kind: table)}` to generate a list of tables.
-///
-/// We could also set it to just `figure`, without using a [`where`]($function.where)
-/// selector, but then the list would contain _all_ figures, be it ones
-/// containing images, tables, or other material.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 ///
 /// ```example
 /// #outline(
@@ -90,7 +63,6 @@ use crate::text::{LocalName, SpaceElem, TextElem};
 /// )
 /// ```
 ///
-<<<<<<< HEAD
 /// # アウトラインのスタイル { #styling-the-outline }
 /// 基本的に、アウトライン本体やその項目に対してプロパティを設定することでスタイルを変更できます。
 /// これにより、アウトラインの[タイトル]($outline.title)、項目の[インデント]($outline.indent)、
@@ -102,22 +74,6 @@ use crate::text::{LocalName, SpaceElem, TextElem};
 /// ## 項目同士の間隔調整 { #entry-spacing }
 /// アウトラインの各項目は[ブロック要素]($block)であるため、通常のブロック間隔設定を用いて、
 /// 項目同士の間隔を調整できます。
-=======
-/// # Styling the outline
-/// At the most basic level, you can style the outline by setting properties on
-/// it and its entries. This way, you can customize the outline's
-/// [title]($outline.title), how outline entries are
-/// [indented]($outline.indent), and how the space between an entry's text and
-/// its page number should be [filled]($outline.entry.fill).
-///
-/// Richer customization is possible through configuration of the outline's
-/// [entries]($outline.entry). The outline generates one entry for each outlined
-/// element.
-///
-/// ## Spacing the entries { #entry-spacing }
-/// Outline entries are [blocks]($block), so you can adjust the spacing between
-/// them with normal block-spacing rules:
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 ///
 /// ```example
 /// #show outline.entry.where(
@@ -133,7 +89,6 @@ use crate::text::{LocalName, SpaceElem, TextElem};
 /// == ACME Tools
 /// ```
 ///
-<<<<<<< HEAD
 /// ## アウトライン項目の構築 { #building-an-entry }
 /// 項目の外観を完全に制御するために、`outline.entry`を変更するshowルールも書けます。
 /// ただし、アウトライン項目を適切に書式設定・インデントするための処理は非常に複雑であり、
@@ -142,18 +97,6 @@ use crate::text::{LocalName, SpaceElem, TextElem};
 /// そのため、必要な部分だけを組み合わせて項目を構築できるよう、さまざまな補助関数が提供されています。
 ///
 /// アウトライン項目に対する既定のshowルールは次のようになっています[^1]。
-=======
-/// ## Building an outline entry from its parts { #building-an-entry }
-/// For full control, you can also write a transformational show rule on
-/// `outline.entry`. However, the logic for properly formatting and indenting
-/// outline entries is quite complex and the outline entry itself only contains
-/// two fields: The level and the outlined element.
-///
-/// For this reason, various helper functions are provided. You can mix and
-/// match these to compose an entry from just the parts you like.
-///
-/// The default show rule for an outline entry looks like this[^1]:
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 /// ```typ
 /// #show outline.entry: it => link(
 ///   it.element.location(),
@@ -161,7 +104,6 @@ use crate::text::{LocalName, SpaceElem, TextElem};
 /// )
 /// ```
 ///
-<<<<<<< HEAD
 /// - [`indented`]($outline.entry.indented)関数は、任意のプレフィックスと内部コンテンツを受け取り、
 ///   適切なインデントを自動的に適用します。
 ///   これにより、異なる項目同士がきれいに揃い、長い見出しも正しく折り返されます。
@@ -174,23 +116,6 @@ use crate::text::{LocalName, SpaceElem, TextElem};
 ///
 /// これらの関数を個別に使うことで、アウトライン項目の書式を変更できます。
 /// 例えば、フィラーやページ番号を完全に削除したい場合は、次のようなshowルールを書けます。
-=======
-/// - The [`indented`]($outline.entry.indented) function takes an optional
-///   prefix and inner content and automatically applies the proper indentation
-///   to it, such that different entries align nicely and long headings wrap
-///   properly.
-///
-/// - The [`prefix`]($outline.entry.prefix) function formats the element's
-///   numbering (if any). It also appends a supplement for certain elements.
-///
-/// - The [`inner`]($outline.entry.inner) function combines the element's
-///   [`body`]($outline.entry.body), the filler, and the
-///   [`page` number]($outline.entry.page).
-///
-/// You can use these individual functions to format the outline entry in
-/// different ways. Let's say, you'd like to fully remove the filler and page
-/// numbers. To achieve this, you could write a show rule like this:
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 ///
 /// ```example
 /// #show outline.entry: it => link(
@@ -206,7 +131,6 @@ use crate::text::{LocalName, SpaceElem, TextElem};
 /// == History
 /// ```
 ///
-<<<<<<< HEAD
 /// [^1]: 数式のアウトラインはこのルールの例外で、本文を持たないためインデント付きのレイアウトは使用しません。
 #[elem(scope, keywords = ["Table of Contents", "toc"], ShowSet, LocalName, Locatable, Tagged)]
 pub struct OutlineElem {
@@ -225,30 +149,6 @@ pub struct OutlineElem {
     /// 特定の種類の要素（画像や表など）だけを含む図表をアウトライン表示したい場合は、
     /// [`where`]($function.where)セレクターで目的の種類を指定できます。
     /// 詳細は[見出し以外のアウトライン]($outline/#alternative-outlines)のセクションをご参照ください。
-=======
-/// [^1]: The outline of equations is the exception to this rule as it does not
-///       have a body and thus does not use indented layout.
-#[elem(scope, keywords = ["Table of Contents", "toc"], ShowSet, LocalName, Locatable, Tagged)]
-pub struct OutlineElem {
-    /// The title of the outline.
-    ///
-    /// - When set to `{auto}`, an appropriate title for the
-    ///   [text language]($text.lang) will be used.
-    /// - When set to `{none}`, the outline will not have a title.
-    /// - A custom title can be set by passing content.
-    ///
-    /// The outline's heading will not be numbered by default, but you can
-    /// force it to be with a show-set rule:
-    /// `{show outline: set heading(numbering: "1.")}`
-    pub title: Smart<Option<Content>>,
-
-    /// The type of element to include in the outline.
-    ///
-    /// To list figures containing a specific kind of element, like an image or
-    /// a table, you can specify the desired kind in a [`where`]($function.where)
-    /// selector. See the section on [alternative outlines]($outline/#alternative-outlines)
-    /// for more details.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     ///
     /// ```example
     /// #outline(
@@ -268,13 +168,8 @@ pub struct OutlineElem {
     #[default(LocatableSelector(HeadingElem::ELEM.select()))]
     pub target: LocatableSelector,
 
-<<<<<<< HEAD
     /// アウトラインに含める要素の最大レベル。
     /// この引数が`{none}`の場合は、全ての要素が含まれます。
-=======
-    /// The maximum level up to which elements are included in the outline. When
-    /// this argument is `{none}`, all elements are included.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     ///
     /// ```example
     /// #set heading(numbering: "1.")
@@ -291,7 +186,6 @@ pub struct OutlineElem {
     /// ```
     pub depth: Option<NonZeroUsize>,
 
-<<<<<<< HEAD
     /// どのようにアウトライン項目をインデントするか。
     ///
     /// - `{auto}`: 入れ子になった項目の番号やプレフィックスを、親項目のタイトル位置に揃えてインデントします。
@@ -305,26 +199,6 @@ pub struct OutlineElem {
     /// - [関数]($function): 関数を使ってさらに細かくカスタマイズできます。
     ///   関数はネストレベルが引数として渡され（最上位要素は0）、相対長さを返します。
     ///   例えば`{n => n * 2em}`なら、単に`{2em}`を指定した場合と同じ結果になります。
-=======
-    /// How to indent the outline's entries.
-    ///
-    /// - `{auto}`: Indents the numbering/prefix of a nested entry with the
-    ///   title of its parent entry. If the entries are not numbered (e.g., via
-    ///   [heading numbering]($heading.numbering)), this instead simply inserts
-    ///   a fixed amount of `{1.2em}` indent per level.
-    ///
-    /// - [Relative length]($relative): Indents the entry by the specified
-    ///   length per nesting level. Specifying `{2em}`, for instance, would
-    ///   indent top-level headings by `{0em}` (not nested), second level
-    ///   headings by `{2em}` (nested once), third-level headings by `{4em}`
-    ///   (nested twice) and so on.
-    ///
-    /// - [Function]($function): You can further customize this setting with a
-    ///   function. That function receives the nesting level as a parameter
-    ///   (starting at 0 for top-level headings/elements) and should return a
-    ///   (relative) length. For example, `{n => n * 2em}` would be equivalent
-    ///   to just specifying `{2em}`.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     ///
     /// ```example
     /// >>> #show heading: none
@@ -567,7 +441,6 @@ pub trait Outlinable: Refable {
     fn body(&self) -> Content;
 }
 
-<<<<<<< HEAD
 /// アウトライン内の項目。
 ///
 /// show-setルールやshowルールをアウトライン項目に適用することで、アウトラインの見た目を柔軟にカスタマイズできます。
@@ -593,37 +466,6 @@ pub struct OutlineEntry {
     /// `{box(width: 1fr, it.fill)}`のように可変長の[`box`]でラップすることが推奨されます。
     ///
     /// [`repeat`]を使う場合には、[`gap`]($repeat.gap)プロパティを調整すると、fillの見た目を微調整できます。
-=======
-/// Represents an entry line in an outline.
-///
-/// With show-set and show rules on outline entries, you can richly customize
-/// the outline's appearance. See the
-/// [section on styling the outline]($outline/#styling-the-outline) for details.
-#[elem(scope, name = "entry", title = "Outline Entry", Locatable, Tagged)]
-pub struct OutlineEntry {
-    /// The nesting level of this outline entry. Starts at `{1}` for top-level
-    /// entries.
-    #[required]
-    pub level: NonZeroUsize,
-
-    /// The element this entry refers to. Its location will be available
-    /// through the [`location`]($content.location) method on the content
-    /// and can be [linked]($link) to.
-    #[required]
-    pub element: Content,
-
-    /// Content to fill the space between the title and the page number. Can be
-    /// set to `{none}` to disable filling.
-    ///
-    /// The `fill` will be placed into a fractionally sized box that spans the
-    /// space between the entry's body and the page number. When using show
-    /// rules to override outline entries, it is thus recommended to wrap the
-    /// fill in a [`box`] with fractional width, i.e.
-    /// `{box(width: 1fr, it.fill)}`.
-    ///
-    /// When using [`repeat`], the [`gap`]($repeat.gap) property can be useful
-    /// to tweak the visual weight of the fill.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     ///
     /// ```example
     /// #set outline.entry(fill: line(length: 100%))
@@ -638,13 +480,8 @@ pub struct OutlineEntry {
     ))]
     pub fill: Option<Content>,
 
-<<<<<<< HEAD
     /// アウトライン項目から所属アウトラインへアクセスできるようにします。
     /// これはハックであり、将来的には適切な祖先参照の仕組みに置き換えるべきものです。
-=======
-    /// Lets outline entries access the outline they are part of. This is a bit
-    /// of a hack and should be superseded by a proper ancestry mechanism.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     #[ghost]
     #[internal]
     pub parent: Option<Packed<OutlineElem>>,
@@ -652,7 +489,6 @@ pub struct OutlineEntry {
 
 #[scope]
 impl OutlineEntry {
-<<<<<<< HEAD
     /// インデント付きの項目レイアウトを作成するための補助関数。
     /// プレフィックスと項目本文を、インデントを考慮して配置します。
     ///
@@ -665,28 +501,12 @@ impl OutlineEntry {
     /// インデントされますが、内部コンテンツはアウトライン全体で整列されるのではなく、
     /// 指定された`gap`分だけプレフィックスからオフセットされます。
     /// 視覚的な説明は[`outline.indent`]を参照してください。
-=======
-    /// A helper function for producing an indented entry layout: Lays out a
-    /// prefix and the rest of the entry in an indent-aware way.
-    ///
-    /// If the parent outline's [`indent`]($outline.indent) is `{auto}`, the
-    /// inner content of all entries at level `N` is aligned with the prefix of
-    /// all entries at level `N + 1`, leaving at least `gap` space between the
-    /// prefix and inner parts. Furthermore, the `inner` contents of all entries
-    /// at the same level are aligned.
-    ///
-    /// If the outline's indent is a fixed value or a function, the prefixes are
-    /// indented, but the inner contents are simply offset from the prefix by
-    /// the specified `gap`, rather than aligning outline-wide. For a visual
-    /// explanation, see [`outline.indent`].
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     #[func(contextual)]
     pub fn indented(
         &self,
         engine: &mut Engine,
         context: Tracked<Context>,
         span: Span,
-<<<<<<< HEAD
         /// `prefix`は、レベルが1段低い項目の`inner`コンテンツと揃うように配置されます。
         ///
         /// デフォルトのshowルールでは`it.prefix()`ですが、自由にカスタマイズできます。
@@ -696,20 +516,6 @@ impl OutlineEntry {
         /// デフォルトのshowルールでは`it.inner()`ですが、自由にカスタマイズできます。
         inner: Content,
         /// プレフィックスと内部コンテンツの間の間隔です。
-=======
-        /// The `prefix` is aligned with the `inner` content of entries that
-        /// have level one less.
-        ///
-        /// In the default show rule, this is just `it.prefix()`, but it can be
-        /// freely customized.
-        prefix: Option<Content>,
-        /// The formatted inner content of the entry.
-        ///
-        /// In the default show rule, this is just `it.inner()`, but it can be
-        /// freely customized.
-        inner: Content,
-        /// The gap between the prefix and the inner content.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
         #[named]
         #[default(Em::new(0.5).into())]
         gap: Length,
@@ -783,18 +589,10 @@ impl OutlineEntry {
             .spanned(span))
     }
 
-<<<<<<< HEAD
     /// 要素の番号付け（存在する場合）の出力形式。
     ///
     /// また、図や数式の場合は、通常のアウトラインと同様に要素の補足語も追加します。
     /// 例えば、見出しであれば`1.1`と出力されますが、図であれば`Figure 1`と出力されます。
-=======
-    /// Formats the element's numbering (if any).
-    ///
-    /// This also appends the element's supplement in case of figures or
-    /// equations. For instance, it would output `1.1` for a heading, but
-    /// `Figure 1` for a figure, as is usual for outlines.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     #[func(contextual)]
     pub fn prefix(
         &self,
@@ -811,15 +609,9 @@ impl OutlineEntry {
         Ok(Some(outlinable.prefix(numbers)))
     }
 
-<<<<<<< HEAD
     /// 項目の規定の内部コンテンツを生成。
     ///
     /// これには、本文とフィラー、ページ番号が含まれます。
-=======
-    /// Creates the default inner content of the entry.
-    ///
-    /// This includes the body, the fill, and page number.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     #[func(contextual)]
     pub fn inner(
         &self,
@@ -832,27 +624,15 @@ impl OutlineEntry {
         self.build_inner(context, span, body, page)
     }
 
-<<<<<<< HEAD
     /// アウトライン内で参照される要素の代わりに表示される内容。
     /// 見出しの場合は[`body`]($heading.body)、図表の場合はキャプション、数式の場合は空欄となります。
-=======
-    /// The content which is displayed in place of the referred element at its
-    /// entry in the outline. For a heading, this is its
-    /// [`body`]($heading.body); for a figure a caption and for equations, it is
-    /// empty.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     #[func]
     pub fn body(&self) -> StrResult<Content> {
         Ok(self.outlinable()?.body())
     }
 
-<<<<<<< HEAD
     /// 要素の項目のページ番号。
     /// これは参照されるページに対する番号付け設定の書式で出力されます。
-=======
-    /// The page number of this entry's element, formatted with the numbering
-    /// set for the referenced page.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     #[func(contextual)]
     pub fn page(
         &self,
diff --git a/crates/typst-library/src/model/par.rs b/crates/typst-library/src/model/par.rs
index 2ee43d6b62..54a8f51821 100644
--- a/crates/typst-library/src/model/par.rs
+++ b/crates/typst-library/src/model/par.rs
@@ -12,7 +12,6 @@ use crate::introspection::{Count, CounterUpdate, Locatable, Tagged, Unqueriable}
 use crate::layout::{Abs, Em, HAlignment, Length, OuterHAlignment, Ratio, Rel};
 use crate::model::Numbering;
 
-<<<<<<< HEAD
 /// テキストコンテンツの論理的な区分。
 ///
 /// Typstは_インラインレベル_の要素を自動的に段落にまとめます。
@@ -79,72 +78,6 @@ use crate::model::Numbering;
 /// これは、[非タイト]($list.tight)リストがその項目を強制的に段落にさせるための手法の例です。
 ///
 /// # 例
-=======
-/// A logical subdivison of textual content.
-///
-/// Typst automatically collects _inline-level_ elements into paragraphs.
-/// Inline-level elements include [text], [horizontal spacing]($h),
-/// [boxes]($box), and [inline equations]($math.equation).
-///
-/// To separate paragraphs, use a blank line (or an explicit [`parbreak`]).
-/// Paragraphs are also automatically interrupted by any block-level element
-/// (like [`block`], [`place`], or anything that shows itself as one of these).
-///
-/// The `par` element is primarily used in set rules to affect paragraph
-/// properties, but it can also be used to explicitly display its argument as a
-/// paragraph of its own. Then, the paragraph's body may not contain any
-/// block-level content.
-///
-/// # Boxes and blocks
-/// As explained above, usually paragraphs only contain inline-level content.
-/// However, you can integrate any kind of block-level content into a paragraph
-/// by wrapping it in a [`box`].
-///
-/// Conversely, you can separate inline-level content from a paragraph by
-/// wrapping it in a [`block`]. In this case, it will not become part of any
-/// paragraph at all. Read the following section for an explanation of why that
-/// matters and how it differs from just adding paragraph breaks around the
-/// content.
-///
-/// # What becomes a paragraph?
-/// When you add inline-level content to your document, Typst will automatically
-/// wrap it in paragraphs. However, a typical document also contains some text
-/// that is not semantically part of a paragraph, for example in a heading or
-/// caption.
-///
-/// The rules for when Typst wraps inline-level content in a paragraph are as
-/// follows:
-///
-/// - All text at the root of a document is wrapped in paragraphs.
-///
-/// - Text in a container (like a `block`) is only wrapped in a paragraph if the
-///   container holds any block-level content. If all of the contents are
-///   inline-level, no paragraph is created.
-///
-/// In the laid-out document, it's not immediately visible whether text became
-/// part of a paragraph. However, it is still important for various reasons:
-///
-/// - Certain paragraph styling like `first-line-indent` will only apply to
-///   proper paragraphs, not any text. Similarly, `par` show rules of course
-///   only trigger on paragraphs.
-///
-/// - A proper distinction between paragraphs and other text helps people who
-///   rely on Assistive Technology (AT) (such as screen readers) navigate and
-///   understand the document properly.
-///
-/// - PDF export will generate a `P` tag only for paragraphs.
-/// - HTML export will generate a `<p>` tag only for paragraphs.
-///
-/// When creating custom reusable components, you can and should take charge
-/// over whether Typst creates paragraphs. By wrapping text in a [`block`]
-/// instead of just adding paragraph breaks around it, you can force the absence
-/// of a paragraph. Conversely, by adding a [`parbreak`] after some content in a
-/// container, you can force it to become a paragraph even if it's just one
-/// word. This is, for example, what [non-`tight`]($list.tight) lists do to
-/// force their items to become paragraphs.
-///
-/// # Example
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 /// ```example
 /// #set par(
 ///   first-line-indent: 1em,
@@ -165,7 +98,6 @@ use crate::model::Numbering;
 /// ```
 #[elem(scope, title = "Paragraph", Locatable, Tagged)]
 pub struct ParElem {
-<<<<<<< HEAD
     /// 行間。
     ///
     /// leadingは、ある行の[下端]($text.bottom-edge)と次の行の
@@ -179,21 +111,6 @@ pub struct ParElem {
     /// bottom-edgeを `{-0.2em}` に設定すると、
     /// ちょうど`{2em}`のベースライン間隔になります。
     /// top-edgeとbottom-edgeの値の正確な配分が最初の行と最後の行の境界に影響を与えます。
-=======
-    /// The spacing between lines.
-    ///
-    /// Leading defines the spacing between the [bottom edge]($text.bottom-edge)
-    /// of one line and the [top edge]($text.top-edge) of the following line. By
-    /// default, these two properties are up to the font, but they can also be
-    /// configured manually with a text set rule.
-    ///
-    /// By setting top edge, bottom edge, and leading, you can also configure a
-    /// consistent baseline-to-baseline distance. You could, for instance, set
-    /// the leading to `{1em}`, the top-edge to `{0.8em}`, and the bottom-edge
-    /// to `{-0.2em}` to get a baseline gap of exactly `{2em}`. The exact
-    /// distribution of the top- and bottom-edge values affects the bounds of
-    /// the first and last line.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     ///
     /// ```preview
     /// // Color palette
@@ -294,7 +211,6 @@ pub struct ParElem {
     #[default(Em::new(0.65).into())]
     pub leading: Length,
 
-<<<<<<< HEAD
     /// 段落間の間隔。
     ///
     /// leadingと同様に、
@@ -380,102 +296,6 @@ pub struct ParElem {
     /// ただし、全てのフォントや言語で機能するわけではありません。
     /// 例えば、筆記体のフォントでは文字同士が連結されるため、
     /// 文字単位の両端揃えをすると接続部分はぎこちなく見える場合があります。
-=======
-    /// The spacing between paragraphs.
-    ///
-    /// Just like leading, this defines the spacing between the bottom edge of a
-    /// paragraph's last line and the top edge of the next paragraph's first
-    /// line.
-    ///
-    /// When a paragraph is adjacent to a [`block`] that is not a paragraph,
-    /// that block's [`above`]($block.above) or [`below`]($block.below) property
-    /// takes precedence over the paragraph spacing. Headings, for instance,
-    /// reduce the spacing below them by default for a better look.
-    #[default(Em::new(1.2).into())]
-    pub spacing: Length,
-
-    /// Whether to justify text in its line.
-    ///
-    /// Hyphenation will be enabled for justified paragraphs if the
-    /// [text function's `hyphenate` property]($text.hyphenate) is set to
-    /// `{auto}` and the current language is known.
-    ///
-    /// Note that the current [alignment]($align.alignment) still has an effect
-    /// on the placement of the last line except if it ends with a
-    /// [justified line break]($linebreak.justify).
-    ///
-    /// By default, Typst only changes the spacing between words to achieve
-    /// justification. However, you can also allow it to adjust the spacing
-    /// between individual characters using the
-    /// [`justification-limits` property]($par.justification-limits).
-    #[default(false)]
-    pub justify: bool,
-
-    /// How much the spacing between words and characters may be adjusted during
-    /// justification.
-    ///
-    /// When justifying text, Typst needs to stretch or shrink a line to the
-    /// full width of the measure. To achieve this, by default, it adjusts the
-    /// spacing between words. Additionally, it can also adjust the spacing
-    /// between individual characters. This property allows you to configure
-    /// lower and upper bounds for these adjustments.
-    ///
-    /// The property accepts a dictionary with two entries, `spacing` and
-    /// `tracking`, each containing a dictionary with the keys `min` and `max`.
-    /// The `min` keys define down to which lower bound gaps may be shrunk while
-    /// the `max` keys define up to which upper bound they may be stretched.
-    ///
-    /// - The `spacing` entry defines how much the width of spaces between words
-    ///   may be adjusted. It is closely related to [`text.spacing`] and its
-    ///   `min` and `max` keys accept [relative lengths]($relative), just like
-    ///   the `spacing` property.
-    ///
-    ///   A `min` value of `{100%}` means that spaces should retain their normal
-    ///   size (i.e. not be shrunk), while a value of `{90% - 0.01em}` would
-    ///   indicate that a space can be shrunk to a width of 90% of its normal
-    ///   width minus 0.01× the current font size. Similarly, a `max` value of
-    ///   `{100% + 0.02em}` means that a space's width can be increased by 0.02×
-    ///   the current font size. The ratio part must always be positive. The
-    ///   length part, meanwhile, must not be positive for `min` and not be
-    ///   negative for `max`.
-    ///
-    ///   Note that spaces may still be expanded beyond the `max` value if there
-    ///   is no way to justify the line otherwise. However, other means of
-    ///   justification (e.g. spacing apart characters if the `tracking` entry
-    ///   is configured accordingly) are first used to their maximum.
-    ///
-    /// - The `tracking` entry defines how much the spacing between letters may
-    ///   be adjusted. It is closely related to [`text.tracking`] and its `min`
-    ///   and `max` keys accept [lengths]($length), just like the `tracking`
-    ///   property. Unlike `spacing`, it does not accept relative lengths
-    ///   because the base of the relative length would vary for each character,
-    ///   leading to an uneven visual appearance. The behavior compared to
-    ///   `spacing` is as if the base was `{100%}`.
-    ///
-    ///   Otherwise, the `min` and `max` values work just like for `spacing`. A
-    ///   `max` value of `{0.01em}` means that additional spacing amounting to
-    ///   0.01× of the current font size may be inserted between every pair of
-    ///   characters. Note that this also includes the gaps between spaces and
-    ///   characters, so for spaces the values of `tracking` act in addition to
-    ///   the values for `spacing`.
-    ///
-    /// If you only specify one of `spacing` or `tracking`, the other retains
-    /// its previously set value (or the default if it was not previously set).
-    ///
-    /// If you want to enable character-level justification, a good value for
-    /// the `min` and `max` keys is around `{0.01em}` to `{0.02em}` (negated for
-    /// `min`). Using the same value for both gives a good baseline, but
-    /// tweaking the two values individually may produce more balanced results,
-    /// as demonstrated in the example below. Be careful not to set the bounds
-    /// too wide, as it quickly looks unnatural.
-    ///
-    /// Using character-level justification is an impactful microtypographical
-    /// technique that can improve the appearance of justified text, especially
-    /// in narrow columns. Note though that character-level justification does
-    /// not work with every font or language. For example, cursive fonts connect
-    /// letters. Using character-level justification would lead to jagged
-    /// connections.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     ///
     /// ```example:"Character-level justification"
     /// #let example(name) = columns(2, gutter: 10pt)[
@@ -519,21 +339,12 @@ pub struct ParElem {
     #[fold]
     pub justification_limits: JustificationLimits,
 
-<<<<<<< HEAD
     /// 改行位置の決定方法。
     ///
     /// このプロパティがデフォルトの`{auto}`に設定されている場合、
     /// 両端揃えされた段落に対して最適化された改行が行われます。
     /// また、不揃いな段落でも最適化された改行を有効にすることで、
     /// テキストの見栄えを向上させる場合があります。
-=======
-    /// How to determine line breaks.
-    ///
-    /// When this property is set to `{auto}`, its default value, optimized line
-    /// breaks will be used for justified paragraphs. Enabling optimized line
-    /// breaks for ragged paragraphs may also be worthwhile to improve the
-    /// appearance of the text.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     ///
     /// ```example
     /// #set page(width: 207pt)
@@ -551,7 +362,6 @@ pub struct ParElem {
     /// ```
     pub linebreaks: Smart<Linebreaks>,
 
-<<<<<<< HEAD
     /// 段落の最初の行のインデント。
     ///
     /// デフォルトでは、
@@ -570,26 +380,6 @@ pub struct ParElem {
     /// - [ブロックの`spacing`]($block.spacing)
     ///   （デフォルトでは段落の間隔を継承します）を`{set block(spacing: 1.2em)}`を使用して
     ///   元の段落間隔と同じ長さまで増やす
-=======
-    /// The indent the first line of a paragraph should have.
-    ///
-    /// By default, only the first line of a consecutive paragraph will be
-    /// indented (not the first one in the document or container, and not
-    /// paragraphs immediately following other block-level elements).
-    ///
-    /// If you want to indent all paragraphs instead, you can pass a dictionary
-    /// containing the `amount` of indent as a length and the pair
-    /// `{all: true}`. When `all` is omitted from the dictionary, it defaults to
-    /// `{false}`.
-    ///
-    /// By typographic convention, paragraph breaks are indicated either by some
-    /// space between paragraphs or by indented first lines. Consider
-    /// - reducing the [paragraph `spacing`]($par.spacing) to the
-    ///   [`leading`]($par.leading) using `{set par(spacing: 0.65em)}`
-    /// - increasing the [block `spacing`]($block.spacing) (which inherits the
-    ///   paragraph spacing by default) to the original paragraph spacing using
-    ///   `{set block(spacing: 1.2em)}`
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     ///
     /// ```example
     /// #set block(spacing: 1.2em)
@@ -617,11 +407,7 @@ pub struct ParElem {
     /// ```
     pub first_line_indent: FirstLineIndent,
 
-<<<<<<< HEAD
     /// 段落の最初の行以外全ての行のインデント。
-=======
-    /// The indent that all but the first line of a paragraph should have.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     ///
     /// ```example
     /// #set par(hanging-indent: 1em)
@@ -630,11 +416,7 @@ pub struct ParElem {
     /// ```
     pub hanging_indent: Length,
 
-<<<<<<< HEAD
     /// 段落のコンテンツ。
-=======
-    /// The contents of the paragraph.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     #[required]
     pub body: Content,
 }
@@ -645,39 +427,22 @@ impl ParElem {
     type ParLine;
 }
 
-<<<<<<< HEAD
 /// 両端揃え時の空白配分の範囲を設定します。
 #[derive(Debug, Copy, Clone, PartialEq, Hash)]
 pub struct JustificationLimits {
     /// 単語間の空白に対する制限（空白幅に対する相対値）。
     spacing: Option<Limits<Rel>>,
     /// 文字間の空白に対する制限（グリフ幅に追加）。
-=======
-/// Configures how justification may distribute spacing.
-#[derive(Debug, Copy, Clone, PartialEq, Hash)]
-pub struct JustificationLimits {
-    /// Limits for spacing, relative to the space width.
-    spacing: Option<Limits<Rel>>,
-    /// Limits for tracking, _in addition_ to the glyph width.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     tracking: Option<Limits<Length>>,
 }
 
 impl JustificationLimits {
-<<<<<<< HEAD
     /// 単語間の空白に対する制限を取得します。
-=======
-    /// Access the spacing limits.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     pub fn spacing(&self) -> &Limits<Rel> {
         self.spacing.as_ref().unwrap_or(&Limits::SPACING_DEFAULT)
     }
 
-<<<<<<< HEAD
     /// 文字間の空白に対する制限を取得します。
-=======
-    /// Access the tracking limits.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     pub fn tracking(&self) -> &Limits<Length> {
         self.tracking.as_ref().unwrap_or(&Limits::TRACKING_DEFAULT)
     }
@@ -729,22 +494,12 @@ impl Default for JustificationLimits {
     }
 }
 
-<<<<<<< HEAD
 /// 空白を縮められる最小値と伸ばせる最大値を定めます。
 #[derive(Debug, Copy, Clone, PartialEq, Hash)]
 pub struct Limits<T> {
     /// 許容される最小の調整量。
     pub min: T,
     /// 許容される最大の調整量。
-=======
-/// Determines the minimum and maximum size by or to which spacing may be shrunk
-/// and stretched.
-#[derive(Debug, Copy, Clone, PartialEq, Hash)]
-pub struct Limits<T> {
-    /// Minimum allowable adjustment.
-    pub min: T,
-    /// Maximum allowable adjustment.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     pub max: T,
 }
 
@@ -853,7 +608,6 @@ impl Limit for Rel<Length> {
     }
 }
 
-<<<<<<< HEAD
 /// 段落の改行位置の決定方法。
 #[derive(Debug, Copy, Clone, Eq, PartialEq, Hash, Cast)]
 pub enum Linebreaks {
@@ -863,17 +617,6 @@ pub enum Linebreaks {
     ///
     /// Typstは改行を計算する際に段落全体を考慮し、
     /// より均等に埋まった行を生成しようとします。
-=======
-/// How to determine line breaks in a paragraph.
-#[derive(Debug, Copy, Clone, Eq, PartialEq, Hash, Cast)]
-pub enum Linebreaks {
-    /// Determine the line breaks in a simple first-fit style.
-    Simple,
-    /// Optimize the line breaks for the whole paragraph.
-    ///
-    /// Typst will try to produce more evenly filled lines of text by
-    /// considering the whole paragraph when calculating line breaks.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     Optimized,
 }
 
@@ -907,7 +650,6 @@ impl From<FirstLineIndent> for Dict {
     }
 }
 
-<<<<<<< HEAD
 /// 段落区切り。
 ///
 /// 新しい段落を開始します。
@@ -915,15 +657,6 @@ impl From<FirstLineIndent> for Dict {
 /// 複数の連続した段落区切りは、単一の段落区切りにまとめられます。
 ///
 /// # 例
-=======
-/// A paragraph break.
-///
-/// This starts a new paragraph. Especially useful when used within code like
-/// [for loops]($scripting/#loops). Multiple consecutive
-/// paragraph breaks collapse into a single one.
-///
-/// # Example
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 /// ```example
 /// #for i in range(3) {
 ///   [Blind text #i: ]
@@ -932,15 +665,9 @@ impl From<FirstLineIndent> for Dict {
 /// }
 /// ```
 ///
-<<<<<<< HEAD
 /// # 構文
 /// この関数を呼び出す代わりに、
 /// マークアップ内に空行を挿入することで段落区切りを作成できます。
-=======
-/// # Syntax
-/// Instead of calling this function, you can insert a blank line into your
-/// markup to create a paragraph break.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 #[elem(title = "Paragraph Break", Unlabellable)]
 pub struct ParbreakElem {}
 
@@ -953,7 +680,6 @@ impl ParbreakElem {
 
 impl Unlabellable for Packed<ParbreakElem> {}
 
-<<<<<<< HEAD
 /// 段落の行。
 ///
 /// この要素はsetルールを用いた行番号の設定にのみ使用され、
@@ -961,15 +687,6 @@ impl Unlabellable for Packed<ParbreakElem> {}
 ///
 /// [`numbering`]($par.line.numbering)オプションは、
 /// 番号付け形式を指定して行番号を有効化するために使用されます。
-=======
-/// A paragraph line.
-///
-/// This element is exclusively used for line number configuration through set
-/// rules and cannot be placed.
-///
-/// The [`numbering`]($par.line.numbering) option is used to enable line
-/// numbers by specifying a numbering format.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 ///
 /// ```example
 /// >>> #set page(margin: (left: 3em))
@@ -980,17 +697,10 @@ impl Unlabellable for Packed<ParbreakElem> {}
 /// Typst is there for you.
 /// ```
 ///
-<<<<<<< HEAD
 /// `numbering`オプションには、予め定義された[番号付けパターン]($numbering)か、
 /// スタイル付きコンテンツを返す関数のいずれかを指定します。
 /// show-setルールを用いてnumberingを`{none}`に設定することで、
 /// 特定要素内のテキストの行番号を無効にできます。
-=======
-/// The `numbering` option takes either a predefined
-/// [numbering pattern]($numbering) or a function returning styled content. You
-/// can disable line numbers for text inside certain elements by setting the
-/// numbering to `{none}` using show-set rules.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 ///
 /// ```example
 /// >>> #set page(margin: (left: 3em))
@@ -1018,7 +728,6 @@ impl Unlabellable for Packed<ParbreakElem> {}
 /// originating from distant times.
 /// ```
 ///
-<<<<<<< HEAD
 /// この要素は、行番号の[alignment]($par.line.number-align)[margin]($par.line.number-margin)など、
 /// 行の番号付けのさまざまな設定を制御できる追加オプションを提供します。
 /// さらに、
@@ -1028,17 +737,6 @@ impl Unlabellable for Packed<ParbreakElem> {}
 pub struct ParLine {
     /// 各行を番号付けする方法。
     /// [番号付けパターンまたは関数]($numbering)を指定できます。
-=======
-/// This element exposes further options which may be used to control other
-/// aspects of line numbering, such as its [alignment]($par.line.number-align)
-/// or [margin]($par.line.number-margin). In addition, you can control whether
-/// the numbering is reset on each page through the
-/// [`numbering-scope`]($par.line.numbering-scope) option.
-#[elem(name = "line", title = "Paragraph Line", keywords = ["line numbering"], Construct, Locatable)]
-pub struct ParLine {
-    /// How to number each line. Accepts a
-    /// [numbering pattern or function]($numbering) taking a single number.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     ///
     /// ```example
     /// >>> #set page(margin: (left: 3em))
@@ -1060,19 +758,11 @@ pub struct ParLine {
     #[ghost]
     pub numbering: Option<Numbering>,
 
-<<<<<<< HEAD
     /// 各行に付随する行番号の配置。
     ///
     /// デフォルトの`{auto}`は、
     /// 行番号が余白や現在のテキストの方向を考慮しつつ、
     /// テキストから離れる方向へ水平に伸びるスマートな設定を示します。
-=======
-    /// The alignment of line numbers associated with each line.
-    ///
-    /// The default of `{auto}` indicates a smart default where numbers grow
-    /// horizontally away from the text, considering the margin they're in and
-    /// the current text direction.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     ///
     /// ```example
     /// >>> #set page(margin: (left: 3em))
@@ -1088,7 +778,6 @@ pub struct ParLine {
     #[ghost]
     pub number_align: Smart<HAlignment>,
 
-<<<<<<< HEAD
     /// 行番号を表示する位置の余白。
     ///
     /// _注意_: 複数段組みの文書では、
@@ -1096,15 +785,6 @@ pub struct ParLine {
     /// 右から左のテキストでは左の余白）に表示されます。
     /// 現時点では、
     /// この挙動は変更できません。
-=======
-    /// The margin at which line numbers appear.
-    ///
-    /// _Note:_ In a multi-column document, the line numbers for paragraphs
-    /// inside the last column will always appear on the `{end}` margin (right
-    /// margin for left-to-right text and left margin for right-to-left),
-    /// regardless of this configuration. That behavior cannot be changed at
-    /// this moment.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     ///
     /// ```example
     /// >>> #set page(margin: (right: 3em))
@@ -1121,17 +801,10 @@ pub struct ParLine {
     #[default(OuterHAlignment::Start)]
     pub number_margin: OuterHAlignment,
 
-<<<<<<< HEAD
     /// 行番号とテキストの間隔。
     ///
     /// デフォルトの値である `{auto}` では、ページ幅に応じて間隔が自動調整され、
     /// ほとんどの場合において適切な間隔が得られます。
-=======
-    /// The distance between line numbers and text.
-    ///
-    /// The default value of `{auto}` results in a clearance that is adaptive to
-    /// the page width and yields reasonable results in most cases.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     ///
     /// ```example
     /// >>> #set page(margin: (left: 3em))
@@ -1148,21 +821,12 @@ pub struct ParLine {
     #[default]
     pub number_clearance: Smart<Length>,
 
-<<<<<<< HEAD
     /// 行番号をリセットするタイミングを制御する。
     ///
     /// _注意:_ 行番号のスコープは、
     /// ページラン（改ページが明示的に挿入されていない連続したページ）内で統一されている必要があります。
     /// そのため、setルールによる設定は、
     /// ページコンテンツの前、通常は文書の最初などで定義することが望ましいです。
-=======
-    /// Controls when to reset line numbering.
-    ///
-    /// _Note:_ The line numbering scope must be uniform across each page run (a
-    /// page run is a sequence of pages without an explicit pagebreak in
-    /// between). For this reason, set rules for it should be defined before any
-    /// page content, typically at the very start of the document.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     ///
     /// ```example
     /// >>> #set page(margin: (left: 3em))
@@ -1195,19 +859,11 @@ impl Construct for ParLine {
 /// supported.
 #[derive(Debug, Copy, Clone, Eq, PartialEq, Hash, Cast)]
 pub enum LineNumberingScope {
-<<<<<<< HEAD
     /// 行番号カウンターが文書全体にまたがり、
     /// 決して自動的にリセットされないことを示します。
     Document,
     /// 行番号カウンターが各新規ページの
     /// 先頭でリセットされることを示します。
-=======
-    /// Indicates that the line number counter spans the whole document, i.e.,
-    /// it's never automatically reset.
-    Document,
-    /// Indicates that the line number counter should be reset at the start of
-    /// every new page.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     Page,
 }
 
diff --git a/crates/typst-library/src/model/quote.rs b/crates/typst-library/src/model/quote.rs
index 94e0324a62..9e30a35ea7 100644
--- a/crates/typst-library/src/model/quote.rs
+++ b/crates/typst-library/src/model/quote.rs
@@ -9,15 +9,9 @@ use crate::layout::{BlockElem, Em, PadElem};
 use crate::model::{CitationForm, CiteElem};
 use crate::text::{SmartQuotes, SpaceElem, TextElem};
 
-<<<<<<< HEAD
 /// 引用文を表示し、オプションとして帰属情報を併記する。
 ///
 /// # 例
-=======
-/// Displays a quote alongside an optional attribution.
-///
-/// # Example
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 /// ```example
 /// Plato is often misquoted as the author of #quote[I know that I know
 /// nothing], however, this is a derivation form his original quote:
@@ -34,13 +28,8 @@ use crate::text::{SmartQuotes, SpaceElem, TextElem};
 /// ]
 /// ```
 ///
-<<<<<<< HEAD
 /// デフォルトでは、ブロック引用には左右それぞれ `{1em}` のパディングが設定されており、
 /// 配置やパディングはshowルールで制御できます。
-=======
-/// By default block quotes are padded left and right by `{1em}`, alignment and
-/// padding can be controlled with show rules:
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 /// ```example
 /// #set quote(block: true)
 /// #show quote: set align(center)
@@ -54,11 +43,7 @@ use crate::text::{SmartQuotes, SpaceElem, TextElem};
 /// ```
 #[elem(Locatable, Tagged, ShowSet)]
 pub struct QuoteElem {
-<<<<<<< HEAD
     /// ブロック引用にするかどうか。
-=======
-    /// Whether this is a block quote.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     ///
     /// ```example
     /// An inline citation would look like
@@ -76,7 +61,6 @@ pub struct QuoteElem {
     /// ```
     pub block: bool,
 
-<<<<<<< HEAD
     /// 引用文の両端を二重引用符で囲むかどうか。
     ///
     /// 使用される二重引用符は、[smartquote]の`quotes`プロパティから推測され、
@@ -86,18 +70,6 @@ pub struct QuoteElem {
     /// - `{false}`: 引用文を二重引用符で囲みません。
     /// - `{auto}`: 引用文を二重引用符で囲むかどうかを、`block`プロパティに基づいて推測します。
     ///   `block`が`{false}`の場合、二重引用符が自動的に追加されます。
-=======
-    /// Whether double quotes should be added around this quote.
-    ///
-    /// The double quotes used are inferred from the `quotes` property on
-    /// [smartquote], which is affected by the `lang` property on [text].
-    ///
-    /// - `{true}`: Wrap this quote in double quotes.
-    /// - `{false}`: Do not wrap this quote in double quotes.
-    /// - `{auto}`: Infer whether to wrap this quote in double quotes based on
-    ///   the `block` property. If `block` is `{false}`, double quotes are
-    ///   automatically added.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     ///
     /// ```example
     /// #set text(lang: "de")
@@ -114,15 +86,9 @@ pub struct QuoteElem {
     /// ```
     pub quotes: Smart<bool>,
 
-<<<<<<< HEAD
     /// 引用文の帰属情報。通常は著者名や出典元を指します。
     /// 参考文献を指すラベルや任意のコンテンツも設定できます。
     /// デフォルトではブロック引用にのみ表示されますが、`{show}`ルールを使用して変更できます。
-=======
-    /// The attribution of this quote, usually the author or source. Can be a
-    /// label pointing to a bibliography entry or any content. By default only
-    /// displayed for block quotes, but can be changed using a `{show}` rule.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     ///
     /// ```example
     /// #quote(attribution: [René Descartes])[
@@ -155,11 +121,7 @@ pub struct QuoteElem {
     /// ```
     pub attribution: Option<Attribution>,
 
-<<<<<<< HEAD
     /// 引用文。
-=======
-    /// The quote.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     #[required]
     pub body: Content,
 
diff --git a/crates/typst-library/src/model/reference.rs b/crates/typst-library/src/model/reference.rs
index 6d8c2cd33c..fc9799275a 100644
--- a/crates/typst-library/src/model/reference.rs
+++ b/crates/typst-library/src/model/reference.rs
@@ -14,7 +14,6 @@ use crate::model::{
 };
 use crate::text::TextElem;
 
-<<<<<<< HEAD
 /// ラベルや参考文献への参照。
 ///
 /// ラベルを指定して、その参照を生成します。参照の[`form`]($ref.form)には
@@ -42,38 +41,6 @@ use crate::text::TextElem;
 /// `{"normal"}`参照と異なり、ラベルは任意の要素に付けられます。
 ///
 /// # 例
-=======
-/// A reference to a label or bibliography.
-///
-/// Takes a label and cross-references it. There are two kind of references,
-/// determined by its [`form`]($ref.form): `{"normal"}` and `{"page"}`.
-///
-/// The default, a `{"normal"}` reference, produces a textual reference to a
-/// label. For example, a reference to a heading will yield an appropriate
-/// string such as "Section 1" for a reference to the first heading. The word
-/// "Section" depends on the [`lang`]($text.lang) setting and is localized
-/// accordingly. The references are also links to the respective element.
-/// Reference syntax can also be used to [cite] from a bibliography.
-///
-/// As the default form requires a supplement and numbering, the label must be
-/// attached to a _referenceable element_. Referenceable elements include
-/// [headings]($heading), [figures]($figure), [equations]($math.equation), and
-/// [footnotes]($footnote). To create a custom referenceable element like a
-/// theorem, you can create a figure of a custom [`kind`]($figure.kind) and
-/// write a show rule for it. In the future, there might be a more direct way
-/// to define a custom referenceable element.
-///
-/// If you just want to link to a labelled element and not get an automatic
-/// textual reference, consider using the [`link`] function instead.
-///
-/// A `{"page"}` reference produces a page reference to a label, displaying the
-/// page number at its location. You can use the
-/// [page's supplement]($page.supplement) to modify the text before the page
-/// number. Unlike a `{"normal"}` reference, the label can be attached to any
-/// element.
-///
-/// # Example
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 /// ```example
 /// #set page(numbering: "1")
 /// #set heading(numbering: "1.")
@@ -101,7 +68,6 @@ use crate::text::TextElem;
 /// ```
 ///
 /// # Syntax
-<<<<<<< HEAD
 /// この機能には専用の記法も用意されています。
 /// `{"normal"}`の参照を作成するためには`@`に続けてラベル名を入力します（例えば`[= Introduction <intro>]`というラベルを参照するには`[@intro]`と入力します）。
 ///
@@ -112,20 +78,6 @@ use crate::text::TextElem;
 /// 図表や見出しなどのページ参照だけが必要な場合は、setルールで`form`の既定値を
 /// `{"page"}`に変更できます。"page"より短い"p."のような補足語にしたい場合は、
 /// [`page.supplement`]フィールドで変更できます。
-=======
-/// This function also has dedicated syntax: A `{"normal"}` reference to a
-/// label can be created by typing an `@` followed by the name of the label
-/// (e.g. `[= Introduction <intro>]` can be referenced by typing `[@intro]`).
-///
-/// To customize the supplement, add content in square brackets after the
-/// reference: `[@intro[Chapter]]`.
-///
-/// # Customization
-/// When you only ever need to reference pages of a figure/table/heading/etc. in
-/// a document, the default `form` field value can be changed to `{"page"}` with
-/// a set rule. If you prefer a short "p." supplement over "page", the
-/// [`page.supplement`] field can be used for changing this:
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 ///
 /// ```example
 /// #set page(
@@ -152,16 +104,9 @@ use crate::text::TextElem;
 /// of different shapes.
 /// ```
 ///
-<<<<<<< HEAD
 /// 参照のshowルールを書く場合、参照の`element`フィールドを通じて参照先の要素にアクセスできます。
 /// ただし、Typstがまだそれを発見していない場合、`element`は存在していても`{none}`になる可能性があるため、
 /// 常にコード内でそのケースを処理する必要があります。
-=======
-/// If you write a show rule for references, you can access the referenced
-/// element through the `element` field of the reference. The `element` may
-/// be `{none}` even if it exists if Typst hasn't discovered it yet, so you
-/// always need to handle that case in your code.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 ///
 /// ```example
 /// #set heading(numbering: "1.")
@@ -185,7 +130,6 @@ use crate::text::TextElem;
 /// ```
 #[elem(title = "Reference", Locatable, Tagged, Synthesize)]
 pub struct RefElem {
-<<<<<<< HEAD
     /// 参照されるべき対象ラベル。
     ///
     /// ドキュメント内で定義されたラベルか、`{"normal"}`の[`form`]($ref.form)を使う場合は[`bibliography`]の項目でも構いません。
@@ -202,28 +146,6 @@ pub struct RefElem {
     /// [`form`]($ref.form)が`{"page"}`の場合は、参照先ラベルのページ番号の前にこの値が追加されます。
     ///
     /// また、関数が指定されている場合は、それに参照先の要素が渡され、戻り値のコンテンツが補足語となります。
-=======
-    /// The target label that should be referenced.
-    ///
-    /// Can be a label that is defined in the document or, if the
-    /// [`form`]($ref.form) is set to `["normal"]`, an entry from the
-    /// [`bibliography`].
-    #[required]
-    pub target: Label,
-
-    /// A supplement for the reference.
-    ///
-    /// If the [`form`]($ref.form) is set to `{"normal"}`:
-    /// - For references to headings or figures, this is added before the
-    ///   referenced number.
-    /// - For citations, this can be used to add a page number.
-    ///
-    /// If the [`form`]($ref.form) is set to `{"page"}`, then this is added
-    /// before the page number of the label referenced.
-    ///
-    /// If a function is specified, it is passed the referenced element and
-    /// should return content.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     ///
     /// ```example
     /// #set heading(numbering: "1.")
@@ -245,11 +167,7 @@ pub struct RefElem {
     /// ```
     pub supplement: Smart<Option<Supplement>>,
 
-<<<<<<< HEAD
     /// 生成する参照の種類。
-=======
-    /// The kind of reference to produce.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     ///
     /// ```example
     /// #set page(numbering: "1")
@@ -260,19 +178,11 @@ pub struct RefElem {
     #[default(RefForm::Normal)]
     pub form: RefForm,
 
-<<<<<<< HEAD
     /// 合成された引用。
     #[synthesized]
     pub citation: Option<Packed<CiteElem>>,
 
     /// 参照先の要素。
-=======
-    /// A synthesized citation.
-    #[synthesized]
-    pub citation: Option<Packed<CiteElem>>,
-
-    /// The referenced element.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     #[synthesized]
     pub element: Option<Content>,
 }
@@ -489,7 +399,6 @@ cast! {
     v: Func => Self::Func(v),
 }
 
-<<<<<<< HEAD
 /// 参照の形式。
 #[derive(Debug, Default, Copy, Clone, Eq, PartialEq, Hash, Cast)]
 pub enum RefForm {
@@ -497,15 +406,6 @@ pub enum RefForm {
     #[default]
     Normal,
     /// ラベルに対してページ番号での参照を生成します。
-=======
-/// The form of the reference.
-#[derive(Debug, Default, Copy, Clone, Eq, PartialEq, Hash, Cast)]
-pub enum RefForm {
-    /// Produces a textual reference to a label.
-    #[default]
-    Normal,
-    /// Produces a page reference to a label.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     Page,
 }
 
diff --git a/crates/typst-library/src/model/strong.rs b/crates/typst-library/src/model/strong.rs
index f251685666..451a06b0e0 100644
--- a/crates/typst-library/src/model/strong.rs
+++ b/crates/typst-library/src/model/strong.rs
@@ -1,19 +1,11 @@
 use crate::foundations::{Content, elem};
 use crate::introspection::{Locatable, Tagged};
 
-<<<<<<< HEAD
 /// フォントの太さを増やすことでコンテンツを強調します。
 ///
 /// 現在のフォントの太さに指定した差分 `delta` を加えます。
 ///
 /// # 例
-=======
-/// Strongly emphasizes content by increasing the font weight.
-///
-/// Increases the current font weight by a given `delta`.
-///
-/// # Example
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 /// ```example
 /// This is *strong.* \
 /// This is #strong[too.] \
@@ -22,7 +14,6 @@ use crate::introspection::{Locatable, Tagged};
 /// And this is *evermore.*
 /// ```
 ///
-<<<<<<< HEAD
 /// # 構文
 /// この関数には専用の構文もあります。
 /// 強調したいコンテンツをアスタリスク（`*`）で囲むだけです。
@@ -31,16 +22,6 @@ use crate::introspection::{Locatable, Tagged};
 #[elem(title = "Strong Emphasis", keywords = ["bold", "weight"], Locatable, Tagged)]
 pub struct StrongElem {
     /// フォントの太さに適用する変化量。
-=======
-/// # Syntax
-/// This function also has dedicated syntax: To strongly emphasize content,
-/// simply enclose it in stars/asterisks (`*`). Note that this only works at
-/// word boundaries. To strongly emphasize part of a word, you have to use the
-/// function.
-#[elem(title = "Strong Emphasis", keywords = ["bold", "weight"], Locatable, Tagged)]
-pub struct StrongElem {
-    /// The delta to apply on the font weight.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     ///
     /// ```example
     /// #set strong(delta: 0)
@@ -49,11 +30,7 @@ pub struct StrongElem {
     #[default(300)]
     pub delta: i64,
 
-<<<<<<< HEAD
     /// 強調するコンテンツ。
-=======
-    /// The content to strongly emphasize.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     #[required]
     pub body: Content,
 }
diff --git a/crates/typst-library/src/text/case.rs b/crates/typst-library/src/text/case.rs
index 64d2824ef6..1a0d9948be 100644
--- a/crates/typst-library/src/text/case.rs
+++ b/crates/typst-library/src/text/case.rs
@@ -1,15 +1,9 @@
 use crate::foundations::{Cast, Content, Str, cast, func};
 use crate::text::TextElem;
 
-<<<<<<< HEAD
 /// 文字列やコンテンツを小文字に変換。
 ///
 /// # 例
-=======
-/// Converts a string or content to lowercase.
-///
-/// # Example
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 /// ```example
 /// #lower("ABC") \
 /// #lower[*My Text*] \
@@ -17,25 +11,15 @@ use crate::text::TextElem;
 /// ```
 #[func(title = "Lowercase")]
 pub fn lower(
-<<<<<<< HEAD
     /// 小文字に変換するテキスト。
-=======
-    /// The text to convert to lowercase.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     text: Caseable,
 ) -> Caseable {
     case(text, Case::Lower)
 }
 
-<<<<<<< HEAD
 /// 文字列やコンテンツを大文字に変換。
 ///
 /// # 例
-=======
-/// Converts a string or content to uppercase.
-///
-/// # Example
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 /// ```example
 /// #upper("abc") \
 /// #upper[*my text*] \
@@ -43,11 +27,7 @@ pub fn lower(
 /// ```
 #[func(title = "Uppercase")]
 pub fn upper(
-<<<<<<< HEAD
     /// 大文字に変換するテキスト。
-=======
-    /// The text to convert to uppercase.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     text: Caseable,
 ) -> Caseable {
     case(text, Case::Upper)
diff --git a/crates/typst-library/src/text/deco.rs b/crates/typst-library/src/text/deco.rs
index 05c0cee519..56f269857d 100644
--- a/crates/typst-library/src/text/deco.rs
+++ b/crates/typst-library/src/text/deco.rs
@@ -3,31 +3,17 @@ use crate::introspection::{Locatable, Tagged};
 use crate::layout::{Abs, Corners, Length, Rel, Sides};
 use crate::text::{BottomEdge, BottomEdgeMetric, TopEdge, TopEdgeMetric};
 use crate::visualize::{Color, FixedStroke, Paint, Stroke};
-<<<<<<< HEAD
 /// テキスト下部に線を追加。
 ///
 /// # 例
-=======
-
-/// Underlines text.
-///
-/// # Example
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 /// ```example
 /// This is #underline[important].
 /// ```
 #[elem(Locatable, Tagged)]
 pub struct UnderlineElem {
-<<<<<<< HEAD
     /// 線の[stroke]をどうするか。
     ///
     /// `{auto}`に設定された場合、現在のテキストフォントで使用されているテキストの太さと色が使用されます。
-=======
-    /// How to [stroke] the line.
-    ///
-    /// If set to `{auto}`, takes on the text's color and a thickness defined in
-    /// the current font.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     ///
     /// ```example
     /// Take #underline(
@@ -38,14 +24,8 @@ pub struct UnderlineElem {
     /// ```
     #[fold]
     pub stroke: Smart<Stroke>,
-<<<<<<< HEAD
     /// ベースラインを基準とする線の位置。
     /// `{auto}`の場合、フォントテーブルから読まれます。
-=======
-
-    /// The position of the line relative to the baseline, read from the font
-    /// tables if `{auto}`.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     ///
     /// ```example
     /// #underline(offset: 5pt)[
@@ -53,13 +33,7 @@ pub struct UnderlineElem {
     /// ]
     /// ```
     pub offset: Smart<Length>,
-<<<<<<< HEAD
     /// コンテンツの外側に（負の値のときは内側に）線を左右に拡張する量。
-=======
-
-    /// The amount by which to extend the line beyond (or within if negative)
-    /// the content.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     ///
     /// ```example
     /// #align(center,
@@ -67,13 +41,7 @@ pub struct UnderlineElem {
     /// )
     /// ```
     pub extent: Length,
-<<<<<<< HEAD
     /// グリフと衝突する線の部分を省略するかどうか。
-=======
-
-    /// Whether the line skips sections in which it would collide with the
-    /// glyphs.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     ///
     /// ```example
     /// This #underline(evade: true)[is great].
@@ -82,11 +50,7 @@ pub struct UnderlineElem {
     #[default(true)]
     pub evade: bool,
 
-<<<<<<< HEAD
     /// 線をコンテンツの背後に置くかどうか。
-=======
-    /// Whether the line is placed behind the content it underlines.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     ///
     /// ```example
     /// #set underline(stroke: (thickness: 1em, paint: maroon, cap: "round"))
@@ -96,39 +60,22 @@ pub struct UnderlineElem {
     #[default(false)]
     pub background: bool,
 
-<<<<<<< HEAD
     /// 下部に線を置くコンテンツ。
-=======
-    /// The content to underline.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     #[required]
     pub body: Content,
 }
 
-<<<<<<< HEAD
 /// テキスト上部に線を追加。
 ///
 /// # 例
-=======
-/// Adds a line over text.
-///
-/// # Example
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 /// ```example
 /// #overline[A line over text.]
 /// ```
 #[elem(Locatable, Tagged)]
 pub struct OverlineElem {
-<<<<<<< HEAD
     /// 線の[stroke]をどうするか。
     ///
     /// `{auto}`に設定された場合、現在のテキストフォントで使用されているテキストの太さと色が使用されます。
-=======
-    /// How to [stroke] the line.
-    ///
-    /// If set to `{auto}`, takes on the text's color and a thickness defined in
-    /// the current font.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     ///
     /// ```example
     /// #set text(fill: olive)
@@ -140,14 +87,8 @@ pub struct OverlineElem {
     /// ```
     #[fold]
     pub stroke: Smart<Stroke>,
-<<<<<<< HEAD
     /// ベースラインを基準とする線の位置。
     /// `{auto}`の場合、フォントテーブルから読まれます。
-=======
-
-    /// The position of the line relative to the baseline. Read from the font
-    /// tables if `{auto}`.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     ///
     /// ```example
     /// #overline(offset: -1.2em)[
@@ -155,13 +96,7 @@ pub struct OverlineElem {
     /// ]
     /// ```
     pub offset: Smart<Length>,
-<<<<<<< HEAD
     /// コンテンツの外側に（負の値のときは内側に）線を左右に拡張する量。
-=======
-
-    /// The amount by which to extend the line beyond (or within if negative)
-    /// the content.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     ///
     /// ```example
     /// #set overline(extent: 4pt)
@@ -169,13 +104,7 @@ pub struct OverlineElem {
     /// #overline(underline[Typography Today])
     /// ```
     pub extent: Length,
-<<<<<<< HEAD
     /// グリフと衝突する線の部分を省略するかどうか。
-=======
-
-    /// Whether the line skips sections in which it would collide with the
-    /// glyphs.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     ///
     /// ```example
     /// #overline(
@@ -189,11 +118,7 @@ pub struct OverlineElem {
     #[default(true)]
     pub evade: bool,
 
-<<<<<<< HEAD
     /// 線をコンテンツの背後に置くかどうか。
-=======
-    /// Whether the line is placed behind the content it overlines.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     ///
     /// ```example
     /// #set overline(stroke: (thickness: 1em, paint: maroon, cap: "round"))
@@ -203,44 +128,24 @@ pub struct OverlineElem {
     #[default(false)]
     pub background: bool,
 
-<<<<<<< HEAD
     /// 上部に線を置くコンテンツ。
-=======
-    /// The content to add a line over.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     #[required]
     pub body: Content,
 }
 
-<<<<<<< HEAD
 /// テキストの打ち消し。
 ///
 /// # 例
-=======
-/// Strikes through text.
-///
-/// # Example
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 /// ```example
 /// This is #strike[not] relevant.
 /// ```
 #[elem(title = "Strikethrough", Locatable, Tagged)]
 pub struct StrikeElem {
-<<<<<<< HEAD
     /// 線の[stroke]をどうするか。
     ///
     /// `{auto}`に設定された場合、現在のテキストフォントで使用されているテキストの太さと色が使用されます。
     ///
     /// _注意:_ テキストのコピー・ペーストは依然として可能なため、実際の黒塗りには使用しないでください。
-=======
-    /// How to [stroke] the line.
-    ///
-    /// If set to `{auto}`, takes on the text's color and a thickness defined in
-    /// the current font.
-    ///
-    /// _Note:_ Please don't use this for real redaction as you can still copy
-    /// paste the text.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     ///
     /// ```example
     /// This is #strike(stroke: 1.5pt + red)[very stricken through]. \
@@ -248,18 +153,10 @@ pub struct StrikeElem {
     /// ```
     #[fold]
     pub stroke: Smart<Stroke>,
-<<<<<<< HEAD
     /// ベースラインを基準とする線の位置。
     /// `{auto}`の場合、フォントテーブルから読まれます。
     ///
     /// これはフォントが提供するオフセットに不満がある場合に便利です。
-=======
-
-    /// The position of the line relative to the baseline. Read from the font
-    /// tables if `{auto}`.
-    ///
-    /// This is useful if you are unhappy with the offset your font provides.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     ///
     /// ```example
     /// #set text(font: "Inria Serif")
@@ -267,25 +164,14 @@ pub struct StrikeElem {
     /// This is #strike(offset: -3.5pt)[on-top].
     /// ```
     pub offset: Smart<Length>,
-<<<<<<< HEAD
     /// コンテンツの外側に（負の値のときは内側に）線を左右に拡張する量。
-=======
-
-    /// The amount by which to extend the line beyond (or within if negative)
-    /// the content.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     ///
     /// ```example
     /// This #strike(extent: -2pt)[skips] parts of the word.
     /// This #strike(extent: 2pt)[extends] beyond the word.
     /// ```
     pub extent: Length,
-<<<<<<< HEAD
     /// 線をコンテンツの背後に置くかどうか。
-=======
-
-    /// Whether the line is placed behind the content.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     ///
     /// ```example
     /// #set strike(stroke: red)
@@ -295,34 +181,20 @@ pub struct StrikeElem {
     #[default(false)]
     pub background: bool,
 
-<<<<<<< HEAD
     /// 打ち消すコンテンツ。
-=======
-    /// The content to strike through.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     #[required]
     pub body: Content,
 }
 
-<<<<<<< HEAD
 /// 背景色によるテキストハイライト。
 ///
 /// # 例
-=======
-/// Highlights text with a background color.
-///
-/// # Example
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 /// ```example
 /// This is #highlight[important].
 /// ```
 #[elem(Locatable, Tagged)]
 pub struct HighlightElem {
-<<<<<<< HEAD
     /// テキストをハイライトする色。
-=======
-    /// The color to highlight the text with.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     ///
     /// ```example
     /// This is #highlight(
@@ -332,13 +204,8 @@ pub struct HighlightElem {
     #[default(Some(Color::from_u8(0xFF, 0xFD, 0x11, 0xA1).into()))]
     pub fill: Option<Paint>,
 
-<<<<<<< HEAD
     /// ハイライトの枠線の色。
     /// 詳細は[rectangleのドキュメント]($rect.stroke)を参照してください。
-=======
-    /// The highlight's border color. See the
-    /// [rectangle's documentation]($rect.stroke) for more details.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     ///
     /// ```example
     /// This is a #highlight(
@@ -347,12 +214,7 @@ pub struct HighlightElem {
     /// ```
     #[fold]
     pub stroke: Sides<Option<Option<Stroke>>>,
-<<<<<<< HEAD
     /// 背景の長方形の上端。
-=======
-
-    /// The top end of the background rectangle.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     ///
     /// ```example
     /// #set highlight(top-edge: "ascender")
@@ -364,11 +226,7 @@ pub struct HighlightElem {
     #[default(TopEdge::Metric(TopEdgeMetric::Ascender))]
     pub top_edge: TopEdge,
 
-<<<<<<< HEAD
     /// 背景の長方形の下端。
-=======
-    /// The bottom end of the background rectangle.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     ///
     /// ```example
     /// #set highlight(bottom-edge: "descender")
@@ -380,25 +238,14 @@ pub struct HighlightElem {
     #[default(BottomEdge::Metric(BottomEdgeMetric::Descender))]
     pub bottom_edge: BottomEdge,
 
-<<<<<<< HEAD
     /// コンテンツの外側に（負の値のときは内側に）背景を左右に拡張する量。
-=======
-    /// The amount by which to extend the background to the sides beyond
-    /// (or within if negative) the content.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     ///
     /// ```example
     /// A long #highlight(extent: 4pt)[background].
     /// ```
     pub extent: Length,
-<<<<<<< HEAD
     /// 背景の角を丸める量。
     /// 詳細は[rectangleのドキュメント]($rect.radius)を参照してください。
-=======
-
-    /// How much to round the highlight's corners. See the
-    /// [rectangle's documentation]($rect.radius) for more details.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     ///
     /// ```example
     /// Listen #highlight(
@@ -407,12 +254,7 @@ pub struct HighlightElem {
     /// ```
     #[fold]
     pub radius: Corners<Option<Rel<Length>>>,
-<<<<<<< HEAD
     /// ハイライトされるべきコンテンツ。
-=======
-
-    /// The content that should be highlighted.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     #[required]
     pub body: Content,
 }
diff --git a/crates/typst-library/src/text/font/book.rs b/crates/typst-library/src/text/font/book.rs
index fc877f7f79..7347fc0e65 100644
--- a/crates/typst-library/src/text/font/book.rs
+++ b/crates/typst-library/src/text/font/book.rs
@@ -248,9 +248,6 @@ impl FontInfo {
 
                 // Some fonts miss the relevant bits for italic or oblique, so
                 // we also try to infer that from the full name.
-<<<<<<< HEAD
-                let italic = ttf.is_italic() || full.contains("italic");
-=======
                 //
                 // We do not use `ttf.is_italic()` because that also checks the
                 // italic angle which leads to false positives for some oblique
@@ -259,7 +256,6 @@ impl FontInfo {
                 // See <https://github.com/typst/typst/issues/7479>.
                 let italic =
                     ttf.style() == ttf_parser::Style::Italic || full.contains("italic");
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
                 let oblique = ttf.is_oblique()
                     || full.contains("oblique")
                     || full.contains("slanted");
diff --git a/crates/typst-library/src/text/linebreak.rs b/crates/typst-library/src/text/linebreak.rs
index 398732eb5b..36484fc83a 100644
--- a/crates/typst-library/src/text/linebreak.rs
+++ b/crates/typst-library/src/text/linebreak.rs
@@ -2,29 +2,18 @@ use typst_utils::singleton;
 
 use crate::foundations::{Content, NativeElement, elem};
 
-<<<<<<< HEAD
 /// 改行の挿入。
 ///
 /// 段落を次の行へ進めます。
 /// 段落の終わりにある単一の改行は無視されますが、それより多くある場合は空行が作成されます。
 ///
 /// # 例
-=======
-/// Inserts a line break.
-///
-/// Advances the paragraph to the next line. A single trailing line break at the
-/// end of a paragraph is ignored, but more than one creates additional empty
-/// lines.
-///
-/// # Example
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 /// ```example
 /// *Date:* 26.12.2022 \
 /// *Topic:* Infrastructure Test \
 /// *Severity:* High \
 /// ```
 ///
-<<<<<<< HEAD
 /// # 構文
 /// この関数は専用の構文も持っています。
 /// 改行を挿入するには、単にバックスラッシュと空白を書いてください。
@@ -34,18 +23,6 @@ pub struct LinebreakElem {
     /// 改行の前の行を両端揃えするかどうか。
     ///
     /// これは、Typstが両端揃えを行ったテキストよりも良い改行位置が見つかった場合に便利です。
-=======
-/// # Syntax
-/// This function also has dedicated syntax: To insert a line break, simply write
-/// a backslash followed by whitespace. This always creates an unjustified
-/// break.
-#[elem(title = "Line Break")]
-pub struct LinebreakElem {
-    /// Whether to justify the line before the break.
-    ///
-    /// This is useful if you found a better line break opportunity in your
-    /// justified text than Typst did.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     ///
     /// ```example
     /// #set par(justify: true)
diff --git a/crates/typst-library/src/text/lorem.rs b/crates/typst-library/src/text/lorem.rs
index ba59652bc0..718e55cacc 100644
--- a/crates/typst-library/src/text/lorem.rs
+++ b/crates/typst-library/src/text/lorem.rs
@@ -1,6 +1,5 @@
 use crate::foundations::{Str, func};
 
-<<<<<<< HEAD
 /// ダミーテキストの作成。
 ///
 /// この関数は与えられた単語数だけラテン語風のダミーテキストである_Lorem Ipsum_を生成します。
@@ -9,16 +8,6 @@ use crate::foundations::{Str, func};
 /// レイアウトを試すプレースホルダーとして使用してください。
 ///
 /// # 例
-=======
-/// Creates blind text.
-///
-/// This function yields a Latin-like _Lorem Ipsum_ blind text with the given
-/// number of words. The sequence of words generated by the function is always
-/// the same but randomly chosen. As usual for blind texts, it does not make any
-/// sense. Use it as a placeholder to try layouts.
-///
-/// # Example
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 /// ```example
 /// = Blind Text
 /// #lorem(30)
@@ -28,11 +17,7 @@ use crate::foundations::{Str, func};
 /// ```
 #[func(keywords = ["Blind Text"])]
 pub fn lorem(
-<<<<<<< HEAD
     /// ダミーテキストの単語数。
-=======
-    /// The length of the blind text in words.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     words: usize,
 ) -> Str {
     lipsum::lipsum(words).replace("--", "–").into()
diff --git a/crates/typst-library/src/text/mod.rs b/crates/typst-library/src/text/mod.rs
index 165bceba1f..9358210821 100644
--- a/crates/typst-library/src/text/mod.rs
+++ b/crates/typst-library/src/text/mod.rs
@@ -643,14 +643,11 @@ pub struct TextElem {
     /// #set text(ligatures: false)
     /// A fine ligature.
     /// ```
-<<<<<<< HEAD
-=======
     ///
     /// Note that some programming fonts use other OpenType font features to
     /// implement "ligatures," including the contextual alternates (`calt`)
     /// feature, which is also enabled by default. Use the general
     /// [`features`]($text.features) parameter to control such features.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     #[default(true)]
     #[ghost]
     pub ligatures: bool,
@@ -729,17 +726,11 @@ pub struct TextElem {
     /// - If given a dictionary mapping to numbers, sets the features
     ///   identified by the keys to the values.
     ///
-<<<<<<< HEAD
-    /// ```example
-=======
     /// ```example:"Give an array of strings"
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     /// // Enable the `frac` feature manually.
     /// #set text(features: ("frac",))
     /// 1/2
     /// ```
-<<<<<<< HEAD
-=======
     ///
     /// ```example:"Give a dictionary mapping to numbers"
     /// #set text(font: "Cascadia Code")
@@ -748,7 +739,6 @@ pub struct TextElem {
     /// #set text(features: (calt: 0))
     /// =>
     /// ```
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     #[fold]
     #[ghost]
     pub features: FontFeatures,
@@ -1076,7 +1066,6 @@ cast! {
 /// Metrics that describe the top edge of text.
 #[derive(Debug, Copy, Clone, Eq, PartialEq, Hash, Cast)]
 pub enum TopEdgeMetric {
-<<<<<<< HEAD
     /// フォントアセンダー。通常、これは全てのグリフの高さを超えます。
     Ascender,
     /// 大文字の高さの近似値。
@@ -1086,17 +1075,6 @@ pub enum TopEdgeMetric {
     /// 文字が置かれるベースライン。
     Baseline,
     /// グリフが持つバウンディングボックスの上端。
-=======
-    /// The font's ascender, which typically exceeds the height of all glyphs.
-    Ascender,
-    /// The approximate height of uppercase letters.
-    CapHeight,
-    /// The approximate height of non-ascending lowercase letters.
-    XHeight,
-    /// The baseline on which the letters rest.
-    Baseline,
-    /// The top edge of the glyph's bounding box.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     Bounds,
 }
 
@@ -1136,19 +1114,11 @@ cast! {
 /// Metrics that describe the bottom edge of text.
 #[derive(Debug, Copy, Clone, Eq, PartialEq, Hash, Cast)]
 pub enum BottomEdgeMetric {
-<<<<<<< HEAD
     /// 文字が置かれるベースライン。
     Baseline,
     /// フォントディセンダー。通常、これは全てのグリフの深さを超えます。
     Descender,
     /// グリフが持つバウンディングボックスの下端。
-=======
-    /// The baseline on which the letters rest.
-    Baseline,
-    /// The font's descender, which typically exceeds the depth of all glyphs.
-    Descender,
-    /// The bottom edge of the glyph's bounding box.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     Bounds,
 }
 
diff --git a/crates/typst-library/src/text/raw.rs b/crates/typst-library/src/text/raw.rs
index 8513678cdc..38774c969d 100644
--- a/crates/typst-library/src/text/raw.rs
+++ b/crates/typst-library/src/text/raw.rs
@@ -28,7 +28,6 @@ use crate::routines::Routines;
 use crate::text::{FontFamily, FontList, LocalName, TextElem, TextSize};
 use crate::visualize::Color;
 
-<<<<<<< HEAD
 /// オプションでシンタックスハイライトを持つ生テキスト。
 ///
 /// テキストをそのまま等幅フォントで表示します。
@@ -39,20 +38,6 @@ use crate::visualize::Color;
 /// `raw`の代わりに[`text`]($text)でフォントを等幅に設定してください。
 ///
 /// # 例
-=======
-/// Raw text with optional syntax highlighting.
-///
-/// Displays the text verbatim and in a monospace font. This is typically used
-/// to embed computer code into your document.
-///
-/// Note that text given to this element cannot contain arbitrary formatting,
-/// such as `[*strong*]` or `[_emphasis_]`, as it is displayed verbatim. If
-/// you'd like to display any kind of content with a monospace font, instead of
-/// using [`raw`], you should change its font to a monospace font using the
-/// [`text`]($text) function.
-///
-/// # Example
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 /// ````example
 /// Adding `rbx` to `rcx` gives
 /// the desired result.
@@ -72,17 +57,11 @@ use crate::visualize::Color;
 /// also trimmed.
 /// ````
 ///
-<<<<<<< HEAD
 /// また、プログラミング的に文字列から[`raw`]要素を作成できます（オプションの[`lang`]($raw.lang)引数を用いて言語タグを提供できます）。
-=======
-/// You can also construct a [`raw`] element programmatically from a string (and
-/// provide the language tag via the optional [`lang`]($raw.lang) argument).
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 /// ```example
 /// #raw("fn " + "main() {}", lang: "rust")
 /// ```
 ///
-<<<<<<< HEAD
 /// # 構文
 /// この関数には専用の構文もあります。
 /// テキストを1つまたは3つ以上のバッククォート（`` ` ``）で囲むと生テキストにできます。
@@ -117,49 +96,6 @@ use crate::visualize::Color;
 ///
 /// Cascadia Codeでrawテキストを表示。
 /// Pythonコードは今は大きく見えます。
-=======
-/// # Syntax
-/// This function also has dedicated syntax. You can enclose text in 1 or 3+
-/// backticks (`` ` ``) to make it raw. Two backticks produce empty raw text.
-/// This works both in markup and code.
-///
-/// When you use three or more backticks, you can additionally specify a
-/// language tag for syntax highlighting directly after the opening backticks.
-/// Within raw blocks, everything (except for the language tag, if applicable)
-/// is rendered as is, in particular, there are no escape sequences.
-///
-/// The language tag is an identifier that directly follows the opening
-/// backticks only if there are three or more backticks. If your text starts
-/// with something that looks like an identifier, but no syntax highlighting is
-/// needed, start the text with a single space (which will be trimmed) or use
-/// the single backtick syntax. If your text should start or end with a
-/// backtick, put a space before or after it (it will be trimmed).
-///
-/// If no syntax highlighting is available by default for your specified
-/// language tag (or if you want to override the built-in definition), you may
-/// provide a custom syntax specification file to the
-/// [`syntaxes`]($raw.syntaxes) field.
-///
-/// # Styling
-/// By default, the `raw` element uses the `DejaVu Sans Mono` font (included
-/// with Typst), with a smaller font size of `{0.8em}` (that is, 80% of
-/// the global font size). This is because monospace fonts tend to be visually
-/// larger than non-monospace fonts.
-///
-/// You can customize these properties with show-set rules:
-///
-/// ````example
-/// // Switch to Cascadia Code for both
-/// // inline and block raw.
-/// #show raw: set text(font: "Cascadia Code")
-///
-/// // Reset raw blocks to the same size as normal text,
-/// // but keep inline raw at the reduced size.
-/// #show raw.where(block: true): set text(1em / 0.8)
-///
-/// Now using the `Cascadia Code` font for raw text.
-/// Here's some Python code. It looks larger now:
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 ///
 /// ```py
 /// def python():
@@ -167,7 +103,6 @@ use crate::visualize::Color;
 /// ```
 /// ````
 ///
-<<<<<<< HEAD
 /// さらに、[`theme`]($raw.theme)でシンタックスハイライトの色をカスタマイズできます。
 ///
 /// rawブロックの見た目を完全に制御したい場合は、
@@ -178,19 +113,6 @@ use crate::visualize::Color;
 /// [CJK-Latin間隔]($text.cjk-latin-spacing)
 /// （および[rawブロック]($raw.block)の[両端揃え]($par.justify)）が
 /// 既定で無効化されます。
-=======
-/// In addition, you can customize the syntax highlighting colors by setting
-/// a custom theme through the [`theme`]($raw.theme) field.
-///
-/// For complete customization of the appearance of a raw block, a show rule
-/// on [`raw.line`]($raw.line) could be helpful, such as to add line numbers.
-///
-/// Note that, in raw text, typesetting features like
-/// [hyphenation]($text.hyphenate), [overhang]($text.overhang),
-/// [CJK-Latin spacing]($text.cjk-latin-spacing) (and
-/// [justification]($par.justify) for [raw blocks]($raw.block)) will be
-/// disabled by default.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 #[elem(
     scope,
     title = "Raw Text / Code",
@@ -203,20 +125,11 @@ use crate::visualize::Color;
     PlainText
 )]
 pub struct RawElem {
-<<<<<<< HEAD
     /// 生テキスト。
     ///
     /// 自動化のために、rawブロックを使ってカスタム構文をクリエイティブに作成できます。
     ///
     /// ````example
-=======
-    /// The raw text.
-    ///
-    /// You can also use raw blocks creatively to create custom syntaxes for
-    /// your automations.
-    ///
-    /// ````example:"Implementing a DSL using raw and show rules"
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     /// // Parse numbers in raw blocks with the
     /// // `mydsl` tag and sum them up.
     /// #show raw.where(lang: "mydsl"): it => {
@@ -234,18 +147,10 @@ pub struct RawElem {
     #[required]
     pub text: RawContent,
 
-<<<<<<< HEAD
     /// 生テキストを独立したブロックとして表示するかどうか。
     ///
     /// マークアップモードでは、バッククォート1つを使うとこれは`{false}`になります。
     /// バッククォート3つ使うと、囲まれたコンテンツが1つ以上の改行を含む場合は`{true}`になります。
-=======
-    /// Whether the raw text is displayed as a separate block.
-    ///
-    /// In markup mode, using one-backtick notation makes this `{false}`.
-    /// Using three-backtick notation makes it `{true}` if the enclosed content
-    /// contains at least one line break.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     ///
     /// ````example
     /// // Display inline code in a small box
@@ -276,19 +181,9 @@ pub struct RawElem {
     #[default(false)]
     pub block: bool,
 
-<<<<<<< HEAD
     /// シンタックスハイライトする言語。
     ///
     /// Markdownで用いられている一般的な言語以外では、[Typst markup]($reference/syntax/#markup)の`{"typ"}`、[Typst code]($reference/syntax/#code)の`{"typc"}`、[Typst math]($reference/syntax/#math)の`{"typm"}`のタグがそれぞれサポートされています。
-=======
-    /// The language to syntax-highlight in.
-    ///
-    /// Apart from typical language tags known from Markdown, this supports the
-    /// `{"typ"}`, `{"typc"}`, and `{"typm"}` tags for
-    /// [Typst markup]($reference/syntax/#markup),
-    /// [Typst code]($reference/syntax/#code), and
-    /// [Typst math]($reference/syntax/#math), respectively.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     ///
     /// ````example
     /// ```typ
@@ -299,22 +194,10 @@ pub struct RawElem {
     /// ````
     pub lang: Option<EcoString>,
 
-<<<<<<< HEAD
     /// rawブロック中の各行が持つべき水平方向の配置。
     /// このオプションはrawブロックではない（`block: false`が指定されるか、マークアップモードで1つのバッククォートが使用された）場合は無視されます。
     ///
     /// これはデフォルトでは`{start}`で、現在のコンテキストの配置によらず、生テキストがブロック内部の書き始めの位置揃えになることを意味します（例えば、内部テキストを中央揃えにせずrawブロックを中央揃えにできます）。
-=======
-    /// The horizontal alignment that each line in a raw block should have.
-    /// This option is ignored if this is not a raw block (if specified
-    /// `block: false` or single backticks were used in markup mode).
-    ///
-    /// By default, this is set to `{start}`, meaning that raw text is
-    /// aligned towards the start of the text direction inside the block
-    /// by default, regardless of the current context's alignment (allowing
-    /// you to center the raw block itself without centering the text inside
-    /// it, for example).
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     ///
     /// ````example
     /// #set raw(align: center)
@@ -327,7 +210,6 @@ pub struct RawElem {
     #[default(HAlignment::Start)]
     pub align: HAlignment,
 
-<<<<<<< HEAD
     /// 追加で読み込む構文定義。
     /// 構文定義は[`sublime-syntax`ファイル形式](https://www.sublimetext.com/docs/syntax.html)でなければなりません。
     ///
@@ -337,17 +219,6 @@ pub struct RawElem {
     /// パスに関する詳細は[パスのセクション]($syntax/#paths)を参照してください。
     /// - 構文をデコードするための生バイト列。
     /// - 各アイテムが上記のいずれかである配列。
-=======
-    /// Additional syntax definitions to load. The syntax definitions should be
-    /// in the [`sublime-syntax` file format](https://www.sublimetext.com/docs/syntax.html).
-    ///
-    /// You can pass any of the following values:
-    ///
-    /// - A path string to load a syntax file from the given path. For more
-    ///   details about paths, see the [Paths section]($syntax/#paths).
-    /// - Raw bytes from which the syntax should be decoded.
-    /// - An array where each item is one of the above.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     ///
     /// ````example
     /// #set raw(syntaxes: "SExpressions.sublime-syntax")
@@ -367,7 +238,6 @@ pub struct RawElem {
     #[fold]
     pub syntaxes: Derived<OneOrMultiple<DataSource>, Vec<RawSyntax>>,
 
-<<<<<<< HEAD
     /// シンタックスハイライトに用いるテーマ。
     /// テーマは[`tmTheme`ファイル形式](https://www.sublimetext.com/docs/color_schemes_tmtheme.html)でなければなりません。
     ///
@@ -382,25 +252,6 @@ pub struct RawElem {
     /// テーマの適用はハイライトされたテキストの色にのみ影響を与えます。テーマの前景および背景プロパティは無視され、生テキストの色の制御は残ります。
     /// [`text`]関数を用いて前景色を、[ブロックの塗り潰し]($block.fill)を用いて背景色を、それぞれ手動で設定できます。
     /// [`xml`]関数でもこれらのプロパティをテーマから抽出できます。
-=======
-    /// The theme to use for syntax highlighting. Themes should be in the
-    /// [`tmTheme` file format](https://www.sublimetext.com/docs/color_schemes_tmtheme.html).
-    ///
-    /// You can pass any of the following values:
-    ///
-    /// - `{none}`: Disables syntax highlighting.
-    /// - `{auto}`: Highlights with Typst's default theme.
-    /// - A path string to load a theme file from the given path. For more
-    ///   details about paths, see the [Paths section]($syntax/#paths).
-    /// - Raw bytes from which the theme should be decoded.
-    ///
-    /// Applying a theme only affects the color of specifically highlighted
-    /// text. It does not consider the theme's foreground and background
-    /// properties, so that you retain control over the color of raw text. You
-    /// can apply the foreground color yourself with the [`text`] function and
-    /// the background with a [filled block]($block.fill). You could also use
-    /// the [`xml`] function to extract these properties from the theme.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     ///
     /// ````example
     /// #set raw(theme: "halcyon.tmTheme")
@@ -426,13 +277,8 @@ pub struct RawElem {
     })]
     pub theme: Smart<Option<Derived<DataSource, RawTheme>>>,
 
-<<<<<<< HEAD
     /// スペースで測ったタブ幅。
     /// タブは、次のタブ幅の整数倍位置までのスペースで置き換えられます。
-=======
-    /// The size for a tab stop in spaces. A tab is replaced with enough spaces to
-    /// align with the next multiple of the size.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     ///
     /// ````example
     /// #set raw(tab-size: 8)
@@ -802,7 +648,6 @@ fn format_theme_error(error: syntect::LoadingError) -> LoadError {
     LoadError::new(pos, "failed to parse theme", error)
 }
 
-<<<<<<< HEAD
 /// ハイライトされた生テキストの行。
 ///
 /// これは[`raw`]要素によって合成される補助要素です。
@@ -824,30 +669,6 @@ pub struct RawLine {
     pub text: EcoString,
 
     /// ハイライトされた生テキスト。
-=======
-/// A highlighted line of raw text.
-///
-/// This is a helper element that is synthesized by [`raw`] elements.
-///
-/// It allows you to access various properties of the line, such as the line
-/// number, the raw non-highlighted text, the highlighted text, and whether it
-/// is the first or last line of the raw block.
-#[elem(name = "line", title = "Raw Text / Code Line", Tagged, PlainText)]
-pub struct RawLine {
-    /// The line number of the raw line inside of the raw block, starts at 1.
-    #[required]
-    pub number: i64,
-
-    /// The total number of lines in the raw block.
-    #[required]
-    pub count: i64,
-
-    /// The line of raw text.
-    #[required]
-    pub text: EcoString,
-
-    /// The highlighted raw text.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     #[required]
     pub body: Content,
 }
diff --git a/crates/typst-library/src/text/shift.rs b/crates/typst-library/src/text/shift.rs
index 56e259d6f2..d16ce27690 100644
--- a/crates/typst-library/src/text/shift.rs
+++ b/crates/typst-library/src/text/shift.rs
@@ -5,25 +5,16 @@ use crate::foundations::{Content, Smart, elem};
 use crate::layout::{Em, Length};
 use crate::text::{FontMetrics, ScriptMetrics, TextSize};
 
-<<<<<<< HEAD
 /// テキストを下付き文字でレンダリング。
 ///
 /// テキストは小さくレンダリングされ、ベースラインは低くなります。
 ///
 /// # 例
-=======
-/// Renders text in subscript.
-///
-/// The text is rendered smaller and its baseline is lowered.
-///
-/// # Example
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 /// ```example
 /// Revenue#sub[yearly]
 /// ```
 #[elem(title = "Subscript", Tagged)]
 pub struct SubElem {
-<<<<<<< HEAD
     /// フォントの下付き文字専用のグリフを優先するかどうか。
     ///
     /// 理想的にはフォントがOpenTypeフィーチャーの`subs`で下付きグリフを提供します。
@@ -31,18 +22,6 @@ pub struct SubElem {
     ///
     /// `{false}`にすると、フォントが下付きグリフを持っていても合成を使用します。
     /// `{true}`でも、フォントに必要なグリフがない場合は合成にフォールバックします。
-=======
-    /// Whether to use subscript glyphs from the font if available.
-    ///
-    /// Ideally, subscripts glyphs are provided by the font (using the `subs`
-    /// OpenType feature). Otherwise, Typst is able to synthesize subscripts by
-    /// lowering and scaling down regular glyphs.
-    ///
-    /// When this is set to `{false}`, synthesized glyphs will be used
-    /// regardless of whether the font provides dedicated subscript glyphs. When
-    /// `{true}`, synthesized glyphs may still be used in case the font does not
-    /// provide the necessary subscript glyphs.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     ///
     /// ```example
     /// N#sub(typographic: true)[1]
@@ -51,7 +30,6 @@ pub struct SubElem {
     #[default(true)]
     pub typographic: bool,
 
-<<<<<<< HEAD
     /// 合成した下付き文字のベースラインの下方向シフト。
     ///
     /// これは合成時のみ有効です。つまり、`typographic`が`true`かつ、
@@ -71,54 +49,20 @@ pub struct SubElem {
     pub size: Smart<TextSize>,
 
     /// 下付き文字で表示するテキスト。
-=======
-    /// The downward baseline shift for synthesized subscripts.
-    ///
-    /// This only applies to synthesized subscripts. In other words, this has no
-    /// effect if `typographic` is `{true}` and the font provides the necessary
-    /// subscript glyphs.
-    ///
-    /// If set to `{auto}`, the baseline is shifted according to the metrics
-    /// provided by the font, with a fallback to `{0.2em}` in case the font does
-    /// not define the necessary metrics.
-    pub baseline: Smart<Length>,
-
-    /// The font size for synthesized subscripts.
-    ///
-    /// This only applies to synthesized subscripts. In other words, this has no
-    /// effect if `typographic` is `{true}` and the font provides the necessary
-    /// subscript glyphs.
-    ///
-    /// If set to `{auto}`, the size is scaled according to the metrics provided
-    /// by the font, with a fallback to `{0.6em}` in case the font does not
-    /// define the necessary metrics.
-    pub size: Smart<TextSize>,
-
-    /// The text to display in subscript.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     #[required]
     pub body: Content,
 }
 
-<<<<<<< HEAD
 /// テキストを上付き文字でレンダリング。
 ///
 /// テキストは小さくレンダリングされ、ベースラインは高くなります。
 ///
 /// # 例
-=======
-/// Renders text in superscript.
-///
-/// The text is rendered smaller and its baseline is raised.
-///
-/// # Example
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 /// ```example
 /// 1#super[st] try!
 /// ```
 #[elem(title = "Superscript", Tagged)]
 pub struct SuperElem {
-<<<<<<< HEAD
     /// フォントの上付き文字専用のグリフを優先するかどうか。
     ///
     /// 理想的にはフォントがOpenTypeフィーチャーの`sups`で上付きグリフを提供します。
@@ -126,18 +70,6 @@ pub struct SuperElem {
     ///
     /// `{false}`にすると、フォントが上付きグリフを持っていても合成を使用します。
     /// `{true}`でも、フォントに必要なグリフがない場合は合成にフォールバックします。
-=======
-    /// Whether to use superscript glyphs from the font if available.
-    ///
-    /// Ideally, superscripts glyphs are provided by the font (using the `sups`
-    /// OpenType feature). Otherwise, Typst is able to synthesize superscripts
-    /// by raising and scaling down regular glyphs.
-    ///
-    /// When this is set to `{false}`, synthesized glyphs will be used
-    /// regardless of whether the font provides dedicated superscript glyphs.
-    /// When `{true}`, synthesized glyphs may still be used in case the font
-    /// does not provide the necessary superscript glyphs.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     ///
     /// ```example
     /// N#super(typographic: true)[1]
@@ -146,7 +78,6 @@ pub struct SuperElem {
     #[default(true)]
     pub typographic: bool,
 
-<<<<<<< HEAD
     /// 合成した上付き文字のベースラインの下方向シフト。
     ///
     /// これは合成時のみ有効です。つまり、`typographic`が`true`かつ、
@@ -169,35 +100,6 @@ pub struct SuperElem {
     pub size: Smart<TextSize>,
 
     /// 上付き文字で表示するテキスト。
-=======
-    /// The downward baseline shift for synthesized superscripts.
-    ///
-    /// This only applies to synthesized superscripts. In other words, this has
-    /// no effect if `typographic` is `{true}` and the font provides the
-    /// necessary superscript glyphs.
-    ///
-    /// If set to `{auto}`, the baseline is shifted according to the metrics
-    /// provided by the font, with a fallback to `{-0.5em}` in case the font
-    /// does not define the necessary metrics.
-    ///
-    /// Note that, since the baseline shift is applied downward, you will need
-    /// to provide a negative value for the content to appear as raised above
-    /// the normal baseline.
-    pub baseline: Smart<Length>,
-
-    /// The font size for synthesized superscripts.
-    ///
-    /// This only applies to synthesized superscripts. In other words, this has
-    /// no effect if `typographic` is `{true}` and the font provides the
-    /// necessary superscript glyphs.
-    ///
-    /// If set to `{auto}`, the size is scaled according to the metrics provided
-    /// by the font, with a fallback to `{0.6em}` in case the font does not
-    /// define the necessary metrics.
-    pub size: Smart<TextSize>,
-
-    /// The text to display in superscript.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     #[required]
     pub body: Content,
 }
diff --git a/crates/typst-library/src/text/smallcaps.rs b/crates/typst-library/src/text/smallcaps.rs
index aa090a4ddf..204172c767 100644
--- a/crates/typst-library/src/text/smallcaps.rs
+++ b/crates/typst-library/src/text/smallcaps.rs
@@ -1,54 +1,29 @@
 use crate::foundations::{Content, elem};
 
-<<<<<<< HEAD
 /// スモールキャピタルでテキストを表示。
 ///
 /// # 例
-=======
-/// Displays text in small capitals.
-///
-/// # Example
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 /// ```example
 /// Hello \
 /// #smallcaps[Hello]
 /// ```
 ///
-<<<<<<< HEAD
 /// # スモールキャピタルのフォント
 /// デフォルトでは、この関数はフォントのOpenTypeフィーチャーの`smcp`および`c2sc`を使用します。
 /// 全てのフォントがこれらのフィーチャーをサポートしているわけではありません。
 /// スモールキャピタルは専用のフォントとして提供されることがあります。
 /// この例として_Latin Modern_フォントファミリーが該当します。
 /// この場合、show-setルールを用いてスモールキャピタルでのテキストの見た目がカスタマイズできます。
-=======
-/// # Smallcaps fonts
-/// By default, this uses the `smcp` and `c2sc` OpenType features on the font.
-/// Not all fonts support these features. Sometimes, smallcaps are part of a
-/// dedicated font. This is, for example, the case for the _Latin Modern_ family
-/// of fonts. In those cases, you can use a show-set rule to customize the
-/// appearance of the text in smallcaps:
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 ///
 /// ```typ
 /// #show smallcaps: set text(font: "Latin Modern Roman Caps")
 /// ```
 ///
-<<<<<<< HEAD
 /// 将来的に、この関数は標準サイズの文字からスモールキャピタルの文字を合成することをサポートする予定ですが、まだ実装されていません。
 ///
 /// # スモールキャピタルの見出し
 /// [showルール]($styling/#show-rules)を用いて見出し全てにスモールキャピタルを適用できます。
 /// 以下の例では、見出しを中央揃えにし、通常の太字フォントの無効化も行っています。
-=======
-/// In the future, this function will support synthesizing smallcaps from normal
-/// letters, but this is not yet implemented.
-///
-/// # Smallcaps headings
-/// You can use a [show rule]($styling/#show-rules) to apply smallcaps
-/// formatting to all your headings. In the example below, we also center-align
-/// our headings and disable the standard bold font.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 ///
 /// ```example
 /// #set par(justify: true)
@@ -65,16 +40,9 @@ use crate::foundations::{Content, elem};
 /// ```
 #[elem(title = "Small Capitals")]
 pub struct SmallcapsElem {
-<<<<<<< HEAD
     /// 大文字も同様にスモールキャピタルに変更するかどうか。
     ///
     /// showルールで上書きされない限り、これはOpenTypeフィーチャーの`c2sc`を有効化します。
-=======
-    /// Whether to turn uppercase letters into small capitals as well.
-    ///
-    /// Unless overridden by a show rule, this enables the `c2sc` OpenType
-    /// feature.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     ///
     /// ```example
     /// #smallcaps(all: true)[UNICEF] is an
@@ -82,11 +50,7 @@ pub struct SmallcapsElem {
     /// ```
     #[default(false)]
     pub all: bool,
-<<<<<<< HEAD
     /// スモールキャピタルで表示するコンテンツ。
-=======
-    /// The content to display in small capitals.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     #[required]
     pub body: Content,
 }
diff --git a/crates/typst-library/src/text/smartquote.rs b/crates/typst-library/src/text/smartquote.rs
index 2edc67422b..254f6b6816 100644
--- a/crates/typst-library/src/text/smartquote.rs
+++ b/crates/typst-library/src/text/smartquote.rs
@@ -10,20 +10,11 @@ use crate::foundations::{
 use crate::layout::Dir;
 use crate::text::{Lang, Region, TextElem};
 
-<<<<<<< HEAD
 /// 言語を認識し、コンテキストに反応する引用符。
 ///
 /// アクティブな[テキストの言語設定]($text.lang)に基づいて適切な開き引用符か閉じ引用符に自動的に変更します。
 ///
 /// # 例
-=======
-/// A language-aware quote that reacts to its context.
-///
-/// Automatically turns into an appropriate opening or closing quote based on
-/// the active [text language]($text.lang).
-///
-/// # Example
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 /// ```example
 /// "This is in quotes."
 ///
@@ -34,7 +25,6 @@ use crate::text::{Lang, Region, TextElem};
 /// "C'est entre guillemets."
 /// ```
 ///
-<<<<<<< HEAD
 /// # 構文
 /// この関数は専用の構文もあります。
 /// 通常の引用記号（`'`と`"`）です。
@@ -48,21 +38,6 @@ pub struct SmartQuoteElem {
     /// スマートクォートを有効化するかどうか。
     ///
     /// 単一引用符の場合は、バックスラッシュでエスケープしても無効化できます。
-=======
-/// # Syntax
-/// This function also has dedicated syntax: The normal quote characters
-/// (`'` and `"`). Typst automatically makes your quotes smart.
-#[elem(name = "smartquote", PlainText)]
-pub struct SmartQuoteElem {
-    /// Whether this should be a double quote.
-    #[default(true)]
-    pub double: bool,
-
-    /// Whether smart quotes are enabled.
-    ///
-    /// To disable smartness for a single quote, you can also escape it with a
-    /// backslash.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     ///
     /// ```example
     /// #set smartquote(enabled: false)
@@ -72,16 +47,9 @@ pub struct SmartQuoteElem {
     #[default(true)]
     pub enabled: bool,
 
-<<<<<<< HEAD
     /// 代替引用符を使用するかどうか。
     ///
     /// 代替引用符を持たない言語に対してや、明示的に引用符が設定されている場合には、何もしません。
-=======
-    /// Whether to use alternative quotes.
-    ///
-    /// Does nothing for languages that don't have alternative quotes, or if
-    /// explicit quotes were set.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     ///
     /// ```example
     /// #set text(lang: "de")
@@ -92,7 +60,6 @@ pub struct SmartQuoteElem {
     #[default(false)]
     pub alternative: bool,
 
-<<<<<<< HEAD
     /// 使用する引用符。
     ///
     /// - `{auto}`に設定された場合、[テキストの言語]($text.lang)に対して適切な単一引用符が使用されます。これがデフォルトです。
@@ -100,19 +67,6 @@ pub struct SmartQuoteElem {
     ///   - [文字列]($str): 開き二重引用符と閉じ二重引用符の2文字からなる文字列（ここの文字はUnicodeグラフェムクラスターを指します）
     ///   - [配列]($array): 開き二重引用符と閉じ二重引用符を持つ配列
     ///   - [辞書]($dictionary): doubleやsingleをキーとして引用符を指定する辞書。その値は`{auto}`、文字列、配列のいずれかで指定します。
-=======
-    /// The quotes to use.
-    ///
-    /// - When set to `{auto}`, the appropriate single quotes for the
-    ///   [text language]($text.lang) will be used. This is the default.
-    /// - Custom quotes can be passed as a string, array, or dictionary of either
-    ///   - [string]($str): a string consisting of two characters containing the
-    ///     opening and closing double quotes (characters here refer to Unicode
-    ///     grapheme clusters)
-    ///   - [array]: an array containing the opening and closing double quotes
-    ///   - [dictionary]: a dictionary containing the double and single quotes, each
-    ///     specified as either `{auto}`, string, or array
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     ///
     /// ```example
     /// #set text(lang: "de")
diff --git a/crates/typst-library/src/visualize/image/mod.rs b/crates/typst-library/src/visualize/image/mod.rs
index 98f9e3fa56..739433d493 100644
--- a/crates/typst-library/src/visualize/image/mod.rs
+++ b/crates/typst-library/src/visualize/image/mod.rs
@@ -33,7 +33,6 @@ use crate::model::Figurable;
 use crate::text::{LocalName, Locale, families};
 use crate::visualize::image::pdf::PdfDocument;
 
-<<<<<<< HEAD
 /// ラスターまたはベクター画像。
 ///
 /// 画像を[`figure`]で囲むことで、番号とキャプションを与えられます。
@@ -42,17 +41,6 @@ use crate::visualize::image::pdf::PdfDocument;
 /// 画像を強制的にインラインにするには、[`box`]の中に入れてください。
 ///
 /// # 例
-=======
-/// A raster or vector graphic.
-///
-/// You can wrap the image in a [`figure`] to give it a number and caption.
-///
-/// Like most elements, images are _block-level_ by default and thus do not
-/// integrate themselves into adjacent paragraphs. To force an image to become
-/// inline, put it into a [`box`].
-///
-/// # Example
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 /// ```example
 /// #figure(
 ///   image("molecular.jpg", width: 80%),
@@ -64,19 +52,11 @@ use crate::visualize::image::pdf::PdfDocument;
 /// ```
 #[elem(scope, Locatable, Tagged, Synthesize, LocalName, Figurable)]
 pub struct ImageElem {
-<<<<<<< HEAD
     /// 画像ファイルへの[path]($syntax/#paths)、
     /// またはサポートされている[format]($image.format)の画像データの生バイト。
     ///
     /// バイト列を使う場合は、生のピクセルデータを左から右へ、上から下へと並べた
     /// 行優先（row-major）形式で指定します。
-=======
-    /// A [path]($syntax/#paths) to an image file or raw bytes making up an
-    /// image in one of the supported [formats]($image.format).
-    ///
-    /// Bytes can be used to specify raw pixel data in a row-major,
-    /// left-to-right, top-to-bottom format.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     ///
     /// ```example
     /// #let original = read("diagram.svg")
@@ -96,7 +76,6 @@ pub struct ImageElem {
     )]
     pub source: Derived<DataSource, Loaded>,
 
-<<<<<<< HEAD
     /// 画像のフォーマット。
     ///
     /// デフォルトでは、フォーマットは自動的に検出されます。
@@ -129,43 +108,6 @@ pub struct ImageElem {
     ///
     /// 幅のピクセル数、高さのピクセル数、指定したエンコーディングでのチャンネル数をかけ合わせたものが
     /// `source`のデータと一致しなければなりません。
-=======
-    /// The image's format.
-    ///
-    /// By default, the format is detected automatically. Typically, you thus
-    /// only need to specify this when providing raw bytes as the
-    /// [`source`]($image.source) (even then, Typst will try to figure out the
-    /// format automatically, but that's not always possible).
-    ///
-    /// Supported formats are `{"png"}`, `{"jpg"}`, `{"gif"}`, `{"svg"}`,
-    /// `{"pdf"}`, `{"webp"}` as well as raw pixel data.
-    ///
-    /// Note that several restrictions apply when using PDF files as images:
-    ///
-    /// - When exporting to PDF, any PDF image file used must have a version
-    ///   equal to or lower than the [export target PDF
-    ///   version]($pdf/#pdf-versions).
-    /// - PDF files as images are currently not supported when exporting with a
-    ///   specific PDF standard, like PDF/A-3 or PDF/UA-1. In these cases, you
-    ///   can instead use SVGs to embed vector images.
-    /// - The image file must not be password-protected.
-    /// - Tags in your PDF image will not be preserved. Instead, you must
-    ///   provide an [alternative description]($image.alt) to make the image
-    ///   accessible.
-    ///
-    /// When providing raw pixel data as the `source`, you must specify a
-    /// dictionary with the following keys as the `format`:
-    /// - `encoding` ([str]): The encoding of the pixel data. One of:
-    ///   - `{"rgb8"}` (three 8-bit channels: red, green, blue)
-    ///   - `{"rgba8"}` (four 8-bit channels: red, green, blue, alpha)
-    ///   - `{"luma8"}` (one 8-bit channel)
-    ///   - `{"lumaa8"}` (two 8-bit channels: luma and alpha)
-    /// - `width` ([int]): The pixel width of the image.
-    /// - `height` ([int]): The pixel height of the image.
-    ///
-    /// The pixel width multiplied by the height multiplied by the channel count
-    /// for the specified encoding must then match the `source` data.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     ///
     /// ```example
     /// #image(
@@ -189,7 +131,6 @@ pub struct ImageElem {
     /// ```
     pub format: Smart<ImageFormat>,
 
-<<<<<<< HEAD
     /// 画像の幅。
     pub width: Smart<Rel<Length>>,
 
@@ -217,39 +158,6 @@ pub struct ImageElem {
     /// 与えられた領域に対して、画像をどのように調整するか。
     /// 領域は `width` や `height` フィールドで定義します。
     /// 領域の縦横比が画像の縦横比と同じであれば、`fit` で見た目が変わらないことに注意してください。
-=======
-    /// The width of the image.
-    pub width: Smart<Rel<Length>>,
-
-    /// The height of the image.
-    pub height: Sizing,
-
-    /// An alternative description of the image.
-    ///
-    /// This text is used by Assistive Technology (AT) like screen readers to
-    /// describe the image to users with visual impairments.
-    ///
-    /// When the image is wrapped in a [`figure`]($figure), use this parameter
-    /// rather than the [figure's `alt` parameter]($figure.alt) to describe the
-    /// image. The only exception to this rule is when the image and the other
-    /// contents in the figure form a single semantic unit. In this case, use
-    /// the figure's `alt` parameter to describe the entire composition and do
-    /// not use this parameter.
-    ///
-    /// You can learn how to write good alternative descriptions in the
-    /// [Accessibility Guide]($guides/accessibility/#textual-representations).
-    pub alt: Option<EcoString>,
-
-    /// The page number that should be embedded as an image. This attribute only
-    /// has an effect for PDF files.
-    #[default(NonZeroUsize::ONE)]
-    pub page: NonZeroUsize,
-
-    /// How the image should adjust itself to a given area (the area is defined
-    /// by the `width` and `height` fields). Note that `fit` doesn't visually
-    /// change anything if the area's aspect ratio is the same as the image's
-    /// one.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     ///
     /// ```example
     /// #set page(width: 300pt, height: 50pt, margin: 10pt)
@@ -260,7 +168,6 @@ pub struct ImageElem {
     #[default(ImageFit::Cover)]
     pub fit: ImageFit,
 
-<<<<<<< HEAD
     /// ビューアーに対して、画像をどのように拡大縮小すべきかを示すヒント。
     ///
     /// `{auto}`に設定した場合、デフォルトの動作はビューアーに委ねられます。
@@ -274,21 +181,6 @@ pub struct ImageElem {
     ///
     /// ICCプロファイルは、画像の色をどのように解釈するかを定義するものです。
     /// `{auto}`に設定した場合、Typstは画像からICCプロファイルを抽出しようとします。
-=======
-    /// A hint to viewers how they should scale the image.
-    ///
-    /// When set to `{auto}`, the default is left up to the viewer. For PNG
-    /// export, Typst will default to smooth scaling, like most PDF and SVG
-    /// viewers.
-    ///
-    /// _Note:_ The exact look may differ across PDF viewers.
-    pub scaling: Smart<ImageScaling>,
-
-    /// An ICC profile for the image.
-    ///
-    /// ICC profiles define how to interpret the colors in an image. When set
-    /// to `{auto}`, Typst will try to extract an ICC profile from the image.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     #[parse(match args.named::<Spanned<Smart<DataSource>>>("icc")? {
         Some(Spanned { v: Smart::Custom(source), span }) => Some(Smart::Custom({
             let loaded = Spanned::new(&source, span).load(engine.world)?;
@@ -299,11 +191,7 @@ pub struct ImageElem {
     })]
     pub icc: Smart<Derived<DataSource, Bytes>>,
 
-<<<<<<< HEAD
     /// この要素のロケール（代替説明に使用）。
-=======
-    /// The locale of this element (used for the alternative description).
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     #[internal]
     #[synthesized]
     pub locale: Locale,
@@ -319,22 +207,14 @@ impl Synthesize for Packed<ImageElem> {
 #[scope]
 #[allow(clippy::too_many_arguments)]
 impl ImageElem {
-<<<<<<< HEAD
     /// バイト列または文字列からラスター画像またはベクター画像をデコードする。
     #[func(title = "Decode Image")]
     #[deprecated(
         message = "`image.decode`は非推奨です。代わりにバイト列を直接`image`に渡してください。",
-=======
-    /// Decode a raster or vector graphic from bytes or a string.
-    #[func(title = "Decode Image")]
-    #[deprecated(
-        message = "`image.decode` is deprecated, directly pass bytes to `image` instead",
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
         until = "0.15.0"
     )]
     pub fn decode(
         span: Span,
-<<<<<<< HEAD
         /// 画像としてデコードするデータ。SVGの場合は文字列です。
         data: Spanned<Readable>,
         /// 画像のフォーマット。デフォルトでは自動的に検出されます。
@@ -353,26 +233,6 @@ impl ImageElem {
         #[named]
         fit: Option<ImageFit>,
         /// ビューアーがどのように拡大縮小すべきかを示すヒント。
-=======
-        /// The data to decode as an image. Can be a string for SVGs.
-        data: Spanned<Readable>,
-        /// The image's format. Detected automatically by default.
-        #[named]
-        format: Option<Smart<ImageFormat>>,
-        /// The width of the image.
-        #[named]
-        width: Option<Smart<Rel<Length>>>,
-        /// The height of the image.
-        #[named]
-        height: Option<Sizing>,
-        /// A text describing the image.
-        #[named]
-        alt: Option<Option<EcoString>>,
-        /// How the image should adjust itself to a given area.
-        #[named]
-        fit: Option<ImageFit>,
-        /// A hint to viewers how they should scale the image.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
         #[named]
         scaling: Option<Smart<ImageScaling>>,
     ) -> StrResult<Content> {
@@ -551,7 +411,6 @@ impl Figurable for Packed<ImageElem> {}
 /// How an image should adjust itself to a given area,
 #[derive(Debug, Copy, Clone, Eq, PartialEq, Hash, Cast)]
 pub enum ImageFit {
-<<<<<<< HEAD
     /// 領域を完全にカバーします。
     /// 水平または垂直方向にのみ画像をトリミングすることで、アスペクト比を保持します。
     /// これがデフォルトです。
@@ -561,19 +420,6 @@ pub enum ImageFit {
     Contain,
     /// たとえ画像が歪むことになっても、その領域を正確に埋めるよう引き伸ばします。
     /// アスペクト比は保たれず、画像は切り取られません。
-=======
-    /// The image should completely cover the area (preserves aspect ratio by
-    /// cropping the image only horizontally or vertically). This is the
-    /// default.
-    Cover,
-    /// The image should be fully contained in the area (preserves aspect
-    /// ratio; doesn't crop the image; one dimension can be narrower than
-    /// specified).
-    Contain,
-    /// The image should be stretched so that it exactly fills the area, even if
-    /// this means that the image will be distorted (doesn't preserve aspect
-    /// ratio and doesn't crop the image).
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     Stretch,
 }
 
@@ -766,11 +612,7 @@ fn is_svg(data: &[u8]) -> bool {
 /// A vector graphics format.
 #[derive(Debug, Copy, Clone, Eq, PartialEq, Hash, Cast)]
 pub enum VectorFormat {
-<<<<<<< HEAD
     /// Webサイトに用いられるベクターフォーマット。
-=======
-    /// The vector graphics format of the web.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     Svg,
     /// High-fidelity document and graphics format, with focus on exact
     /// reproduction in print.
@@ -805,16 +647,9 @@ cast! {
 /// The image scaling algorithm a viewer should use.
 #[derive(Debug, Copy, Clone, Eq, PartialEq, Hash, Cast)]
 pub enum ImageScaling {
-<<<<<<< HEAD
     /// バイリニア補間などの平滑化アルゴリズムを用いて拡大縮小します。
     Smooth,
     /// 最近傍補間などのアルゴリズムで拡大縮小し、
     /// ピクセルで構成された画像の見た目を保ちます。
-=======
-    /// Scale with a smoothing algorithm such as bilinear interpolation.
-    Smooth,
-    /// Scale with nearest neighbor or a similar algorithm to preserve the
-    /// pixelated look of the image.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     Pixelated,
 }
diff --git a/crates/typst-library/src/visualize/image/raster.rs b/crates/typst-library/src/visualize/image/raster.rs
index 6f8ec82854..06837f4be0 100644
--- a/crates/typst-library/src/visualize/image/raster.rs
+++ b/crates/typst-library/src/visualize/image/raster.rs
@@ -240,21 +240,12 @@ cast! {
 /// A raster format typically used in image exchange, with efficient encoding.
 #[derive(Debug, Copy, Clone, Eq, PartialEq, Hash, Cast)]
 pub enum ExchangeFormat {
-<<<<<<< HEAD
     /// イラストや透明グラフィック用のラスターフォーマット。
     Png,
     /// 写真に適した非可逆ラスターフォーマット。
     Jpg,
     /// 短いアニメーションクリップによく使われるラスターフォーマット。
     /// TypstはGIFを読み込めるが、静止画となってしまう。
-=======
-    /// Raster format for illustrations and transparent graphics.
-    Png,
-    /// Lossy raster format suitable for photos.
-    Jpg,
-    /// Raster format that is typically used for short animated clips. Typst can
-    /// load GIFs, but they will become static.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     Gif,
     /// Raster format that supports both lossy and lossless compression.
     Webp,
diff --git a/crates/typst-pdf/src/convert.rs b/crates/typst-pdf/src/convert.rs
index 7eb68e5305..0bbf634af9 100644
--- a/crates/typst-pdf/src/convert.rs
+++ b/crates/typst-pdf/src/convert.rs
@@ -13,13 +13,9 @@ use krilla::{Document, SerializeSettings};
 use krilla_svg::render_svg_glyph;
 use rustc_hash::{FxBuildHasher, FxHashMap, FxHashSet};
 use smallvec::SmallVec;
-<<<<<<< HEAD
-use typst_library::diag::{SourceDiagnostic, SourceResult, bail, error};
-=======
 use typst_library::diag::{
     At, ExpectInternal, SourceDiagnostic, SourceResult, bail, error,
 };
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 use typst_library::foundations::{NativeElement, Repr};
 use typst_library::introspection::{Location, Tag};
 use typst_library::layout::{
@@ -124,12 +120,6 @@ fn convert_pages(gc: &mut GlobalContext, document: &mut Document) -> SourceResul
             // Don't export this page.
             continue;
         } else {
-<<<<<<< HEAD
-            let mut settings = PageSettings::new(
-                typst_page.frame.width().to_f32(),
-                typst_page.frame.height().to_f32(),
-            );
-=======
             // PDF 1.4 upwards to 1.7 specifies a minimum page size of 3x3 units.
             // PDF 2.0 doesn't define an explicit limit, but krilla and probably
             // some viewers won't handle pages that have zero sized pages.
@@ -139,7 +129,6 @@ fn convert_pages(gc: &mut GlobalContext, document: &mut Document) -> SourceResul
             )
             .expect_internal("invalid page size")
             .at(Span::detached())?;
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 
             if let Some(label) = typst_page
                 .numbering
@@ -417,13 +406,8 @@ pub(crate) fn handle_group(
     Ok(())
 }
 
-<<<<<<< HEAD
-#[typst_macros::time(name = "finish export")]
-/// Finish a krilla document and handle export errors.
-=======
 /// Finish a krilla document and handle export errors.
 #[typst_macros::time(name = "finish export")]
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 fn finish(
     document: Document,
     gc: GlobalContext,
@@ -434,19 +418,11 @@ fn finish(
     match document.finish() {
         Ok(r) => Ok(r),
         Err(e) => match e {
-<<<<<<< HEAD
-            KrillaError::Font(f, s) => {
-                let font_str = display_font(gc.fonts_backward.get(&f).unwrap());
-                bail!(
-                    Span::detached(),
-                    "failed to process font {font_str}: {s}";
-=======
             KrillaError::Font(f, err) => {
                 bail!(
                     Span::detached(),
                     "failed to process {} ({err})",
                     display_font(gc.fonts_backward.get(&f));
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
                     hint: "make sure the font is valid";
                     hint: "the used font might be unsupported by Typst"
                 );
@@ -458,15 +434,9 @@ fn finish(
                     .collect::<EcoVec<_>>();
                 Err(errors)
             }
-<<<<<<< HEAD
-            KrillaError::Image(_, loc) => {
-                let span = to_span(loc);
-                bail!(span, "failed to process image");
-=======
             KrillaError::Image(_, loc, err) => {
                 let span = to_span(loc);
                 bail!(span, "failed to process image ({err})");
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
             }
             KrillaError::SixteenBitImage(image, _) => {
                 let span = gc.image_to_spans.get(&image).unwrap();
@@ -573,14 +543,9 @@ fn convert_error(
         ),
         ValidationError::ContainsNotDefGlyph(f, loc, text) => error!(
             to_span(*loc),
-<<<<<<< HEAD
-            "{prefix} the text '{text}' cannot be displayed using {}",
-            display_font(gc.fonts_backward.get(f).unwrap());
-=======
             "{prefix} the text `{}` could not be displayed with {}",
             text.repr(),
             display_font(gc.fonts_backward.get(f));
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
             hint: "try using a different font"
         ),
         ValidationError::NoCodepointMapping(_, _, loc) => {
@@ -619,13 +584,8 @@ fn convert_error(
         }
         ValidationError::RestrictedLicense(f) => error!(
             Span::detached(),
-<<<<<<< HEAD
-            "{prefix} license of font {} is too restrictive",
-            display_font(gc.fonts_backward.get(f).unwrap()).repr();
-=======
             "{prefix} license of {} is too restrictive",
             display_font(gc.fonts_backward.get(f));
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
             hint: "the font has specified \"Restricted License embedding\" in its metadata";
             hint: "restrictive font licenses are prohibited by {} because they limit the suitability for archival",
             validator.as_str()
diff --git a/crates/typst-pdf/src/image.rs b/crates/typst-pdf/src/image.rs
index bd08e6072a..a94d598be9 100644
--- a/crates/typst-pdf/src/image.rs
+++ b/crates/typst-pdf/src/image.rs
@@ -1,20 +1,13 @@
 use std::hash::{Hash, Hasher};
 use std::sync::{Arc, OnceLock};
 
-<<<<<<< HEAD
-=======
 use ecow::eco_format;
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 use image::{DynamicImage, EncodableLayout, GenericImageView, Rgba};
 use krilla::image::{BitsPerComponent, CustomImage, ImageColorspace};
 use krilla::pdf::PdfDocument;
 use krilla::surface::Surface;
 use krilla_svg::{SurfaceExt, SvgSettings};
-<<<<<<< HEAD
-use typst_library::diag::{SourceResult, bail};
-=======
 use typst_library::diag::{At, SourceResult};
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 use typst_library::foundations::Smart;
 use typst_library::layout::{Abs, Angle, Ratio, Size, Transform};
 use typst_library::visualize::{
@@ -56,16 +49,9 @@ pub(crate) fn handle_image(
             surface.push_transform(&exif_transform.to_krilla());
             let mut surface = defer(surface, |s| s.pop());
 
-<<<<<<< HEAD
-            let image = match convert_raster(raster.clone(), interpolate) {
-                None => bail!(span, "failed to process image"),
-                Some(i) => i,
-            };
-=======
             let image = convert_raster(raster.clone(), interpolate)
                 .map_err(|err| eco_format!("failed to process image ({err})"))
                 .at(span)?;
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 
             if !gc.image_to_spans.contains_key(&image) {
                 gc.image_to_spans.insert(image.clone(), span);
@@ -203,11 +189,7 @@ impl CustomImage for PdfRasterImage {
 fn convert_raster(
     raster: RasterImage,
     interpolate: bool,
-<<<<<<< HEAD
-) -> Option<krilla::image::Image> {
-=======
 ) -> Result<krilla::image::Image, String> {
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     if let RasterFormat::Exchange(ExchangeFormat::Jpg) = raster.format() {
         let image_data: Arc<dyn AsRef<[u8]> + Send + Sync> =
             Arc::new(raster.data().clone());
diff --git a/crates/typst-pdf/src/link.rs b/crates/typst-pdf/src/link.rs
index 064d0b9e09..fe0f0b3bf7 100644
--- a/crates/typst-pdf/src/link.rs
+++ b/crates/typst-pdf/src/link.rs
@@ -2,11 +2,7 @@ use krilla::action::{Action, LinkAction};
 use krilla::annotation::Target;
 use krilla::destination::XyzDestination;
 use krilla::geom as kg;
-<<<<<<< HEAD
-use typst_library::diag::{SourceResult, bail};
-=======
 use typst_library::diag::{At, ExpectInternal, SourceResult, bail};
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 use typst_library::layout::{Abs, Point, Position, Size};
 use typst_library::model::Destination;
 use typst_syntax::Span;
@@ -88,13 +84,9 @@ pub(crate) fn handle_link(
         return Ok(());
     }
 
-<<<<<<< HEAD
-    let (group_id, link) = gc.tags.tree.parent_link().expect("link parent");
-=======
     let (group_id, link) = (gc.tags.tree.parent_link())
         .expect_internal("expected link ancestor in logical tree")
         .at(Span::detached())?;
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     let alt = link.alt.as_ref().map(Into::into);
 
     if gc.tags.tree.parent_artifact().is_some() {
diff --git a/crates/typst-pdf/src/page.rs b/crates/typst-pdf/src/page.rs
index 541d4fda96..2edc3f7c7e 100644
--- a/crates/typst-pdf/src/page.rs
+++ b/crates/typst-pdf/src/page.rs
@@ -1,8 +1,4 @@
-<<<<<<< HEAD
-use std::num::NonZeroUsize;
-=======
 use std::num::NonZeroU32;
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 
 use krilla::page::{NumberingStyle, PageLabel};
 use typst_library::model::Numbering;
@@ -53,11 +49,7 @@ impl PageLabelExt for PageLabel {
                 (!prefix.is_empty()).then(|| prefix.clone())
             };
 
-<<<<<<< HEAD
-            let offset = style.and(number.try_into().ok().and_then(NonZeroUsize::new));
-=======
             let offset = style.and(number.try_into().ok().and_then(NonZeroU32::new));
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
             Some(PageLabel::new(style, prefix.map(Into::into), offset))
         }
     }
@@ -66,11 +58,7 @@ impl PageLabelExt for PageLabel {
         PageLabel::new(
             Some(NumberingStyle::Arabic),
             None,
-<<<<<<< HEAD
-            number.try_into().ok().and_then(NonZeroUsize::new),
-=======
             number.try_into().ok().and_then(NonZeroU32::new),
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
         )
     }
 }
diff --git a/crates/typst-pdf/src/tags/context/table.rs b/crates/typst-pdf/src/tags/context/table.rs
index d297d7a6d4..51800ee7e1 100644
--- a/crates/typst-pdf/src/tags/context/table.rs
+++ b/crates/typst-pdf/src/tags/context/table.rs
@@ -471,11 +471,7 @@ fn place_explicit_lines<F>(
     ) -> Option<&mut PrioritzedStroke>,
 {
     for line in lines.iter().flat_map(|lines| lines.iter()) {
-<<<<<<< HEAD
-        let end = line.end.map(|n| n.get() as u32).unwrap_or(inline_end);
-=======
         let end = line.end.map(|n| n.get() as u32).unwrap_or(inline_end).min(inline_end);
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
         let explicit_stroke = || PrioritzedStroke {
             stroke: line.stroke.clone(),
             priority: StrokePriority::ExplicitLine,
diff --git a/crates/typst-pdf/src/tags/resolve.rs b/crates/typst-pdf/src/tags/resolve.rs
index e0c0d2288c..ae94468abd 100644
--- a/crates/typst-pdf/src/tags/resolve.rs
+++ b/crates/typst-pdf/src/tags/resolve.rs
@@ -4,14 +4,9 @@ use ecow::EcoVec;
 use krilla::tagging::{self as kt, Node, Tag, TagGroup, TagKind};
 use krilla::tagging::{Identifier, TagTree};
 use smallvec::SmallVec;
-<<<<<<< HEAD
-use typst_library::diag::{SourceDiagnostic, SourceResult, error};
-use typst_library::text::Locale;
-=======
 use typst_library::diag::{At, SourceDiagnostic, SourceResult, error};
 use typst_library::text::Locale;
 use typst_syntax::Span;
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 
 use crate::PdfOptions;
 use crate::convert::{GlobalContext, to_span};
@@ -55,11 +50,7 @@ impl<'a> Resolver<'a> {
 }
 
 pub fn resolve(gc: &mut GlobalContext) -> SourceResult<(Option<Locale>, TagTree)> {
-<<<<<<< HEAD
-    gc.tags.tree.assert_finished_traversal();
-=======
     gc.tags.tree.assert_finished_traversal().at(Span::detached())?;
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 
     if !disabled(gc) {
         context::finish(&mut gc.tags.tree);
diff --git a/crates/typst-pdf/src/tags/tree/build.rs b/crates/typst-pdf/src/tags/tree/build.rs
index d5aca1c6b3..cf0886cb12 100644
--- a/crates/typst-pdf/src/tags/tree/build.rs
+++ b/crates/typst-pdf/src/tags/tree/build.rs
@@ -19,14 +19,10 @@ use ecow::EcoVec;
 use krilla::tagging::{ArtifactType, ListNumbering, Tag, TagKind};
 use rustc_hash::FxHashMap;
 use smallvec::SmallVec;
-<<<<<<< HEAD
-use typst_library::diag::{SourceDiagnostic, SourceResult, bail, error};
-=======
 use typst_library::diag::{
     At, ExpectInternal, SourceDiagnostic, SourceResult, assert_internal, bail, error,
     panic_internal,
 };
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 use typst_library::foundations::{Content, ContextElem};
 use typst_library::introspection::Location;
 use typst_library::layout::{
@@ -187,15 +183,6 @@ pub fn build(document: &PagedDocument, options: &PdfOptions) -> SourceResult<Tre
         visit_frame(&mut tree, &page.frame)?;
     }
 
-<<<<<<< HEAD
-    assert!(tree.stack.is_empty(), "tags weren't properly closed");
-    assert!(tree.unfinished_stacks.is_empty(), "tags weren't properly closed");
-    assert_eq!(
-        tree.progressions.first(),
-        tree.progressions.last(),
-        "tags weren't properly closed"
-    );
-=======
     if let Some(last) = tree.stack.last() {
         panic_internal("tags weren't properly closed")
             .at(tree.groups.get(last.id).span)?;
@@ -207,18 +194,13 @@ pub fn build(document: &PagedDocument, options: &PdfOptions) -> SourceResult<Tre
         "tags weren't properly closed",
     )
     .at(Span::detached())?;
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 
     // Insert logical children into the tree.
     #[allow(clippy::iter_over_hash_type)]
     for (loc, children) in tree.logical_children.iter() {
-<<<<<<< HEAD
-        let located = tree.groups.by_loc(loc).expect("parent group");
-=======
         let located = (tree.groups.by_loc(loc))
             .expect_internal("parent group")
             .at(Span::detached())?;
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 
         if options.is_pdf_ua() && located.multiple_parents {
             let validator = options.standards.config.validator().as_str();
diff --git a/crates/typst-pdf/src/tags/tree/mod.rs b/crates/typst-pdf/src/tags/tree/mod.rs
index 1f1f42f1d5..d2f10afdcf 100644
--- a/crates/typst-pdf/src/tags/tree/mod.rs
+++ b/crates/typst-pdf/src/tags/tree/mod.rs
@@ -9,11 +9,7 @@ use krilla::surface::Surface;
 use krilla::tagging::{ArtifactType, ContentTag, Tag};
 use rustc_hash::FxHashMap;
 use smallvec::SmallVec;
-<<<<<<< HEAD
-use typst_library::diag::SourceDiagnostic;
-=======
 use typst_library::diag::{HintedStrResult, SourceDiagnostic, assert_internal};
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 use typst_library::foundations::Packed;
 use typst_library::introspection::Location;
 use typst_library::layout::{Inherit, PagedDocument};
@@ -78,24 +74,6 @@ impl Tree {
         Some(self.ctx.bboxes.get_mut(id))
     }
 
-<<<<<<< HEAD
-    pub fn assert_finished_traversal(&self) {
-        assert_eq!(
-            self.prog_cursor + 1,
-            self.progressions.len(),
-            "tree traversal didn't complete properly"
-        );
-        assert_eq!(
-            self.break_cursor,
-            self.breaks.len(),
-            "tree traversal didn't complete properly"
-        );
-        assert_eq!(
-            self.unfinished_cursor,
-            self.unfinished.len(),
-            "tree traversal didn't complete properly"
-        );
-=======
     pub fn assert_finished_traversal(&self) -> HintedStrResult<()> {
         assert_internal(
             self.prog_cursor + 1 == self.progressions.len(),
@@ -110,7 +88,6 @@ impl Tree {
             "tree traversal didn't complete properly",
         )?;
         Ok(())
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     }
 }
 
@@ -406,12 +383,6 @@ fn close_group(tree: &mut Tree, surface: &mut Surface, id: GroupId) -> GroupId {
         GroupKind::LogicalParent(elem) => {
             let loc = elem.location().unwrap();
             // Insert logical children when closing the logical parent, so they
-<<<<<<< HEAD
-            // are at the end of the group.
-            if let Some(children) = tree.logical_children.get(&loc) {
-                tree.groups.push_groups(id, children);
-            }
-=======
             // are at the end of the group. In some cases there might be
             // multiple parent groups with the same location, only insert the
             // children for the first parent group.
@@ -422,7 +393,6 @@ fn close_group(tree: &mut Tree, surface: &mut Surface, id: GroupId) -> GroupId {
                 tree.groups.push_groups(id, children);
             }
 
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
             tree.groups.push_group(direct_parent, id);
         }
         GroupKind::LogicalChild(inherit, logical_parent) => {
diff --git a/crates/typst-pdf/src/tags/tree/text.rs b/crates/typst-pdf/src/tags/tree/text.rs
index 0f79332a45..7519c476d2 100644
--- a/crates/typst-pdf/src/tags/tree/text.rs
+++ b/crates/typst-pdf/src/tags/tree/text.rs
@@ -1,11 +1,7 @@
 use krilla::tagging::{LineHeight, NaiveRgbColor, TextDecorationType};
 use typst_library::diag::{SourceDiagnostic, error};
 use typst_library::foundations::{Content, Packed, Smart};
-<<<<<<< HEAD
-use typst_library::layout::{Abs, Length};
-=======
 use typst_library::layout::Length;
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 use typst_library::text::{
     HighlightElem, OverlineElem, ScriptKind, StrikeElem, SubElem, SuperElem, TextItem,
     TextSize, UnderlineElem,
@@ -20,13 +16,8 @@ use crate::util::AbsExt;
 
 #[derive(Debug, Clone)]
 pub struct TextAttrs {
-<<<<<<< HEAD
-    /// Store the last resolved set of text attribute. The resolution isn't that
-    /// expensive, but for large bodies of text it is resolved quite often.
-=======
     /// Store the last resolved set of text attributes. The resolution isn't
     /// that expensive, but for large bodies of text it is resolved quite often.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     last_resolved: Option<(TextParams, ResolvedTextAttrs)>,
     items: Vec<(GroupId, TextAttr)>,
 }
@@ -122,21 +113,6 @@ impl TextDecoKind {
     }
 }
 
-<<<<<<< HEAD
-#[derive(Debug, Copy, Clone, Eq, PartialEq)]
-struct TextParams {
-    pub font_index: u32,
-    pub size: Abs,
-}
-
-impl TextParams {
-    fn new(text: &TextItem) -> TextParams {
-        TextParams {
-            // Comparing font indices is enough.
-            font_index: text.font.index(),
-            size: text.size,
-        }
-=======
 /// A hash of relevant text parameters.
 #[derive(Debug, Copy, Clone, Eq, PartialEq)]
 struct TextParams(u128);
@@ -144,7 +120,6 @@ struct TextParams(u128);
 impl TextParams {
     fn new(text: &TextItem) -> TextParams {
         TextParams(typst_utils::hash128(&(&text.font, text.size)))
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     }
 }
 
diff --git a/crates/typst-pdf/src/text.rs b/crates/typst-pdf/src/text.rs
index 6f154b49b8..a280d0ed2d 100644
--- a/crates/typst-pdf/src/text.rs
+++ b/crates/typst-pdf/src/text.rs
@@ -85,13 +85,6 @@ fn build_font(typst_font: Font) -> SourceResult<krilla::text::Font> {
         Arc::new(typst_font.data().clone());
 
     match krilla::text::Font::new(font_data.into(), typst_font.index()) {
-<<<<<<< HEAD
-        None => {
-            let font_str = display_font(&typst_font);
-            bail!(Span::detached(), "failed to process font {font_str}");
-        }
-        Some(f) => Ok(f),
-=======
         Some(f) => Ok(f),
         None => {
             bail!(
@@ -100,7 +93,6 @@ fn build_font(typst_font: Font) -> SourceResult<krilla::text::Font> {
                 display_font(Some(&typst_font))
             )
         }
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     }
 }
 
diff --git a/crates/typst-pdf/src/util.rs b/crates/typst-pdf/src/util.rs
index 6fcb3d59e5..9639f8a12f 100644
--- a/crates/typst-pdf/src/util.rs
+++ b/crates/typst-pdf/src/util.rs
@@ -1,17 +1,11 @@
 //! Basic utilities for converting Typst types to krilla.
 
-<<<<<<< HEAD
-=======
 use ecow::{EcoString, eco_format};
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 use krilla::geom as kg;
 use krilla::geom::PathBuilder;
 use krilla::paint as kp;
 use krilla::tagging as kt;
-<<<<<<< HEAD
-=======
 use typst_library::foundations::Repr;
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 use typst_library::layout::{Abs, Point, Sides, Size, Transform};
 use typst_library::text::Font;
 use typst_library::visualize::{Curve, CurveItem, FillRule, LineCap, LineJoin};
@@ -121,16 +115,11 @@ impl AbsExt for Abs {
 }
 
 /// Display the font family of a font.
-<<<<<<< HEAD
-pub(crate) fn display_font(font: &Font) -> &str {
-    &font.info().family
-=======
 pub(crate) fn display_font(font: Option<&Font>) -> EcoString {
     match font {
         Some(font) => eco_format!("font `{}`", font.info().family.repr()),
         None => "a font".into(),
     }
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 }
 
 /// Convert a Typst path to a krilla path.
diff --git a/crates/typst-realize/src/lib.rs b/crates/typst-realize/src/lib.rs
index 914fd0c50c..9e545b2edf 100644
--- a/crates/typst-realize/src/lib.rs
+++ b/crates/typst-realize/src/lib.rs
@@ -12,11 +12,7 @@ use bumpalo::Bump;
 use bumpalo::collections::{CollectIn, String as BumpString, Vec as BumpVec};
 use comemo::Track;
 use ecow::EcoString;
-<<<<<<< HEAD
-use typst_library::diag::{At, SourceResult, bail};
-=======
 use typst_library::diag::{At, SourceResult, bail, warning};
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 use typst_library::engine::Engine;
 use typst_library::foundations::{
     Content, Context, ContextElem, Element, NativeElement, NativeShowRule, Packed,
@@ -612,18 +608,6 @@ fn visit_styled<'a>(
                 info.populate_locale(&local)
             }
         } else if elem == PageElem::ELEM {
-<<<<<<< HEAD
-            if !matches!(s.kind, RealizationKind::LayoutDocument { .. }) {
-                bail!(
-                    style.span(),
-                    "page configuration is not allowed inside of containers"
-                );
-            }
-
-            // When there are page styles, we "break free" from our show rule cage.
-            pagebreak = true;
-            s.outside = true;
-=======
             match s.kind {
                 RealizationKind::LayoutDocument { .. } => {
                     // When there are page styles, we "break free" from our show
@@ -640,7 +624,6 @@ fn visit_styled<'a>(
                     "page configuration is not allowed inside of containers"
                 ),
             }
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
         }
     }
 
diff --git a/crates/typst-syntax/src/lexer.rs b/crates/typst-syntax/src/lexer.rs
index a100576c53..6f8f3b9370 100644
--- a/crates/typst-syntax/src/lexer.rs
+++ b/crates/typst-syntax/src/lexer.rs
@@ -1,8 +1,5 @@
-<<<<<<< HEAD
-=======
 use std::num::IntErrorKind;
 
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 use ecow::{EcoString, eco_format};
 use unicode_ident::{is_xid_continue, is_xid_start};
 use unicode_script::{Script, UnicodeScript};
@@ -835,8 +832,6 @@ impl Lexer<'_> {
         let number = self.s.from(start);
         let suffix = self.s.eat_while(|c: char| c.is_ascii_alphanumeric() || c == '%');
 
-<<<<<<< HEAD
-=======
         // Parse large integer literals as floats
         if base == 10
             && !is_float
@@ -847,7 +842,6 @@ impl Lexer<'_> {
             is_float = true;
         }
 
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
         let mut suffix_result = match suffix {
             "" => Ok(None),
             "pt" | "mm" | "cm" | "in" | "deg" | "rad" | "em" | "fr" | "%" => Ok(Some(())),
diff --git a/docs/Cargo.toml b/docs/Cargo.toml
index 6392340bbb..8795cd5183 100644
--- a/docs/Cargo.toml
+++ b/docs/Cargo.toml
@@ -25,12 +25,8 @@ clap = { workspace = true, optional = true }
 codex = { workspace = true }
 ecow = { workspace = true }
 heck = { workspace = true }
-<<<<<<< HEAD
 pulldown-cmark = { git = "https://github.com/3w36zj6/pulldown-cmark-cjk-friendly", rev = "ccdd8e0" }
 pulldown-cmark-escape = { git = "https://github.com/3w36zj6/pulldown-cmark-cjk-friendly", rev = "ccdd8e0" }
-=======
-pulldown-cmark = { workspace = true }
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 regex = { workspace = true }
 rustc-hash = { workspace = true }
 serde = { workspace = true }
diff --git a/docs/changelog/0.1.0.md b/docs/changelog/0.1.0.md
index 6b81dce237..2ac6cfffcf 100644
--- a/docs/changelog/0.1.0.md
+++ b/docs/changelog/0.1.0.md
@@ -25,11 +25,7 @@ description: Changes in Typst 0.1.0
   gives access to the automatically resolved kind, supplement, and counter
 
 ## Bibliography improvements
-<<<<<<< HEAD
 - The [`bibliography`]($bibliography) now also accepts multiple bibliography paths (as an
-=======
-- The [`bibliography`] now also accepts multiple bibliography paths (as an
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
   array)
 - Parsing of BibLaTeX files is now more permissive (accepts non-numeric edition,
   pages, volumes, dates, and Jabref-style comments; fixed abbreviation parsing)
@@ -37,11 +33,7 @@ description: Changes in Typst 0.1.0
 - Fixed APA bibliography ordering
 
 ## Drawing additions
-<<<<<<< HEAD
 - Added [`polygon`]($polygon) function for drawing polygons
-=======
-- Added [`polygon`] function for drawing polygons
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 - Added support for clipping in [boxes]($box.clip) and [blocks]($block.clip)
 
 ## Command line interface
@@ -52,20 +44,12 @@ description: Changes in Typst 0.1.0
 - Added `--open` flag to directly open the PDF
 
 ## Miscellaneous improvements
-<<<<<<< HEAD
 - Added [`yaml`]($yaml) function to load data from YAML files
-=======
-- Added [`yaml`] function to load data from YAML files
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 - Added basic i18n for a few more languages (IT, RU, ZH, FR, PT)
 - Added numbering support for Hebrew
 - Added support for [integers]($int) with base 2, 8, and 16
 - Added symbols for double bracket and laplace operator
-<<<<<<< HEAD
 - The [`link`]($link) function now accepts [labels]($label)
-=======
-- The [`link`] function now accepts [labels]($label)
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 - The link syntax now allows more characters
 - Improved justification of Japanese and Chinese text
 - Calculation functions behave more consistently w.r.t to non-real results
@@ -79,11 +63,7 @@ description: Changes in Typst 0.1.0
 - Fixed invalid parsing of language tag in raw block with a single backtick
 - Fixed bugs with displaying counters and state
 - Fixed crash related to page counter
-<<<<<<< HEAD
 - Fixed crash when [`symbol`]($symbol) function was called without arguments
-=======
-- Fixed crash when [`symbol`] function was called without arguments
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 - Fixed crash in bibliography generation
 - Fixed access to label of certain content elements
 - Fixed line number in error message for CSV parsing
diff --git a/docs/changelog/0.10.0.md b/docs/changelog/0.10.0.md
index c2bcb2dfca..549df4f9f0 100644
--- a/docs/changelog/0.10.0.md
+++ b/docs/changelog/0.10.0.md
@@ -3,11 +3,8 @@ title: 0.10.0
 description: Changes in Typst 0.10.0
 ---
 
-<<<<<<< HEAD
 <!-- textlint-disable ja-technical-writing/no-unmatched-pair -->
 
-=======
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 # Version 0.10.0 (December 4, 2023)
 
 ## Bibliography management
@@ -58,11 +55,7 @@ description: Changes in Typst 0.10.0
 - Changed default [figure supplement]($figure.supplement) for Russian to short
   form
 - Fixed [CJK-Latin-spacing]($text.cjk-latin-spacing) before line breaks and in
-<<<<<<< HEAD
   [`locate`]($locate) calls
-=======
-  [`locate`] calls
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 - Fixed line breaking at the end of links
 
 ## Math
@@ -76,7 +69,6 @@ description: Changes in Typst 0.10.0
 ## Scripting
 - Any non-identifier dictionary key is now interpreted as an expression: For
   instance, `{((key): value)}` will create a dictionary with a dynamic key
-<<<<<<< HEAD
 - The [`stroke`]($stroke) type now has a constructor that converts a value to a stroke or
   creates one from its parts
 - Added constructor for [`arguments`]($arguments) type
@@ -84,15 +76,6 @@ description: Changes in Typst 0.10.0
   [`calc.rem-euclid`]($calc.rem-euclid) functions
 - Fixed equality of [`arguments`]($arguments)
 - Fixed [`repr`]($repr) of [`cmyk`]($color.cmyk) colors
-=======
-- The [`stroke`] type now has a constructor that converts a value to a stroke or
-  creates one from its parts
-- Added constructor for [`arguments`] type
-- Added [`calc.div-euclid`]($calc.div-euclid) and
-  [`calc.rem-euclid`]($calc.rem-euclid) functions
-- Fixed equality of [`arguments`]
-- Fixed [`repr`]of [`cmyk`]($color.cmyk) colors
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 - Fixed crashes with provided elements like figure captions, outline entries,
   and footnote entries
 
@@ -134,17 +117,10 @@ description: Changes in Typst 0.10.0
   just a string
 - The [`number-align`]($enum.number-align) parameter on numbered lists now also
   accepts vertical alignments
-<<<<<<< HEAD
 - Fixed selectors on [quote]($quote) elements
 - Fixed parsing of `[#return]` expression in markup
 - Fixed bug where inline equations were displayed in equation outlines
 - Fixed potential CRLF issue in [`raw`]($raw) blocks
-=======
-- Fixed selectors on [quote] elements
-- Fixed parsing of `[#return]` expression in markup
-- Fixed bug where inline equations were displayed in equation outlines
-- Fixed potential CRLF issue in [`raw`] blocks
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 - Fixed a bug where Chinese numbering couldn't exceed the number 255
 
 ## Development
diff --git a/docs/changelog/0.11.0.md b/docs/changelog/0.11.0.md
index 799edee686..f64aeb1072 100644
--- a/docs/changelog/0.11.0.md
+++ b/docs/changelog/0.11.0.md
@@ -3,35 +3,22 @@ title: 0.11.0
 description: Changes in Typst 0.11.0
 ---
 
-<<<<<<< HEAD
 <!-- textlint-disable ja-technical-writing/no-unmatched-pair -->
 
-=======
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 # Version 0.11.0 (March 15, 2024)
 
 ## Tables
 - Tables are now _much_ more flexible, read the new
   [Table Guide]($guides/tables) to get started
-<<<<<<< HEAD
 - Added [`table.cell`]($table.cell) element for per-cell configuration
-=======
-- Added [`table.cell`] element for per-cell configuration
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 - Cells can now span multiple [columns]($table.cell.colspan) or
   [rows]($table.cell.rowspan)
 - The [stroke]($table.cell.stroke) of individual cells can now be customized
 - The [`align`]($table.align) and [`inset`]($table.inset) arguments of the table
   function now also take `{(x, y) => ..}` functions
-<<<<<<< HEAD
 - Added [`table.hline`]($table.hline) and [`table.vline`]($table.vline) for convenient line customization
 - Added [`table.header`]($table.header) element for table headers that repeat on every page
 - Added [`table.footer`]($table.footer) element for table footers that repeat on every page
-=======
-- Added [`table.hline`] and [`table.vline`] for convenient line customization
-- Added [`table.header`] element for table headers that repeat on every page
-- Added [`table.footer`] element for table footers that repeat on every page
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 - All the new table functionality is also available for [grids]($grid)
 - Fixed gutter-related bugs
 
@@ -51,7 +38,6 @@ _Thanks to [@PgBiel](https://github.com/PgBiel) for his work on tables!_
 - Templates and packages are now organized by category and discipline. Filter
   packages by either taxonomy in the _Start from template_ wizard. If you are a
   package author, take a look at the new documentation for
-<<<<<<< HEAD
   [categories](https://github.com/typst/packages/blob/main/CATEGORIES.md) and
   [disciplines](https://github.com/typst/packages/blob/main/DISCIPLINES.md).
 
@@ -81,37 +67,6 @@ _Thanks to [@PgBiel](https://github.com/PgBiel) for his work on tables!_
   should not be used anymore (Deprecation planned)
 - The `styles` argument of the `measure` function should not
   be used anymore (Deprecation planned)
-=======
-  [categories](https://github.com/typst/packages/blob/main/docs/CATEGORIES.md) and
-  [disciplines](https://github.com/typst/packages/blob/main/docs/DISCIPLINES.md).
-
-## Context
-- Added _context expressions:_ Read the chapter on [context] to get started
-- With context, you can access settable properties, e.g. `{context text.lang}`
-  to access the language set via `{set text(lang: "..")}`
-- The following existing functions have been made contextual: [`query`],
-  [`locate`], [`measure`], [`counter.display`], [`counter.at`],
-  [`counter.final`], [`state.at`], and [`state.final`]
-- Added contextual methods [`counter.get`] and [`state.get`] to retrieve the
-  value of a counter or state in the current context
-- Added contextual function [`here`] to retrieve the [location] of the current
-  context
-- The [`locate`] function now returns the location of a selector's unique match.
-  Its old behavior has been replaced by context expressions and only remains
-  temporarily available for compatibility.
-- The [`counter.at`] and [`state.at`] methods are now more flexible: They
-  directly accept any kind of [locatable]($location/#locatable) selector with a
-  unique match (e.g. a label) instead of just locations
-- When context is available, [`counter.display`] now directly returns the result
-  of applying the numbering instead of yielding opaque content. It should not be
-  used anymore without context. (Deprecation planned)
-- The `state.display` function should not be used anymore, use [`state.get`]
-  instead (Deprecation planned)
-- The `location` argument of [`query`], [`counter.final`], and [`state.final`]
-  should not be used anymore (Deprecation planned)
-- The `styles` argument of the `measure` function should not be used anymore
-  (Deprecation planned)
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 - The `style` function should not be used anymore, use context instead
   (Deprecation planned)
 - The correct context is now also provided in various other places where it is
@@ -136,11 +91,7 @@ _Thanks to [@PgBiel](https://github.com/PgBiel) for his work on tables!_
   show rules
 - Errors within show rules and context expressions are now ignored in all but
   the last introspection iteration, in line with the behavior of the old
-<<<<<<< HEAD
   [`locate`]($locate)
-=======
-  [`locate`]
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 - Fixed a bug where document set rules were allowed after content
 
 ## Layout
@@ -149,15 +100,9 @@ _Thanks to [@PgBiel](https://github.com/PgBiel) for his work on tables!_
 - Fixed a bug where [floating placement]($place.float) or
   [floating figures]($figure.placement) could end up out of order
 - Fixed overlap of text and figure for full-page floating figures
-<<<<<<< HEAD
 - Fixed various cases where the [`hide`]($hide) function didn't hide its contents
   properly
 - Fixed usage of [`h`]($h) and [`v`]($v) in [stacks]($stack)
-=======
-- Fixed various cases where the [`hide`] function didn't hide its contents
-  properly
-- Fixed usage of [`h`] and [`v`] in [stacks]($stack)
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 - Invisible content like a counter update will no longer force a visible block
   for just itself
 - Fixed a bug with horizontal spacing followed by invisible content (like a
@@ -166,11 +111,7 @@ _Thanks to [@PgBiel](https://github.com/PgBiel) for his work on tables!_
 ## Text
 - Added [`stroke`]($text.stroke) property for text
 - Added basic i18n for Serbian and Catalan
-<<<<<<< HEAD
 - Added support for contemporary Japanese [numbering]($numbering) method
-=======
-- Added support for contemporary Japanese [numbering] method
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 - Added patches for various wrong metadata in specific fonts
 - The [text direction]($text.dir) can now be overridden within a paragraph
 - Fixed Danish [smart quotes]($smartquote)
@@ -186,15 +127,9 @@ _Thanks to [@PgBiel](https://github.com/PgBiel) for his work on tables!_
   heading to increase or decrease the heading level for a bunch of content; the
   heading syntax now sets `depth` rather than `level` **(Breaking change)**
 - List [markers]($list.marker) now cycle by default
-<<<<<<< HEAD
 - The [`quote`]($quote) function now more robustly selects the correct quotes based on
   language and nesting
 - Fixed indent bugs related to the default show rule of [terms]($terms)
-=======
-- The [`quote`] function now more robustly selects the correct quotes based on
-  language and nesting
-- Fixed indent bugs related to the default show rule of [terms]
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 
 ## Math
 - Inline equations now automatically linebreak at appropriate places
@@ -204,17 +139,10 @@ _Thanks to [@PgBiel](https://github.com/PgBiel) for his work on tables!_
 - Improved positioning of accents
 - [Primes]($math.primes) are now always attached as [scripts]($math.scripts) by
   default
-<<<<<<< HEAD
 - Exposed [`math.primes`]($math.primes) element which backs the `[$f'$]` syntax in math
 - Math mode is not affected by [`strong`]($strong) and [`emph`]($emph) anymore
 - Fixed [`attach`]($math.attach) under [fractions]($math.frac)
 - Fixed that [`math.class`]($math.class) did not affect smart limit placement
-=======
-- Exposed [`math.primes`] element which backs the `[$f'$]` syntax in math
-- Math mode is not affected by [`strong`] and [`emph`] anymore
-- Fixed [`attach`]($math.attach) under [fractions]($math.frac)
-- Fixed that [`math.class`] did not affect smart limit placement
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 - Fixed weak spacing in [`lr`]($math.lr) groups
 - Fixed layout of large operators for Cambria Math font
 - Fixed math styling of Hebrew symbol codepoints
@@ -235,19 +163,11 @@ _Thanks to [@PgBiel](https://github.com/PgBiel) for his work on tables!_
 - Arrays can now be compared lexicographically
 - Added contextual method [`to-absolute`]($length.to-absolute) to lengths
 - Added [`calc.root`]($calc.root)
-<<<<<<< HEAD
 - Added [`int.signum`]($int.signum) and [`float.signum`]($float.signum) methods
 - Added [`float.is-nan`]($float.is-nan) and [`float.is-infinite`]($float.is-infinite) methods
 - Added [`int.bit-not`]($int.bit-not), [`int.bit-and`]($int.bit-and), [`int.bit-or`]($int.bit-or), [`int.bit-xor`]($int.bit-xor),
   [`int.bit-lshift`]($int.bit-lshift), and [`int.bit-rshift`]($int.bit-rshift) methods
 - Added [`array.chunks`]($array.chunks) method
-=======
-- Added [`int.signum`] and [`float.signum`] methods
-- Added [`float.is-nan`] and [`float.is-infinite`] methods
-- Added [`int.bit-not`], [`int.bit-and`], [`int.bit-or`], [`int.bit-xor`],
-  [`int.bit-lshift`], and [`int.bit-rshift`] methods
-- Added [`array.chunks`] method
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 - A module can now be converted to a dictionary with the
   [dictionary constructor]($dictionary/#constructor) to access its contents
   dynamically
@@ -255,11 +175,7 @@ _Thanks to [@PgBiel](https://github.com/PgBiel) for his work on tables!_
   how rows will be represented
 - [XML parsing]($xml) now allows DTDs (document type definitions)
 - Improved formatting of negative numbers with [`str`]($str) and [`repr`]($repr)
-<<<<<<< HEAD
 - For loops can now iterate over [bytes]($bytes)
-=======
-- For loops can now iterate over [bytes]
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 - Fixed a bug with pattern matching in for loops
 - Fixed a bug with labels not being part of [`{.fields()}`]($content.fields)
   dictionaries
@@ -272,11 +188,7 @@ _Thanks to [@PgBiel](https://github.com/PgBiel) for his work on tables!_
   instead of being collapsed into normal spaces **(Breaking change)**
 - Korean text can now use emphasis syntax without adding spaces
   **(Breaking change)**
-<<<<<<< HEAD
 - The token [`context`]($context) is now a keyword and cannot be used as an identifier
-=======
-- The token [`context`] is now a keyword and cannot be used as an identifier
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
   anymore **(Breaking change)**
 - Nested line comments aren't allowed anymore in block comments
   **(Breaking change)**
@@ -287,11 +199,7 @@ _Thanks to [@PgBiel](https://github.com/PgBiel) for his work on tables!_
   dictionaries
 
 ## Tooling & Diagnostics
-<<<<<<< HEAD
 - Click-to-jump now works properly within [`raw`]($raw) text
-=======
-- Click-to-jump now works properly within [`raw`] text
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 - Added suggestion for accessing a field if a method doesn't exist
 - Improved hint for calling a function stored in a dictionary
 - Improved errors for mutable accessor functions on arrays and dictionaries
@@ -302,7 +210,6 @@ _Thanks to [@PgBiel](https://github.com/PgBiel) for his work on tables!_
   namespaces
 
 ## Visualization
-<<<<<<< HEAD
 - The [`image`]($image) function doesn't upscale images beyond their natural size
   anymore
 - The [`image`]($image) function now respects rotation stored in EXIF metadata
@@ -313,29 +220,13 @@ _Thanks to [@PgBiel](https://github.com/PgBiel) for his work on tables!_
 - Added [`stroke`]($highlight.stroke) and [`radius`]($highlight.radius)
   arguments to `highlight` function
 - Changed default [`highlight`]($highlight) color to be transparent
-=======
-- The [`image`] function doesn't upscale images beyond their natural size
-  anymore
-- The [`image`] function now respects rotation stored in EXIF metadata
-- Added support for SVG filters
-- Added alpha component to [`luma`]($color.luma) colors
-- Added [`color.transparentize`] and [`color.opacify`] methods
-- Improved [`color.negate`] function
-- Added [`stroke`]($highlight.stroke) and [`radius`]($highlight.radius)
-  arguments to `highlight` function
-- Changed default [`highlight`] color to be transparent
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 - CMYK to RGB conversion is now color-managed
 - Fixed crash with gradients in Oklch color space
 - Fixed color-mixing for hue-based spaces
 - Fixed bugs with color conversion
 - SVG sizes are not rounded anymore, preventing slightly wrong aspect ratios
 - Fixed a few other SVG-related bugs
-<<<<<<< HEAD
 - [`color.components`]($color.components) doesn't round anything anymore
-=======
-- [`color.components`] doesn't round anything anymore
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 
 ## Export
 - PDFs now contain named destinations for headings derived from their labels
diff --git a/docs/changelog/0.11.1.md b/docs/changelog/0.11.1.md
index b9e0950327..63d840004f 100644
--- a/docs/changelog/0.11.1.md
+++ b/docs/changelog/0.11.1.md
@@ -18,19 +18,11 @@ description: Changes in Typst 0.11.1
 
 ## Text and Layout
 - Fixed interaction of [`first-line-indent`]($par.first-line-indent) and
-<<<<<<< HEAD
   [`outline`]($outline)
 - Fixed compression of CJK punctuation marks at line start and end
 - Fixed handling of [rectangles]($rect) with negative dimensions
 - Fixed layout of [`path`]($path) in explicitly sized container
 - Fixed broken [`raw`]($raw) text in right-to-left paragraphs
-=======
-  [`outline`]
-- Fixed compression of CJK punctuation marks at line start and end
-- Fixed handling of [rectangles]($rect) with negative dimensions
-- Fixed layout of [`path`] in explicitly sized container
-- Fixed broken [`raw`] text in right-to-left paragraphs
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 - Fixed tab rendering in `raw` text with language `typ` or `typc`
 - Fixed highlighting of multi-line `raw` text enclosed by single backticks
 - Fixed indentation of overflowing lines in `raw` blocks
diff --git a/docs/changelog/0.12.0.md b/docs/changelog/0.12.0.md
index d7bc7cf024..d60de65b26 100644
--- a/docs/changelog/0.12.0.md
+++ b/docs/changelog/0.12.0.md
@@ -3,11 +3,8 @@ title: 0.12.0
 description: Changes in Typst 0.12.0
 ---
 
-<<<<<<< HEAD
 <!-- textlint-disable ja-technical-writing/no-unmatched-pair -->
 
-=======
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 # Version 0.12.0 (October 18, 2024)
 
 ## Highlights
@@ -36,27 +33,17 @@ description: Changes in Typst 0.12.0
 
 ## Layout
 - Added support for multi-column floating placement and figures via
-<<<<<<< HEAD
   [`place.scope`]($place.scope) and [`figure.scope`]($figure.scope).  Two-column documents should now prefer
   `{set page(columns: 2)}` over `{show: column.with(2)}` (see the
   [page setup guide]($guides/page-setup-guide/#columns)).
 - Added support for automatic [line numbering]($par.line) (often used in
   academic papers)
 - Added [`par.spacing`]($par.spacing) property for configuring paragraph spacing. This should
-=======
-  [`place.scope`] and [`figure.scope`].  Two-column documents should now prefer
-  `{set page(columns: 2)}` over `{show: column.with(2)}` (see the
-  [Page Setup Guide]($guides/page-setup/#columns)).
-- Added support for automatic [line numbering]($par.line) (often used in
-  academic papers)
-- Added [`par.spacing`] property for configuring paragraph spacing. This should
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
   now be used instead of `{show par: set block(spacing: ..)}`
   **(Breaking change)**
 - Block-level elements like lists, grids, and stacks now show themselves as
   blocks and are thus affected by all block properties (e.g. `stroke`) rather
   than just `spacing` **(Breaking change)**
-<<<<<<< HEAD
 - Added [`block.sticky`]($block.sticky) property which prevents a page break after a block
 - Added [`place.flush`]($place.flush) function which forces all floating figures to be placed
   before any further content
@@ -71,22 +58,6 @@ description: Changes in Typst 0.12.0
 - The height of a `block`, `image`, `rect`, `square`, `ellipse`, or `circle` can
   now be specified in [fractional units]($fraction)
 - The [`scale`]($scale) function now supports absolute lengths for `x`, `y`, `factor`.
-=======
-- Added [`block.sticky`] property which prevents a page break after a block
-- Added [`place.flush`] function which forces all floating figures to be placed
-  before any further content
-- Added [`skew`] function
-- Added `{auto}` option for [`page.header`] and [`page.footer`] which results in
-  an automatic header/footer based on the numbering (which was previously
-  inaccessible after a change)
-- Added `gap` and `justify` parameters to [`repeat`] function
-- Added `width` and `height` parameters to the [`measure`] function to define
-  the space in which the content should be measured. Especially useful in
-  combination with [`layout`].
-- The height of a `block`, `image`, `rect`, `square`, `ellipse`, or `circle` can
-  now be specified in [fractional units]($fraction)
-- The [`scale`] function now supports absolute lengths for `x`, `y`, `factor`.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
   This way an element of unknown size can be scaled to a fixed size.
 - The values of `block.above` and `block.below` can now be retrieved in context
   expressions.
@@ -96,28 +67,17 @@ description: Changes in Typst 0.12.0
 - Fixed footnotes within breakable blocks appearing on the page where the
   breakable block ends instead of at the page where the footnote marker is
 - Fixed numbering of nested footnotes and footnotes in floats
-<<<<<<< HEAD
 - Fixed empty pages appearing when a [context]($context) expression wraps whole pages
 - Fixed `{set block(spacing: x)}` behaving differently from
   `{set block(above: x, below: x)}`
 - Fixed behavior of [`rotate`]($rotate) and [`scale`]($scale) with `{reflow: true}`
-=======
-- Fixed empty pages appearing when a [context] expression wraps whole pages
-- Fixed `{set block(spacing: x)}` behaving differently from
-  `{set block(above: x, below: x)}`
-- Fixed behavior of [`rotate`] and [`scale`] with `{reflow: true}`
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 - Fixed interaction of `{align(horizon)}` and `{v(1fr)}`
 - Fixed various bugs where floating placement would yield overlapping results
 - Fixed a bug where widow/orphan prevention would unnecessarily move text into
   the next column
 - Fixed [weak spacing]($h.weak) not being trimmed at the start and end of lines
   in a paragraph (only at the start and end of paragraphs)
-<<<<<<< HEAD
 - Fixed interaction of weak page break and [`pagebreak.to`]($pagebreak.to)
-=======
-- Fixed interaction of weak page break and [`pagebreak.to`]
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 - Fixed compilation output of a single weak page break
 - Fixed crash when [padding]($pad) by `{100%}`
 
@@ -130,25 +90,15 @@ description: Changes in Typst 0.12.0
 - Setting the font to an unavailable family will now result in a warning
 - Implemented a new smart quote algorithm, fixing various bugs where smart
   quotes weren't all that smart
-<<<<<<< HEAD
 - Added [`text.costs`]($text.costs) parameter for tweaking various parameters that affect the
-=======
-- Added [`text.costs`] parameter for tweaking various parameters that affect the
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
   choices of the layout engine during text layout
 - Added `typm` highlighting mode for math in [raw blocks]($raw.lang)
 - Added basic i18n for Galician, Catalan, Latin, Icelandic, Hebrew
 - Implemented hyphenation duplication for Czech, Croatian, Lower Sorbian,
   Polish, Portuguese, Slovak, and Spanish.
-<<<<<<< HEAD
 - The [`smallcaps`]($smallcaps) function is now an element function and can thereby be used
   in show(-set) rules.
 - The [`raw.theme`]($raw.theme) parameter can now be set to `{none}` to disable highlighting
-=======
-- The [`smallcaps`] function is now an element function and can thereby be used
-  in show(-set) rules.
-- The [`raw.theme`] parameter can now be set to `{none}` to disable highlighting
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
   even in the presence of a language tag, and to `{auto}` to reset to the
   default
 - Multiple [stylistic sets]($text.stylistic-set) can now be enabled at once
@@ -159,11 +109,7 @@ description: Changes in Typst 0.12.0
 - Fixed bugs related to empty paragraphs created via `#""`
 - Fixed accidental trailing spaces for line breaks immediately preceding an
   inline equation
-<<<<<<< HEAD
 - Fixed [`text.historical-ligatures`]($text.historical-ligatures) not working correctly
-=======
-- Fixed [`text.historical-ligatures`] not working correctly
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 - Fixed accidental repetition of Thai characters around line breaks in some
   circumstances
 - Fixed [smart quotes]($smartquote) for Swiss French
@@ -202,11 +148,7 @@ description: Changes in Typst 0.12.0
 - Fixed multiple minor layout bugs with attachments
 - Fixed that alignment points could affect line height in math
 - Fixed that spaces could show up between text and invisible elements like
-<<<<<<< HEAD
   [`metadata`]($metadata) in math
-=======
-  [`metadata`] in math
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 - Fixed a crash with recursive show rules in math
 - Fixed [`lr.size`]($math.lr.size) not affecting characters enclosed in
   [`mid`]($math.mid) in some cases
@@ -224,11 +166,7 @@ description: Changes in Typst 0.12.0
   page when isolated by weak page breaks. This allows, for instance, updating a
   counter before the first page header and background.
 - Fixed logical ordering of introspections within footnotes and figures
-<<<<<<< HEAD
 - Fixed incorrect [`here().position()`]($here) when [`place`]($place) was used in a
-=======
-- Fixed incorrect [`here().position()`]($here) when [`place`] was used in a
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
   context expression
 - Fixed resolved positions of elements (in particular, headings) whose show rule
   emits an invisible element (like a state update) before a page break
@@ -246,17 +184,10 @@ description: Changes in Typst 0.12.0
   respected for tight lists
 - Tight lists now only attach (with tighter spacing) to preceding paragraphs,
   not arbitrary blocks
-<<<<<<< HEAD
 - The [`quote`]($quote) element is now locatable (can be used in queries)
 - The bibliography heading now uses `depth` instead of `level` so that its level
   can still be configured via a show-set rule
 - Added support for more [numbering]($numbering) formats: Devanagari, Eastern Arabic,
-=======
-- The [`quote`] element is now locatable (can be used in queries)
-- The bibliography heading now uses `depth` instead of `level` so that its level
-  can still be configured via a show-set rule
-- Added support for more [numbering] formats: Devanagari, Eastern Arabic,
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
   Bengali, and circled numbers
 - Added [`hanging-indent`]($heading.hanging-indent) parameter to heading
   function to tweak the appearance of multi-line headings and improved default
@@ -307,7 +238,6 @@ description: Changes in Typst 0.12.0
 - Fixed rare crash in parsing of parenthesized expressions
 
 ## Scripting
-<<<<<<< HEAD
 - Added new fixed-point [`decimal`]($decimal) number type for highly precise arithmetic on
   numbers in base 10, as needed for finance
 - Added `std` module for accessing standard library definitions even when a
@@ -320,39 +250,17 @@ description: Changes in Typst 0.12.0
 - Added proper support for negative values of the `digits` parameter of
   [`calc.round`]($calc.round) (the behaviour existed before but was subtly broken)
 - Conversions from [`int`]($int) to [`float`]($float) will now error instead of saturating if
-=======
-- Added new fixed-point [`decimal`] number type for highly precise arithmetic on
-  numbers in base 10, as needed for finance
-- Added `std` module for accessing standard library definitions even when a
-  variable with the same name shadows/overwrites it
-- Added [`array.to-dict`], [`array.reduce`], [`array.windows`] methods
-- Added `exact` argument to [`array.zip`]
-- Added [`arguments.at`] method
-- Added [`int.from-bytes`], [`int.to-bytes`], [`float.from-bytes`], and
-  [`float.to-bytes`]
-- Added proper support for negative values of the `digits` parameter of
-  [`calc.round`] (the behaviour existed before but was subtly broken)
-- Conversions from [`int`] to [`float`] will now error instead of saturating if
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
   the float is too large **(Minor breaking change)**
 - Added `float.nan` and `float.inf`, removed `calc.nan`
   **(Minor breaking change)**
 - Certain symbols are now generally callable like functions and not only
   specifically in math. Examples are accents or [`floor`]($math.floor) and
   [`ceil`]($math.ceil).
-<<<<<<< HEAD
 - Improved [`repr`]($repr) of relative values, sequences, infinities, NaN,
   `{type(none)}` and `{type(auto)}`
 - Fixed crash on whole packages (rather than just files) cyclically importing
   each other
 - Fixed return type of [`calc.round`]($calc.round) on integers when a non-zero value is
-=======
-- Improved [`repr`] of relative values, sequences, infinities, NaN,
-  `{type(none)}` and `{type(auto)}`
-- Fixed crash on whole packages (rather than just files) cyclically importing
-  each other
-- Fixed return type of [`calc.round`] on integers when a non-zero value is
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
   provided for `digits`
 
 ## Styling
@@ -370,11 +278,7 @@ description: Changes in Typst 0.12.0
 - Added initial support for PDF/A. For now, only the standard PDF/A-2b is
   supported, but more is planned for the future. Enabled via `--pdf-standard
   a-2b` in the CLI and via the UI in File > Export as > PDF in the web app.
-<<<<<<< HEAD
 - Setting [`page.fill`]($page.fill) to `{none}` will now lead to transparent pages instead
-=======
-- Setting [`page.fill`] to `{none}` will now lead to transparent pages instead
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
   of white ones in PNG and SVG. The new default of `{auto}` means transparent
   for PDF and white for PNG and SVG.
 - Improved text copy-paste from PDF in complex scenarios
@@ -475,7 +379,6 @@ description: Changes in Typst 0.12.0
   **(Breaking change)**
 
 ## Deprecations
-<<<<<<< HEAD
 - [`counter.display`]($counter.display) without an established context
 - [`counter.final`]($counter.final) with a location
 - [`state.final`]($state.final) with a location
@@ -483,15 +386,6 @@ description: Changes in Typst 0.12.0
 - [`query`]($query) with a location as the second argument
 - [`locate`]($locate) with a callback function
 - [`measure`]($measure) with styles
-=======
-- [`counter.display`] without an established context
-- [`counter.final`] with a location
-- [`state.final`] with a location
-- `state.display`
-- [`query`] with a location as the second argument
-- [`locate`] with a callback function
-- [`measure`] with styles
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 - `style`
 
 ## Development
diff --git a/docs/changelog/0.13.0.md b/docs/changelog/0.13.0.md
index c1029e3df9..83bbdee946 100644
--- a/docs/changelog/0.13.0.md
+++ b/docs/changelog/0.13.0.md
@@ -3,11 +3,8 @@ title: 0.13.0
 description: Changes in Typst 0.13.0
 ---
 
-<<<<<<< HEAD
 <!-- textlint-disable ja-technical-writing/no-unmatched-pair -->
 
-=======
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 # Version 0.13.0 (February 19, 2025)
 
 ## Highlights
@@ -15,22 +12,13 @@ description: Changes in Typst 0.13.0
   inline-level content. This is important for future work on accessibility and
   means that [first line indent]($par.first-line-indent) can now be enabled for
   all paragraphs instead of just consecutive ones.
-<<<<<<< HEAD
 - The [`outline`]($outline) has a better out-of-the-box look and is more customizable
 - The new [`curve`]($curve) function (that supersedes the `path` function) provides a
-=======
-- The [`outline`] has a better out-of-the-box look and is more customizable
-- The new [`curve`] function (that supersedes the `path` function) provides a
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
   simpler and more flexible interface for creating Bézier curves
 - The `image` function now supports raw [pixel raster formats]($image.format)
   for generating images from within Typst
 - Functions that accept [file paths]($syntax/#paths) now also accept raw
-<<<<<<< HEAD
   [bytes]($bytes), for full flexibility
-=======
-  [bytes], for full flexibility
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 - WebAssembly [plugins]($plugin) are more flexible and automatically run
   multi-threaded
 - Fixed a long-standing bug where single-letter strings in math (`[$"a"$]`)
@@ -59,13 +47,8 @@ description: Changes in Typst 0.13.0
     result in a warning
   - The default show rules of various built-in elements like lists, quotes, etc.
     were adjusted to ensure they produce/don't produce paragraphs as appropriate
-<<<<<<< HEAD
   - Removed support for booleans and content in [`outline.indent`]($outline.indent)
 - The [`outline`]($outline) function was fully reworked to improve its out-of-the-box
-=======
-  - Removed support for booleans and content in [`outline.indent`]
-- The [`outline`] function was fully reworked to improve its out-of-the-box
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
   behavior **(Breaking change)**
   - [Outline entries]($outline.entry) are now [blocks]($block) and are thus
     affected by block spacing
@@ -81,7 +64,6 @@ description: Changes in Typst 0.13.0
   - Removed `body` and `page` fields from outline entry
   - Added `indented`, `prefix`, `inner`, `body`, and `page` methods on outline
     entries to simplify writing of show rules
-<<<<<<< HEAD
 - Added configuration to [`par.first-line-indent`]($par.first-line-indent) for indenting all paragraphs
   instead of just consecutive ones
 - Added [`form`]($ref.form) parameter to `ref` function. Setting the form to
@@ -95,21 +77,6 @@ description: Changes in Typst 0.13.0
   all the visible leaf elements. This significantly reduces PDF file sizes when
   combining `link` and [`repeat`]($repeat).
 - The [`link`]($link) function will now only strip one prefix (like `mailto:` or
-=======
-- Added configuration to [`par.first-line-indent`] for indenting all paragraphs
-  instead of just consecutive ones
-- Added [`form`]($ref.form) parameter to `ref` function. Setting the form to
-  `{"page"}` will produce a page reference instead of a textual one.
-- Added [`document.description`] field, which results in corresponding PDF and
-  HTML metadata
-- Added [`enum.reversed`] parameter
-- Added support for Greek [numbering]
-- When the [`link`] function wraps around a container like a [block], it will
-  now generate only one link for the whole block instead of individual links for
-  all the visible leaf elements. This significantly reduces PDF file sizes when
-  combining `link` and [`repeat`].
-- The [`link`] function will now only strip one prefix (like `mailto:` or
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
   `tel:`) instead of multiple
 - The link function now suppresses hyphenation via a built-in show-set rule
   rather than through its default show rule
@@ -117,17 +84,12 @@ description: Changes in Typst 0.13.0
   page numbering into account
 
 ## Visualization
-<<<<<<< HEAD
 - Added new [`curve`]($curve) function that supersedes the [`path`]($path) function and
-=======
-- Added new [`curve`] function that supersedes the [`path`] function and
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
   provides a simpler and more flexible interface. The `path` function is now
   deprecated.
 - The `image` function now supports raw [pixel raster formats]($image.format).
   This can be used to generate images from within Typst without the need for
   encoding in an image exchange format.
-<<<<<<< HEAD
 - Added [`image.scaling`]($image.scaling) parameter for configuring how an image is scaled by
   PNG export and PDF viewers (smooth or pixelated)
 - Added [`image.icc`]($image.icc) parameter for providing or overriding the ICC profile of
@@ -141,26 +103,10 @@ description: Changes in Typst 0.13.0
 - Fixed non-solid (e.g. tiling) text fills in clipped blocks
 - Fixed a crash for images with a DPI value of zero
 - Fixed floating-point error in [`gradient.repeat`]($gradient.repeat)
-=======
-- Added [`image.scaling`] parameter for configuring how an image is scaled by
-  PNG export and PDF viewers (smooth or pixelated)
-- Added [`image.icc`] parameter for providing or overriding the ICC profile of
-  an image
-- Renamed `pattern` to [`tiling`]. The name `pattern` remains as a deprecated
-  alias.
-- Added [`gradient.center`], [`gradient.radius`], [`gradient.focal-center`], and
-  [`gradient.focal-radius`] methods
-- Fixed interaction of clipping and outset on [`box`] and [`block`]
-- Fixed panic with [`path`] of infinite length
-- Fixed non-solid (e.g. tiling) text fills in clipped blocks
-- Fixed a crash for images with a DPI value of zero
-- Fixed floating-point error in [`gradient.repeat`]
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 - Auto-detection of image formats from a raw buffer now has support for SVGs
 
 ## Scripting
 - Functions that accept [file paths]($syntax/#paths) now also accept raw
-<<<<<<< HEAD
   [bytes]($bytes)
   - [`image`]($image), [`cbor`]($cbor), [`csv`]($csv), [`json`]($json), [`toml`]($toml), [`xml`]($xml), and [`yaml`]($yaml) now
     support a path string or bytes and their `.decode` variants are deprecated
@@ -177,29 +123,10 @@ description: Changes in Typst 0.13.0
   - Plugins now automatically run in multiple threads without any changes by
     plugin authors
   - A new [`plugin.transition`]($plugin.transition) API is introduced which allows plugins to run
-=======
-  [bytes]
-  - [`image`], [`cbor`], [`csv`], [`json`], [`toml`], [`xml`], and [`yaml`] now
-    support a path string or bytes and their `.decode` variants are deprecated
-  - [`plugin`], [`bibliography`], [`bibliography.style`], [`cite.style`],
-    [`raw.theme`], and [`raw.syntaxes`] now accept bytes in addition to path
-    strings. These did not have `.decode` variants, so this adds new
-    flexibility.
-  - The `path` argument/field of [`image`] and [`bibliography`] was renamed to
-    `source` and `sources`, respectively **(Minor breaking change)**
-- Improved WebAssembly [plugins]($plugin)
-  - The `plugin` type is replaced by a [`plugin` function]($plugin) that returns
-    a [module] containing normal Typst functions. This module can be used with
-    import syntax. **(Breaking change)**
-  - Plugins now automatically run in multiple threads without any changes by
-    plugin authors
-  - A new [`plugin.transition`] API is introduced which allows plugins to run
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     impure initialization in a way that doesn't break Typst's purity guarantees
 - The variable name bound by a bare import (no renaming, no import list) is now
   determined statically and dynamic imports without `{as}` renaming (e.g.
   `{import "ot" + "her.typ"}`) are a hard error **(Breaking change)**
-<<<<<<< HEAD
 - Values of the [`arguments`]($arguments) type can now be added with `+` and
   [joined]($scripting/#blocks) in curly-braced code blocks
 - Functions in an element function's scope can now be called with method syntax,
@@ -211,19 +138,6 @@ description: Changes in Typst 0.13.0
 - The [`decimal`]($decimal) constructor now also accepts decimal values
 - Improved `repr` of [symbols]($symbol), [arguments]($arguments), and [types]($type)
 - Duplicate [symbol]($symbol) variants and modifiers are now a hard error
-=======
-- Values of the [`arguments`] type can now be added with `+` and
-  [joined]($scripting/#blocks) in curly-braced code blocks
-- Functions in an element function's scope can now be called with method syntax,
-  bringing elements and types closer (in anticipation of a future full
-  unification of the two). Currently, this is only useful for [`outline.entry`]
-  as no other element function defines methods.
-- Added [`calc.norm`] function
-- Added support for 32-bit floats in [`float.from-bytes`] and [`float.to-bytes`]
-- The [`decimal`] constructor now also accepts decimal values
-- Improved `repr` of [symbols]($symbol), [arguments], and [types]($type)
-- Duplicate [symbol] variants and modifiers are now a hard error
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
   **(Breaking change)**
 
 ## Math
@@ -238,11 +152,7 @@ description: Changes in Typst 0.13.0
 - The [`italic`]($math.italic) function now works with ħ
 - Fixed a bug where the extent of a math equation was wrongly affected by
   internal metadata
-<<<<<<< HEAD
 - Fixed interaction of [`lr`]($math.lr) and [context]($context) expressions
-=======
-- Fixed interaction of [`lr`]($math.lr) and [context] expressions
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 - Fixed weak spacing being unconditionally ignored in [`lr`]($math.lr)
 - Fixed sub/superscripts sometimes being in the wrong position with
   [`lr`]($math.lr)
@@ -276,22 +186,13 @@ description: Changes in Typst 0.13.0
 - Added [`all`]($smallcaps.all) parameter to `smallcaps` function that also
   enables small capitals on uppercase letters
 - Added basic i18n for Basque and Bulgarian
-<<<<<<< HEAD
 - [Justification]($par.justify) does not affect [raw]($raw) blocks anymore
 - [CJK-Latin-spacing]($text.cjk-latin-spacing) does not affect [raw]($raw) text
-=======
-- [Justification]($par.justify) does not affect [raw] blocks anymore
-- [CJK-Latin-spacing]($text.cjk-latin-spacing) does not affect [raw] text
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
   anymore
 - Fixed wrong language codes being used for Greek and Ukrainian
 - Fixed default quotes for Croatian and Bulgarian
 - Fixed crash in RTL text handling
-<<<<<<< HEAD
 - Added support for [`raw`]($raw) syntax highlighting for a few new languages: CFML,
-=======
-- Added support for [`raw`] syntax highlighting for a few new languages: CFML,
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
   NSIS, and WGSL
 - New font metadata exception for New Computer Modern Sans Math
 - Updated bundled New Computer Modern fonts to version 7.0.1
@@ -302,7 +203,6 @@ description: Changes in Typst 0.13.0
     another footnote
   - Fixed endless loops with empty and overlarge footnotes
   - Fixed crash with overlarge footnotes within a floating placement
-<<<<<<< HEAD
 - Fixed sizing of quadratic shapes ([`square`]($square) and [`circle`]($circle))
 - Fixed [`block.sticky`]($block.sticky) not working properly at the top of a container
 - Fixed crash due to consecutive weak spacing
@@ -310,15 +210,6 @@ description: Changes in Typst 0.13.0
 - Fixed unnecessary hyphenations occurring in rare scenarios due to a bad
   interaction between padding and paragraph optimization
 - Fixed lone [citations]($cite) in [`align`]($align) not becoming their own paragraph
-=======
-- Fixed sizing of quadratic shapes ([`square`] and [`circle`])
-- Fixed [`block.sticky`] not working properly at the top of a container
-- Fixed crash due to consecutive weak spacing
-- Fixed crash when a [block] or text have negative sizes
-- Fixed unnecessary hyphenations occurring in rare scenarios due to a bad
-  interaction between padding and paragraph optimization
-- Fixed lone [citations]($cite) in [`align`] not becoming their own paragraph
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 
 ## Syntax
 - Top-level closing square brackets that do not have a matching opening square
@@ -353,17 +244,10 @@ still _very_ incomplete, but already available for experimentation behind a
 feature flag.
 
 - Added HTML output support for some (but not all) of the built-in elements
-<<<<<<< HEAD
 - Added [`html.elem`]($html.elem) function for outputting an arbitrary HTML element
 - Added [`html.frame`]($html.frame) function for integrating content that requires layout
   into HTML (by embedding an SVG)
 - Added [`target`]($target) function which returns either `{"paged"}` or `{"html"}`
-=======
-- Added [`html.elem`] function for outputting an arbitrary HTML element
-- Added [`html.frame`] function for integrating content that requires layout
-  into HTML (by embedding an SVG)
-- Added [`target`] function which returns either `{"paged"}` or `{"html"}`
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
   depending on the export target
 
 ## Tooling and Diagnostics
@@ -429,17 +313,10 @@ feature flag.
   - `ohm` in favor of `Omega`
 
 ## Deprecations
-<<<<<<< HEAD
 - The [`path`]($path) function in favor of the [`curve`]($curve) function
 - The name `pattern` for tiling patterns in favor of the new name [`tiling`]($tiling)
 - [`image.decode`]($image.decode), [`cbor.decode`]($cbor.decode), [`csv.decode`]($csv.decode), [`json.decode`]($json.decode),
   [`toml.decode`]($toml.decode), [`xml.decode`]($xml.decode), [`yaml.decode`]($yaml.decode) in favor of the top-level
-=======
-- The [`path`] function in favor of the [`curve`] function
-- The name `pattern` for tiling patterns in favor of the new name [`tiling`]
-- [`image.decode`], [`cbor.decode`], [`csv.decode`], [`json.decode`],
-  [`toml.decode`], [`xml.decode`], [`yaml.decode`] in favor of the top-level
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
   functions directly accepting both paths and bytes
 - The `sect` and its variants in favor of `inter`, and `integral.sect` in favor
   of `integral.inter`
@@ -448,7 +325,6 @@ feature flag.
   removed in Typst 0.14.
 
 ## Removals
-<<<<<<< HEAD
 - Removed `style` function and `styles` argument of [`measure`]($measure), use a [context]($context)
   expression instead **(Breaking change)**
 - Removed `state.display` function, use [`state.get`]($state.get) instead
@@ -458,17 +334,6 @@ feature flag.
 - Removed compatibility behavior where [`counter.display`]($counter.display) worked without
   [context]($context) **(Breaking change)**
 - Removed compatibility behavior of [`locate`]($locate) **(Breaking change)**
-=======
-- Removed `style` function and `styles` argument of [`measure`], use a [context]
-  expression instead **(Breaking change)**
-- Removed `state.display` function, use [`state.get`] instead
-  **(Breaking change)**
-- Removed `location` argument of [`state.at`], [`counter.at`], and [`query`]
-  **(Breaking change)**
-- Removed compatibility behavior where [`counter.display`] worked without
-  [context] **(Breaking change)**
-- Removed compatibility behavior of [`locate`] **(Breaking change)**
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 
 ## Development
 - The `typst::compile` function is now generic and can return either a
diff --git a/docs/changelog/0.13.1.md b/docs/changelog/0.13.1.md
index 0ffd46267a..6a0347a812 100644
--- a/docs/changelog/0.13.1.md
+++ b/docs/changelog/0.13.1.md
@@ -1,6 +1,5 @@
 ---
 title: 0.13.1
-<<<<<<< HEAD
 description: Typst 0.13.1の変更点
 ---
 
@@ -24,32 +23,4 @@ description: Typst 0.13.1の変更点
 - 型と文字列の比較に関する非推奨警告の誤検出を修正しました。
 
 ## 貢献者
-=======
-description: Changes in Typst 0.13.1
----
-
-# Version 0.13.1 (March 7, 2025)
-
-## Command Line Interface
-- Fixed high CPU usage for `typst watch` on Linux. Depending on the project
-  size, CPU usage would spike for varying amounts of time. This bug appeared
-  with 0.13.0 due to a behavioral change in the inotify file watching backend.
-
-## HTML export
-- Fixed export of tables with [gutters]($table.gutter)
-- Fixed usage of `<html>` and `<body>` element within [context]
-- Fixed querying of [metadata] next to `<html>` and `<body>` element
-
-## Visualization
-- Fixed [curves]($curve) with multiple non-closed components
-
-## Introspection
-- Fixed a regression where labelled [symbols]($symbol) could not be
-  [queried]($query) by label
-
-## Deprecations
-- Fixed false positives in deprecation warnings for type/str comparisons
-
-## Contributors
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 <contributors from="v0.13.0" to="v0.13.1" />
diff --git a/docs/changelog/0.14.0.md b/docs/changelog/0.14.0.md
index 04e6eeca85..bfc32d9ccd 100644
--- a/docs/changelog/0.14.0.md
+++ b/docs/changelog/0.14.0.md
@@ -1,6 +1,5 @@
 ---
 title: 0.14.0
-<<<<<<< HEAD
 description: Typst 0.14.0の変更点
 ---
 
@@ -288,6 +287,9 @@ _数式に関する作業について[@mkorje](https://github.com/mkorje)に感
 - `--make-deps` CLIフラグを`--deps`と`--deps-format make`の組み合わせに変更 [#7022](https://github.com/typst/typst/issues/7022)
 - さまざまな記号。完全なリストについては[専用のchangelogの廃止予定セクション](https://github.com/typst/codex/blob/v0.2.0/CHANGELOG.md#deprecated)をご覧ください
 
+## Removals
+- Removed compatibility behavior of type/str comparisons (e.g. `{int == "integer"}`), which was temporarily introduced in Typst 0.8 and deprecated in Typst 0.13 **(Breaking change)**
+
 ## 開発
 - クレート分割とトレイトコヒーレンスの理由により`Library`の`Default`実装を削除する必要がありましたが、`use typst::LibraryExt`で同等の置き換えが可能です [#6576](https://github.com/typst/typst/issues/6576)
 - `PdfOptions`構造体に新しい`tagged`フィールドが追加され、デフォルトは`{true}`です [#6619](https://github.com/typst/typst/issues/6619) [#7046](https://github.com/typst/typst/issues/7046)
@@ -296,302 +298,4 @@ _数式に関する作業について[@mkorje](https://github.com/mkorje)に感
 - Dockerコンテナにオプションの非rootユーザー`typst`が追加されました [#7058](https://github.com/typst/typst/issues/7058)
 
 ## 貢献者
-=======
-description: Changes in Typst 0.14.0
----
-
-# Version 0.14.0 (October 24, 2025) { #v0.14.0 }
-
-## Highlights
-- Typst now produces [_accessible_ PDFs]($guides/accessibility) out of the box, with opt-in support for stricter checks and conformance to PDF/UA-1
-- Typst now supports all [PDF/A standards]($pdf/#pdf-a)
-- PDFs can now be used as [images]($image.format) (thanks to [@LaurenzV](https://github.com/LaurenzV))
-- Added support for [character-level justification]($par.justification-limits) (can significantly improve the appearance of justified text)
-- Added support for many more built-in elements in HTML export
-- Added typed HTML API (e.g. [`html.div`]) with individually typed attributes
-- Added support for multiple [headers]($table.header) and subheaders in tables
-- Added [`title`] element for displaying the document title
-- Added [`frac.style`]($math.frac.style) property for producing skewed and inline fractions
-
-## PDF export
-PDF export was fully rewritten to use the new [`krilla`](https://github.com/LaurenzV/krilla) library, fixing various bugs and enabling many improvements. Known fixes are listed below, but there will likely be other changes in how the output behaves. If you spot any regressions, please [report them on GitHub](https://github.com/typst/typst/issues). _(Thanks to [@LaurenzV](https://github.com/LaurenzV) for creating krilla!)_ [#5420]
-
-- Typst now produces _accessible_ PDFs out of the box. Such documents are suitable for consumption in a wide range of circumstances. That not only includes consumption by people with permanent or temporary disabilities, but also by those with different devices or preferences.
-  - Typst PDFs are now _tagged_ by default. _Tags_ are rich metadata that PDF viewers can use to make the document consumable in other ways than visually (e.g., through a screen reader).
-  - In addition, Typst can now emit documents conforming to the PDF/UA-1 standard. (PDF/UA-2 is not yet supported, but planned.)
-  - There is an increasing amount of existing and upcoming legislation requiring documents to be accessible, for instance, the European Accessibility Act and the Americans with Disabilities Act.
-  - For more details on all of this, read the new [Accessibility Guide]($guides/accessibility).
-- Typst now supports all PDF/A standards: PDF/A-1b, PDF/A-1a, PDF/A-2b, PDF/A-2u, PDF/A-2a, PDF/A-3b, PDF/A-3u, PDF/A-3a, PDF/A-4, PDF/A-4f, and PDF/A-4e. See the [expanded PDF/A documentation]($pdf/#pdf-a) for guidance on how to select a suitable standard. [#5420] [#7038]
-- Typst now supports the PDF versions 1.4, 1.5, 1.6, and 2.0 in addition to PDF 1.7. See the [relevant section of the PDF documentation]($pdf/#pdf-versions) for details. [#5420]
-- Added [`pdf.artifact`] function for marking content as not semantically meaningful [#6619]
-- Added experimental [`pdf.header-cell`], [`pdf.data-cell`], and [`pdf.table-summary`] functions for enhancing accessibility of documents with complex tables. These functions are guarded by the `a11y-extras` feature. They do not have a final interface and will be removed in the future, either through integration into table functions or through full removal. [#6619]
-- PDF heading bookmarks now contain the heading's numbering [#6622]
-- [Attachments]($pdf.attach)
-  - Renamed `pdf.embed` to [`pdf.attach`] (the old name will remain as a deprecated alias until Typst 0.15) [#6705]
-  - The [`mime`]($pdf.attach.mime-type) property of `pdf.attach` is now checked for syntactical correctness **(Minor breaking change)**
-  - Fixed parsing of the [`data`]($pdf.attach.data) argument of `pdf.attach` [#6435]
-  - Attachments now smartly determine whether they should be compressed [#6256]
-- Text extraction (i.e. copy paste)
-  - Now works correctly even when multiple different characters result in the same glyph [#5420]
-  - Spaces between words at which a natural line break occurred are now correctly retained for text extraction [#6866]
-  - Fixed mapping of hyphenation artifacts to Unicode text [#6799]
-- Images
-  - CMYK images now work properly in PDF export [#5420]
-  - Improved export of text in SVG images with a filter [#5420]
-  - Improved compatibility of SVG images with Quartz rendering engine (the engine used in Apple Preview) [#5420]
-  - Improved handling of SVG images with high group nesting depth [#5420]
-- Fixed a bug with text in patterns [#5420]
-- Fixed gradients with transparency [#5420]
-
-## HTML export
-- Added support for many more built-in elements (the [_Model_ category]($category/model) is now fully covered)
-  - The [`image`] element [#6578]
-  - The [`footnote`] and [`footnote.entry`] element [#6917]
-  - The [`outline`] and [`outline.entry`] element [#6606]
-  - The [`bibliography`] element [#6952]
-  - The [`smartquote`] element [#6710]
-  - The [`sub`] and [`super`] elements [#6422]
-  - The [`underline`], [`overline`], [`strike`], and [`highlight`] elements [#6510]
-  - The [`smallcaps`] element [#6600]
-  - The [`lower`] and [`upper`] functions [#6585]
-- Added typed HTML API (e.g. [`html.div`]) with individually typed attributes [#6476]
-  - For example, to generate a `video` element you can now write `[#html.video(width: 400, src: "sunrise.mp4")]` instead of `[#html.elem("video", attrs: (width: "400", src: "sunrise.mp4"))]`. Note how the `width` attribute takes an integer instead of a string.
-- Added support for intra-doc [`link`] targets [#6602]
-- The [`raw`] element
-  - Added syntax highlighting support [#6691]
-  - Block-level `raw` elements now emit both a `<code>` and a `<pre>` tag [#6701]
-  - The [language tag]($raw.lang) of `raw` elements is now preserved as a `data-lang` attribute on the `<code>` tag [#6702]
-- The [`authors`]($document.author) and [`keywords`]($document.keywords) properties of the `document` function now yield corresponding HTML `<meta>` tags [#6134]
-- The [`html.elem`] function now supports custom HTML element names [#6676]
-- Improved encoding of [`html.frame`] [#6605]
-- Empty attributes are now encoded with shorthand syntax (e.g. `<div hidden></div>`) [#6479]
-- Zero-sized horizontal weak spacing (`{h(0pt, weak: true)}`) does not cause a "was ignored during HTML export" warning anymore, so it can be used to destruct surrounding spaces without producing any output, as in paged export [#6917]
-- Fixed encoding of `<pre>` and `<textarea>` elements that start with a newline [#6487] [#6497]
-- Fixed encoding of [raw text elements](https://html.spec.whatwg.org/#raw-text-elements) [#6487] [#6720]
-- Fixed sizing of [`html.frame`] [#6505]
-- Fixed [`measure`] in HTML export [#7186]
-- Fixed nested [`html.frame`s]($html.frame) [#6509]
-- Fixed that a [`box`] without a body was ignored in HTML export [#6709]
-- Fixed encoding of whitespace in HTML [#6750]
-
-## SVG export
-- Added support for COLR-flavored color glyphs [#6693]
-- Reduced amount of `<g>` grouping elements that are generated [#6247]
-
-## PNG export
-- Fixed crash when [text size]($text.size) is negative [#5940]
-
-## Visualize
-- Added support for using PDFs as [images]($image) using the new [`hayro`](https://github.com/LaurenzV/hayro) library. PDFs will be embedded directly in PDF export, rasterized in PNG export, and turned into SVGs in SVG and HTML export. _(Thanks to [@LaurenzV](https://github.com/LaurenzV) for creating hayro!)_ [#6623]
-- Added support for WebP images [#6311]
-- Various minor improvements for SVG images (see the [resvg 0.44 and 0.45 changelogs](https://github.com/linebender/resvg/blob/v0.45.1/CHANGELOG.md#0450---2025-02-26))
-- SVG images can now refer to external image files [#6794]
-- Clip paths are now properly anti-aliased [#6570]
-- Fixed gradients on curves where the last segment is [`curve.line`] [#6647]
-- Fixed stroke cap handling of shapes with partial strokes [#5688]
-- Fixed corner radius handling of shapes with partial strokes [#6976]
-- Fixed crash when sampling across two coinciding gradient stops [#6166]
-
-## Layout
-- Added opt-in support for character-level justification in addition to word-level justification, configured via the new [`par.justification-limits`] property. This is an impactful microtypographical technique that can significantly improve the appearance of justified text. [#6161]
-- Fixed wrong linebreak opportunities related to object replacement characters [#6251]
-- Fixed an issue where a breakable block would still produce an empty segment even if nothing fit into the first segment, leading to various undesirable behaviors in combination with fills, strokes, and [stickiness]($block.sticky) [#6335]
-- Fixed crash with set rule for column or rowspan on a grid cell [#6401]
-- Fixed [CJK-Latin-spacing]($text.cjk-latin-spacing) at manual line breaks [#6700] and at sub- and superscript boundaries [#7175]
-
-## Math
-- Added [`frac.style`]($math.frac.style) property with new options for skewed and inline fractions [#6672]
-- Added [`math.equation.alt`] property for setting an alternative description for an equation [#6619]
-- Text handling
-  - A single equation can now use multiple fonts [#6365]
-  - Glyph layout in math now uses proper text shaping, leading to better handling of more complex Unicode features [#6336]
-  - Generated characters in an equation (e.g. the `√` produced by `sqrt`) can now be targeted by text show rules [#6365]
-  - Added [`scr`]($math.scr) function for roundhand script font style [#6309]
-  - Added `dotless` parameter to [`accent`]($math.accent) (typically for rendering a dotless accented i or j) [#5939]
-  - Script-style glyphs are now preferred at reduced math sizes [#6320]
-  - Fixed [`text.stroke`] in math [#6243]
-  - Broken glyph assemblies are now prevented even when font data is incorrect [#6688]
-- Layout
-  - Fixed a bug with vertical accent positioning [#5941]
-  - Fixed positioning of bottom accents [#6187]
-  - Fixed a bug with layout of roots [#6021]
-  - Improved layout of [`vec`]($math.vec) and [`cases`]($math.cases), making it consistent with [`mat`]($math.mat) [#5934]
-  - Removed linebreak opportunity before closing bracket in inline math [#6216]
-- An [`augment`]($math.mat.augment) line can now exist at the start and end of a matrix, not only in between columns and rows [#5806]
-- Shorthands and multi-character numbers do not bind more tightly than fractions anymore in cases like `[$x>=(y)/z$]` [#5925] [#5996] **(Minor breaking change)**
-- Named arguments passed to symbols used as function now raise an error instead of being silently ignored [#6192] **(Minor breaking change)**
-- The [`mid`]($math.mid) element does not force the [`{"large"}` math class]($math.class) upon its contents anymore and instead defaults to `{"relation"}` [#5980]
-- Fixed error in math parsing when `..` isn't followed by anything [#7105]
-- Fixed the default math class of ⅋, ⎰, ⟅, ⎱, ⟆, ⟇, and ، [#5949] [#6537]
-
-_Thanks to [@mkorje](https://github.com/mkorje) for his work on math!_
-
-## Model
-- Tables
-  - Added support for multiple [headers]($table.header) and subheaders in tables [#6168]
-  - Table headers now force a rowbreak, i.e. an incomplete row before a header will not be filled with cells after the header [#6687]
-  - Fixed a bug where [headers]($table.header) and footers could accidentally expand to contain non-header cells [#5919]
-- Added [`title`] element for displaying the document title [#5618]
-- Added [`figure.alt`] property for setting an alternative description for a figure [#6619]
-- [Link]($link) hit boxes for text are now vertically a bit larger to avoid issues with automatic link detection in PDF viewers [#6252]
-- The [`link`] function will now produce an error when passed an empty string as a URL [#7049] **(Minor breaking change)**
-- The value of the [`number`]($enum.item.number) argument of `enum.item` now takes `{auto}` instead of `{none}` for automatic numbering [#6609] **(Minor breaking change)**
-- Improved spacing of nested tight lists [#6242]
-- Fixed that `{quotes: false}` was ignored for [inline-level quotes]($quote.block) [#5991]
-- Fixed [hanging indent]($heading.hanging-indent) for centered, numbered headings [#6839]
-- Fixed [`footnote.entry`] show rules breaking links from footnote to entry [#6912]
-- Hebrew numbering does not add Geresh and Gershayim anymore [#6122]
-
-## Bibliography
-- Built-in styles
-  - Updated styles to their latest upstream CSL versions [typst/hayagriva#350]
-  - Renamed `{"chicago-fullnotes"}` to `{"chicago-notes"}` (the old name remains as a deprecated alias) [#6920]
-  - Renamed `{"modern-humanities-research-association"}` to `{"modern-humanities-research-association-notes"}` (the old name remains as a deprecated alias) [#6994]
-  - Added support for locator/supplement in alphanumeric style [typst/hayagriva#307]
-
-- Hayagriva format
-  - Added [`chapter` field](https://github.com/typst/hayagriva/blob/v0.9.1/docs/file-format.md#chapter) corresponding to CSL `chapter-number` and BibLaTeX `chapter` [typst/hayagriva#383]
-
-- BibLaTeX format
-  - Fixed parsing of alphanumeric page ranges [typst/biblatex#86]
-  - Added support for `%` comment syntax [typst/biblatex#80]
-  - Fixed parsing of space-separated single character commands [typst/biblatex#71]
-  - Added "primaryclass" alias for "eprintclass" field [typst/biblatex#75]
-  - Added support for BibLaTeX `language` field [typst/hayagriva#317]
-  - Improved translation of BibLaTeX fields to `genre` and `serial-number` [typst/hayagriva#296] [typst/hayagriva#369]
-
-- CSL handling
-  - The bibliography rendering now uses [`strong`], [`emph`], and [`smallcaps`] to express CSL font styling instead of directly adjusting the [`text`] style, making styling easier [#6984]
-  - Added support for date seasons, which are displayed when the month is missing [typst/hayagriva#391]
-  - Terms for "AD" and "BC" are now correctly used from the chosen locale [typst/hayagriva#364]
-  - Fixed how subsequent citations with differing supplements translate into CSL `ibid` and `ibid-with-locator` positions [#6171]
-  - Fixed handling of `ibid` and `ibid-with-locator` positions in styles [typst/hayagriva#301]
-  - Fixed the `location` conditional in CSL styles for citations with no locator [typst/hayagriva#399]
-  - Fixed accesses of the year suffix resulting in wrong CSL renders [typst/hayagriva#400]
-  - Fixed regression where page variables were no longer supported in styles' `<number>` elements [typst/hayagriva#289]
-  - Fixed sorting and formatting of name parts [typst/hayagriva#287] [typst/hayagriva#313]
-  - Fixed year suffix collapsing [typst/hayagriva#367]
-  - Fixed delimiters in locale-specific date formatting [typst/hayagriva#385]
-  - Fixed rendering of date ordinals [typst/hayagriva#366]
-  - Fixed rendering and sorting of dates with BC years [typst/hayagriva#334] [typst/hayagriva#368]
-  - Fixed sorting for empty sort values [typst/hayagriva#390]
-
-## Text
-- The [`sub`] and [`super`] functions now use the `subs` and `sups` OpenType font features instead of special Unicode characters for typographic scripts, fixing semantical, sizing, and positioning issues [#5777]
-- The [`raw`] element
-  - Tweaked default syntax-highlighting color scheme of [`raw`] text to make the colors more accessible [#6754]
-  - JSON keys and string values now use different colors in the default `raw` syntax highlighting [theme]($raw.theme) [#6873]
-  - Fixed a crash when a `raw` [syntax]($raw.syntaxes) contains an unescaped trailing backslash [#6883]
-  - Fixed tab indentation in [`raw`] text with CRLF line terminators [#6961]
-- Translations
-  - Added term translations (a term being the "Section" in "Section 1") for many new languages by importing pre-existing translations from LaTeX packages [#6852]
-  - Added term translations for Indonesian [#6108], Latvian [#6348], Croatian [#6413], Lithuanian [#6587], French [#7010], French (Canada) [#7098], Galician [#7019], Dutch [#7026], Danish [#7031], Slovenian [#7032], Italian [#7050], Chinese [#7044], Spanish [#7051], and Irish (Gaeilge) [#7024]
-  - Improved term translations for Czech [#6101], Swedish [#6519], Galician [#7019], Dutch [#7026], Chinese [#7044], Spanish [#7051], Irish (Gaeilge) [#7024], and German [#7082]
-  - Improved smart quotes for French [#5976], Ukrainian [#6372], Russian [#6331], and Arabic [#6626]
-- An empty font list is not allowed anymore in [`text.font`] [#6049] **(Minor breaking change)**
-- Added a warning when using a variable font as those are not currently supported [#6425]
-- Fixed usage of the same font with different [coverage]($text.font) settings [#6604]
-- Fixed hyphens not showing up when hyphenating at specific positions (where invisible metadata exists) [#6807]
-- Fixed styling of repeated hyphens in languages with hyphen repetition [#6798]
-- Last resort font fallback does not consider default ignorable characters anymore during font selection [#6805]
-- Updated New Computer Modern fonts to version 7.0.4 [#6376]
-- Updated data and shaper to Unicode 16.0.0 [#5407]
-
-## Scripting
-- The `{in}` operator can now be used to check whether a definition is present in a module [#6498]
-- Added `default` parameter to [`array.first`], [`array.last`] [#5970], [`array.join`] [#6932], [`str.first`], and [`str.last`] [#6554] methods
-- Added `by` parameter to [`array.sorted`] for sorting with a comparison function [#5627]
-- Added [`str.normalize`] function for Unicode normalization [#5631]
-- Added [`from`]($direction.from), [`to`]($direction.to), and [`sign`]($direction.sign) methods to `direction` type [#5893]
-- [Labels]($label) cannot be empty anymore [#6332] **(Minor breaking change)**
-- The WebAssembly runtime used by the [`plugin`] system was updated and now supports SIMD [#6997]
-- Numberings and counters now use 64-bit numbers instead of platform-dependent numbers for consistency across platforms [#6026]
-- Improved consistency of how large numbers are handled in data loading functions [#6836]
-- The [`toml`] function is now guaranteed to return a [dictionary] and [`toml.encode`] must receive a dictionary (it already errored before when passed something else, but the new function signature makes the error clearer) [#6743]
-- Serialization of [`bytes`] in human-readable formats now uses [`repr`] [#6743]
-- Fixed slicing of last N elements of an array using the [`count`]($array.slice.count) parameter [#6838]
-- Fixed crash when the expression wrapped in a `{context}` expression is an anonymous function [#6975]
-- Fixed equality check between [`raw.line`] elements [#6560]
-- Fixed [`repr`] of [labels]($label) being potentially syntactically invalid [#6456]
-- Fixed [`repr`] of functions modified through [`with`]($function.with) [#6773]
-
-## Introspection
-- The following elements are newly locatable (i.e. they can be discovered with [`query`], [`locate`], etc. without having a label): `par`, `table`, `enum`, `list`, `terms`, `title`, `figure.caption`, `footnote.entry`, `outline.entry`, `image`, `emph`, `strong`, `link`, `cite`, `raw`, `underline`, `overline`, `strike`, and `highlight` [#6619]
-- Fixed issues with logical order in bidirectional text [#5887] [#6796]
-- Fixed logical order of cells in right-to-left [`grid`] [#6232]
-- Fixed logical order of elements in [`grid`] cells that span multiple pages [#7198]
-- Fixed logical order of metadata at the starts and ends of paragraphs [#6881] [#6909]
-- Fixed introspection [positions]($location.position) of inline elements at the very start of a paragraph (previously the Y position of an element at the very start would differ from one in the middle of the first line) [#6881]
-
-## Styling
-- Fixed rare infinite loop in show rule application [#6259]
-
-## Performance
-- Optimized incremental compilation with a new algorithm that, in particular, eliminates cases of very slow compilation with heavy context usage [#6683]
-
-## Command Line Interface
-- Added `typst info` subcommand for emitting build and environment information [#6761]
-- Added `typst completions` subcommand for retrieving shell completions [#6568]
-- Added `TYPST_IGNORE_SYSTEM_FONTS` environment variable [#6092]
-- Added `--ignore-embedded-fonts` flag and `TYPST_IGNORE_EMBEDDED_FONTS` environment variable for disabling the use of fonts embedded into the Typst binary [#7037]
-- Added `--no-pdf-tags` flag for disabling the automatic generation of accessibility tags. These are emitted when no particular standard like PDF/UA-1 is selected to provide a baseline of accessibility. [#6619]
-- Added `--target` parameter to `typst query` [#6405]
-- Added `--deps` and `--deps-format` parameters for emitting a list of files compilation depends on. Supports the three formats `json`, `zero`, and `make`. [#7022]
-- Deprecated the `--make-deps` flag in favor of `--deps` with `--deps-format make` [#7022]
-- On Linux, the font search will now fall back to known font directories if none were loaded via Fontconfig. [RazrFalcon/fontdb#71]
-- The CLI will now warn when trying to watch the standard input [#6381]
-- Fixed race condition when two separate Typst CLI processes concurrently try to install a package [#5979]
-- Fixed incremental SVG export not writing output SVGs on changes that only affect the page (e.g. changing `page.fill`) [#6810]
-- Fixed a rare potential crash when stack space couldn't be grown as expected [#6969]
-
-## Tooling and Diagnostics
-- Errors in many kinds of external text files (e.g., bibliographies, JSON files, etc.) are now annotated within these files instead of at the positions where the files are loaded from a Typst file [#6308]
-- Warnings originating from within [`eval`] are now correctly emitted [#6100]
-- Diagnostic messages and hints
-  - Improved error messages related to parsing of numbers [#5969]
-  - The error message for an unsuitable CSL style now mentions the name of the style [#6306]
-  - Added hints to various deprecated items with the removal timeline [#6617]
-  - Added hint for the error message when an X/Y pair is expected [#6476]
-  - Added hint for a label that appears in both the document and the bibliography [#6457]
-  - Added additional hint for show rule recursion depth error [#5856]
-  - Fixed inconsistent formatting of code points and strings in error messages [#6487]
-- Autocompletion
-  - Labels will now be deduplicated in completions [#6516]
-  - Math font autocompletions are now based on the presence of an OpenType MATH table instead of the word "Math" in the name [#6316]
-  - Autocompletion immediately after a comma in a parameter list is now supported for explicitly triggered completions (e.g. via Ctrl/Cmd+Space) [#6550]
-  - Citation style aliases are now displayed as autocompletions [#6696]
-  - Fixed autocompletion false positives with cursor after parameter list [#6475]
-  - Fixed autocompletion after partial identifier in math [#6415]
-  - Fixed which definitions are suggested in math [#6415]
-  - Fixed inapplicable method autocompletions being listed [#5824]
-- Tooltips
-  - Fixed tooltip for scoped functions (e.g. `calc.round`) [#6234]
-  - Fixed tooltip and details for figure references [#6580]
-  - Expression tooltips now use `×` instead of `x` to indicate a repeated value [#6163]
-- Fixed jump from click (jumping to the source panel with a click in the preview) in presence of transformations and clipping [#6037]
-
-## Symbols
-- Added many new symbols and variants; many more than could be listed here. View [the dedicated changelog](https://github.com/typst/codex/blob/v0.2.0/CHANGELOG.md#version-020-october-7-2025) for a full listing.
-- Code points that have a symbol and emoji presentation now have the correct variation selector attached depending on whether they appear in `sym` or `emoji`. That said, they still don't render consistently in Typst due to how font fallback works. [typst/codex#114]
-- The [`symbol`] function can now be used to create symbols that comprise not just one character, but one full grapheme cluster [#6489]
-
-## Deprecations
-- The name `pdf.embed` in favor of the new name [`pdf.attach`] [#6705]
-- The `{"chicago-fullnotes"}` bibliography style in favor of `{"chicago-notes"}` [#6920]
-- The `{"modern-humanities-research-association"}` bibliography style in favor of `{"modern-humanities-research-association-notes"}` [#6994]
-- The `--make-deps` CLI flag in favor of `--deps` with `--deps-format make` [#7022]
-- Various symbols, see the [deprecation section in the dedicated changelog](https://github.com/typst/codex/blob/v0.2.0/CHANGELOG.md#deprecated) for a full listing
-
-## Removals
-- Removed compatibility behavior of type/str comparisons (e.g. `{int == "integer"}`), which was temporarily introduced in Typst 0.8 and deprecated in Typst 0.13 **(Breaking change)**
-
-## Development
-- The `Default` impl for `Library` had to be removed for crate splitting and trait coherence reasons, but you can get a drop-in replacement via `use typst::LibraryExt` [#6576]
-- The `PdfOptions` struct has a new `tagged` field, which defaults to `{true}` [#6619] [#7046]
-- Fixed a potential panic in `World::font` implementations. Downstream `World` implementations might need to apply [the same fix](https://github.com/typst/typst/pull/6117). [#6117]
-- Increased minimum supported Rust version to 1.88 [#6637]
-- The Docker container now has the optional non-root user `typst` [#7058]
-
-## Contributors
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 <contributors from="v0.13.0" to="v0.14.0" />
diff --git a/docs/changelog/0.2.0.md b/docs/changelog/0.2.0.md
index c719383631..c1d8686195 100644
--- a/docs/changelog/0.2.0.md
+++ b/docs/changelog/0.2.0.md
@@ -16,13 +16,8 @@ description: Changes in Typst 0.2.0
 - Added [unpacking syntax]($scripting/#bindings) for let bindings, which allows
   things like `{let (1, 2) = array}`
 - Added [`enumerate`]($array.enumerate) method
-<<<<<<< HEAD
 - Added [`path`]($path) function for drawing Bézier paths
 - Added [`layout`]($layout) function to access the size of the surrounding page or
-=======
-- Added [`path`] function for drawing Bézier paths
-- Added [`layout`] function to access the size of the surrounding page or
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
   container
 - Added `key` parameter to [`sorted`]($array.sorted) method
 
@@ -38,11 +33,7 @@ description: Changes in Typst 0.2.0
 - Added basic i18n for a few more languages (AR, NB, CS, NN, PL, SL, ES, UA, VI)
 - Added a few numbering patterns (Ihora, Chinese)
 - Added `sinc` [operator]($math.op)
-<<<<<<< HEAD
 - Fixed bug where math could not be hidden with [`hide`]($hide)
-=======
-- Fixed bug where math could not be hidden with [`hide`]
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 - Fixed sizing issues with box, block, and shapes
 - Fixed some translations
 - Fixed inversion of "R" in [`cal`]($math.cal) and [`frak`]($math.frak) styles
@@ -50,11 +41,7 @@ description: Changes in Typst 0.2.0
 - Fixed supplements of references to headings
 - Fixed syntax highlighting of identifiers in certain scenarios
 - [Ratios]($ratio) can now be multiplied with more types and be converted to
-<<<<<<< HEAD
   [floats]($float) with the [`float`]($float) function
-=======
-  [floats]($float) with the [`float`] function
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 
 ## Contributors
 <contributors from="v0.1.0" to="v0.2.0" />
diff --git a/docs/changelog/0.3.0.md b/docs/changelog/0.3.0.md
index fc20a65d28..291e842d65 100644
--- a/docs/changelog/0.3.0.md
+++ b/docs/changelog/0.3.0.md
@@ -12,11 +12,7 @@ description: Changes in Typst 0.3.0
   It will remain available as `mod` until the next update as a grace period.
 - A lone underscore is not a valid identifier anymore, it can now only be used
   in patterns
-<<<<<<< HEAD
 - Removed `before` and `after` arguments from [`query`]($query). This is now handled
-=======
-- Removed `before` and `after` arguments from [`query`]. This is now handled
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
   through flexible [selectors]($selector) combinator methods
 - Added support for [attachments]($math.attach) (sub-, superscripts) that
   precede the base symbol. The `top` and `bottom` arguments have been renamed to
@@ -29,11 +25,7 @@ description: Changes in Typst 0.3.0
 - Added support for [destructuring]($scripting/#bindings) in argument lists and
   assignments
 - Added [`alt`]($image.alt) text argument to image function
-<<<<<<< HEAD
 - Added [`toml`]($toml) function for loading data from a TOML file
-=======
-- Added [`toml`] function for loading data from a TOML file
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 - Added [`zip`]($array.zip), [`sum`]($array.sum), and
   [`product`]($array.product) methods for arrays
 - Added `fact`, `perm`, `binom`, `gcd`, `lcm`, `atan2`, `quo`, `trunc`, and
@@ -48,11 +40,7 @@ description: Changes in Typst 0.3.0
 - Locations are now a valid kind of selector
 - Added a few symbols for algebra
 - Added Spanish smart quote support
-<<<<<<< HEAD
 - Added [`selector`]($selector) function to turn a selector-like value into a selector on
-=======
-- Added [`selector`] function to turn a selector-like value into a selector on
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
   which combinator methods can be called
 - Improved some error messages
 - The outline and bibliography headings can now be styled with show-set rules
diff --git a/docs/changelog/0.4.0.md b/docs/changelog/0.4.0.md
index 1bbc71cb4a..378f65f4d8 100644
--- a/docs/changelog/0.4.0.md
+++ b/docs/changelog/0.4.0.md
@@ -3,20 +3,13 @@ title: 0.4.0
 description: Changes in Typst 0.4.0
 ---
 
-<<<<<<< HEAD
 <!-- textlint-disable ja-technical-writing/no-unmatched-pair -->
 
-=======
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 # Version 0.4.0 (May 20, 2023)
 
 ## Footnotes
 - Implemented support for footnotes
-<<<<<<< HEAD
 - The [`footnote`]($footnote) function inserts a footnote
-=======
-- The [`footnote`] function inserts a footnote
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 - The [`footnote.entry`]($footnote.entry) function can be used to customize the
   footnote listing
 - The `{"chicago-notes"}` [citation style]($cite.style) is now available
@@ -26,11 +19,7 @@ description: Changes in Typst 0.4.0
 - Now shows default values for optional arguments
 - Added richer outlines in "On this Page"
 - Added initial support for search keywords: "Table of Contents" will now find
-<<<<<<< HEAD
   the [outline]($outline) function. Suggestions for more keywords are welcome!
-=======
-  the [outline] function. Suggestions for more keywords are welcome!
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 - Fixed issue with search result ranking
 - Fixed many more small issues
 
@@ -52,11 +41,7 @@ description: Changes in Typst 0.4.0
 ## Scripting
 - Added function scopes: A function can now hold related definitions in its own
   scope, similar to a module. The new [`assert.eq`]($assert.eq) function, for
-<<<<<<< HEAD
   instance, is part of the [`assert`]($assert) function's scope. Note that function
-=======
-  instance, is part of the [`assert`] function's scope. Note that function
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
   scopes are currently only available for built-in functions.
 - Added [`assert.eq`]($assert.eq) and [`assert.ne`]($assert.ne) functions for
   simpler equality and inequality assertions with more helpful error messages
diff --git a/docs/changelog/0.5.0.md b/docs/changelog/0.5.0.md
index 1c46bade60..81eb972fc0 100644
--- a/docs/changelog/0.5.0.md
+++ b/docs/changelog/0.5.0.md
@@ -3,7 +3,6 @@ title: 0.5.0
 description: Changes in Typst 0.5.0
 ---
 
-<<<<<<< HEAD
 <!-- textlint-disable ja-technical-writing/no-unmatched-pair -->
 
 # Version 0.5.0 (June 9, 2023)
@@ -11,13 +10,6 @@ description: Changes in Typst 0.5.0
 ## Text and Layout
 - Added [`raw`]($raw) syntax highlighting for many more languages
 - Added support for Korean [numbering]($numbering)
-=======
-# Version 0.5.0 (June 9, 2023)
-
-## Text and Layout
-- Added [`raw`] syntax highlighting for many more languages
-- Added support for Korean [numbering]
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 - Added basic i18n for a few more languages (NL, SV, DA)
 - Improved line breaking for East Asian languages
 - Expanded functionality of outline [`indent`]($outline.indent) property
@@ -26,11 +18,7 @@ description: Changes in Typst 0.5.0
 - Fixed bug with handling of footnotes in lists, tables, and figures
 - Fixed a bug with CJK punctuation adjustment
 - Fixed a crash with rounded rectangles
-<<<<<<< HEAD
 - Fixed alignment of [`line`]($line) elements
-=======
-- Fixed alignment of [`line`] elements
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 
 ## Math
 - **Breaking change:** The syntax rules for mathematical
@@ -47,20 +35,12 @@ description: Changes in Typst 0.5.0
 - Fixed a crash in the [`attach`]($math.attach) function
 
 ## Scripting
-<<<<<<< HEAD
 - Added new [`datetime`]($datetime) type and [`datetime.today`]($datetime.today) to
-=======
-- Added new [`datetime`] type and [`datetime.today`]($datetime.today) to
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
   retrieve the current date
 - Added [`str.from-unicode`]($str.from-unicode) and
   [`str.to-unicode`]($str.to-unicode) functions
 - Added [`fields`]($content.fields) method on content
-<<<<<<< HEAD
 - Added `base` parameter to [`str`]($str) function
-=======
-- Added `base` parameter to [`str`] function
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 - Added [`calc.exp`]($calc.exp) and [`calc.ln`]($calc.ln)
 - Improved accuracy of [`calc.pow`]($calc.pow) and [`calc.log`]($calc.log) for
   specific bases
@@ -82,11 +62,7 @@ description: Changes in Typst 0.5.0
 - Improved error message for failed length comparisons
 - Fixed a bug with images not showing up in Apple Preview
 - Fixed multiple bugs with the PDF outline
-<<<<<<< HEAD
 - Fixed citations and other searchable elements in [`hide`]($hide)
-=======
-- Fixed citations and other searchable elements in [`hide`]
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 - Fixed bugs with [reference supplements]($ref.supplement)
 - Fixed Nix flake
 
diff --git a/docs/changelog/0.6.0.md b/docs/changelog/0.6.0.md
index f227cb4ea9..86fc5e90cb 100644
--- a/docs/changelog/0.6.0.md
+++ b/docs/changelog/0.6.0.md
@@ -51,17 +51,10 @@ description: Changes in Typst 0.6.0
 - Added [`outline.entry`]($outline.entry) to customize outline entries with show
   rules
 - Added some hints for error messages
-<<<<<<< HEAD
 - Added some missing syntaxes for [`raw`]($raw) highlighting
 - Improved rendering of rotated images in PNG export and web app
 - Made [footnotes]($footnote) reusable and referenceable
 - Fixed bug with citations and bibliographies in [`locate`]($locate)
-=======
-- Added some missing syntaxes for [`raw`] highlighting
-- Improved rendering of rotated images in PNG export and web app
-- Made [footnotes]($footnote) reusable and referenceable
-- Fixed bug with citations and bibliographies in [`locate`]
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 - Fixed inconsistent tense in documentation
 
 ## Development
diff --git a/docs/changelog/0.7.0.md b/docs/changelog/0.7.0.md
index f6a8a962cb..9d00a7421e 100644
--- a/docs/changelog/0.7.0.md
+++ b/docs/changelog/0.7.0.md
@@ -77,28 +77,16 @@ description: Changes in Typst 0.7.0
   - Added `inv` method to [2d alignments]($align.alignment)
   - Added `start` argument to [`enumerate`]($array.enumerate) method on arrays
 - Added [`color.mix`]($color.mix) function
-<<<<<<< HEAD
 - Added `mode` and `scope` arguments to [`eval`]($eval) function
 - Added [`bytes`]($bytes) type for holding large byte buffers
-=======
-- Added `mode` and `scope` arguments to [`eval`] function
-- Added [`bytes`] type for holding large byte buffers
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
   - Added [`encoding`]($read.encoding) argument to read function to read a file
     as bytes instead of a string
   - Added [`image.decode`]($image.decode) function for decoding an image
     directly from a string or bytes
-<<<<<<< HEAD
   - Added [`bytes`]($bytes) function for converting a string or an array of integers to
     bytes
   - Added [`array`]($array) function for converting bytes to an array of integers
   - Added support for converting bytes to a string with the [`str`]($str) function
-=======
-  - Added [`bytes`] function for converting a string or an array of integers to
-    bytes
-  - Added [`array`] function for converting bytes to an array of integers
-  - Added support for converting bytes to a string with the [`str`] function
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 
 ## Tooling and Diagnostics
 - Added support for compiler warnings
@@ -133,25 +121,15 @@ description: Changes in Typst 0.7.0
   whether a heading becomes part of the PDF outline
 - Added [`caption-pos`]($figure.caption.position) argument to control the
   position of a figure's caption
-<<<<<<< HEAD
 - Added [`metadata`]($metadata) function for exposing an arbitrary value to the
   introspection system
 - Fixed that a [`state`]($state) was identified by the pair `(key, init)` instead of
-=======
-- Added [`metadata`] function for exposing an arbitrary value to the
-  introspection system
-- Fixed that a [`state`] was identified by the pair `(key, init)` instead of
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
   just its `key`
 - Improved indent logic of [enumerations]($enum). Instead of requiring at least
   as much indent as the end of the marker, they now require only one more space
   indent than the start of the marker. As a result, even long markers like `12.`
   work with just 2 spaces of indent.
-<<<<<<< HEAD
 - Fixed bug with indent logic of [`raw`]($raw) blocks
-=======
-- Fixed bug with indent logic of [`raw`] blocks
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 - Fixed a parsing bug with dictionaries
 
 ## Development
diff --git a/docs/changelog/0.8.0.md b/docs/changelog/0.8.0.md
index 59fa92a2a3..630beeed02 100644
--- a/docs/changelog/0.8.0.md
+++ b/docs/changelog/0.8.0.md
@@ -3,11 +3,8 @@ title: 0.8.0
 description: Changes in Typst 0.8.0
 ---
 
-<<<<<<< HEAD
 <!-- textlint-disable ja-technical-writing/no-unmatched-pair -->
 
-=======
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 # Version 0.8.0 (September 13, 2023)
 
 ## Scripting
@@ -19,15 +16,9 @@ description: Changes in Typst 0.8.0
   - Plugins can be shipped as part of [packages]($scripting/#packages)
   - Plugins work just the same in the web app
 - Types are now first-class values **(Breaking change)**
-<<<<<<< HEAD
   - A [type]($type) is now itself a value
   - Some types can be called like functions (those that have a constructor),
     e.g. [`int`]($int) and [`str`]($str)
-=======
-  - A [type] is now itself a value
-  - Some types can be called like functions (those that have a constructor),
-    e.g. [`int`] and [`str`]
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
   - Type checks are now of the form `{type(10) == int}` instead of the old
     `{type(10) == "integer"}`. [Compatibility]($type/#compatibility) with the
     old way will remain for a while to give package authors time to upgrade, but
@@ -35,11 +26,7 @@ description: Changes in Typst 0.8.0
   - Methods are now syntax sugar for calling a function scoped to a type,
     meaning that `{"hello".len()}` is equivalent to `{str.len("hello")}`
 - Added support for [`import`]($scripting/#modules) renaming with `as`
-<<<<<<< HEAD
 - Added a [`duration`]($duration) type
-=======
-- Added a [`duration`] type
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 - Added support for [CBOR]($cbor) encoding and decoding
 - Added encoding and decoding functions from and to bytes for data formats:
   [`json.decode`]($json.decode), [`json.encode`]($json.encode), and similar
@@ -47,15 +34,9 @@ description: Changes in Typst 0.8.0
 - Added [`array.intersperse`]($array.intersperse) function
 - Added [`str.rev`]($str.rev) function
 - Added `calc.tau` constant
-<<<<<<< HEAD
 - Made [bytes]($bytes) joinable and addable
 - Made [`array.zip`]($array.zip) function variadic
 - Fixed bug with [`eval`](#eval) when the `mode` was set to `{"math"}`
-=======
-- Made [bytes] joinable and addable
-- Made [`array.zip`]($array.zip) function variadic
-- Fixed bug with [`eval`] when the `mode` was set to `{"math"}`
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 - Fixed bug with [`ends-with`]($str.ends-with) function on strings
 - Fixed bug with destructuring in combination with break, continue, and return
 - Fixed argument types of [hyperbolic functions]($calc.cosh), they don't allow
@@ -70,17 +51,10 @@ description: Changes in Typst 0.8.0
   [page numbering]($page.numbering) style in the PDF
 
 ## Text and Layout
-<<<<<<< HEAD
 - Added [`highlight`]($highlight) function for highlighting text with a background color
 - Added [`polygon.regular`]($polygon.regular) function for drawing a regular
   polygon
 - Added support for tabs in [`raw`]($raw) elements alongside
-=======
-- Added [`highlight`] function for highlighting text with a background color
-- Added [`polygon.regular`]($polygon.regular) function for drawing a regular
-  polygon
-- Added support for tabs in [`raw`] elements alongside
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
   [`tab-width`]($raw.tab-size) parameter
 - The layout engine now tries to prevent "runts" (final lines consisting of just
   a single word)
diff --git a/docs/changelog/0.9.0.md b/docs/changelog/0.9.0.md
index 09aa33089b..07c1551a68 100644
--- a/docs/changelog/0.9.0.md
+++ b/docs/changelog/0.9.0.md
@@ -12,19 +12,11 @@ description: Changes in Typst 0.9.0
 - Added new [`form`]($cite.form) argument to the `cite` function to produce
   different forms of citations (e.g. for producing a citation suitable for
   inclusion in prose)
-<<<<<<< HEAD
 - The [`cite`]($cite) function now takes only a single label/key instead of allowing
   multiple. Adjacent citations are merged and formatted according to the
   citation style's rules automatically. This works both with the reference
   syntax and explicit calls to the `cite` function. **(Breaking change)**
 - The `cite` function now takes a [label]($label) instead of a string
-=======
-- The [`cite`] function now takes only a single label/key instead of allowing
-  multiple. Adjacent citations are merged and formatted according to the
-  citation style's rules automatically. This works both with the reference
-  syntax and explicit calls to the `cite` function. **(Breaking change)**
-- The `cite` function now takes a [label] instead of a string
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
   **(Breaking change)**
 - Added [`full`]($bibliography.full) argument to bibliography function to print
   the full bibliography even if not all works were cited
@@ -54,11 +46,7 @@ description: Changes in Typst 0.9.0
   stroke widths
 - Added support for properly clipping [boxes]($box.clip) and
   [blocks]($block.clip) with a border radius
-<<<<<<< HEAD
 - Added `background` parameter to [`overline`]($overline), [`underline`]($underline), and [`strike`]($strike)
-=======
-- Added `background` parameter to [`overline`], [`underline`], and [`strike`]
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
   functions
 - Fixed inaccurate color embedding in PDFs
 - Fixed ICC profile handling for images embedded in PDFs
@@ -68,11 +56,7 @@ description: Changes in Typst 0.9.0
   [spacing]($text.cjk-latin-spacing) between CJK and Latin text (enabled by
   default)
 - Added support for automatic adjustment of more CJK punctuation
-<<<<<<< HEAD
 - Added [`quote`]($quote) element for inserting inline and block quotes with optional
-=======
-- Added [`quote`] element for inserting inline and block quotes with optional
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
   attributions
 - Added [`raw.line`]($raw.line) element for customizing the display of
   individual lines of raw text, e.g. to add line numbers while keeping proper
@@ -101,13 +85,8 @@ description: Changes in Typst 0.9.0
 - Fixed spacing around [placed]($place) elements
 - Fixed coalescing of [`above`]($block.above) and [`below`]($block.below)
   spacing if given in em units and the font sizes differ
-<<<<<<< HEAD
 - Fixed handling of `extent` parameter of [`underline`]($underline), [`overline`]($overline), and
   [`strike`]($strike) functions
-=======
-- Fixed handling of `extent` parameter of [`underline`], [`overline`], and
-  [`strike`] functions
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 - Fixed crash for [floating placed elements]($place.float) with no specified
   vertical alignment
 - Partially fixed a bug with citations in footnotes
@@ -182,17 +161,10 @@ description: Changes in Typst 0.9.0
   PNG or SVG export
 
 ## Miscellaneous Improvements
-<<<<<<< HEAD
 - Added [`version`]($version) type and `sys.version` constant specifying the current
   compiler version. Can be used to gracefully support multiple versions.
 - The U+2212 MINUS SIGN is now used when displaying a numeric value, in the
   [`repr`]($repr) of any numeric value and to replace a normal hyphen in text mode when
-=======
-- Added [`version`] type and `sys.version` constant specifying the current
-  compiler version. Can be used to gracefully support multiple versions.
-- The U+2212 MINUS SIGN is now used when displaying a numeric value, in the
-  [`repr`] of any numeric value and to replace a normal hyphen in text mode when
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
   before a digit. This improves, in particular, how negative integer values are
   displayed in math mode.
 - Added support for specifying a default value instead of failing for `remove`
diff --git a/docs/changelog/earlier.md b/docs/changelog/earlier.md
index 2eaac4f3c4..3f915da058 100644
--- a/docs/changelog/earlier.md
+++ b/docs/changelog/earlier.md
@@ -1,5 +1,4 @@
 ---
-<<<<<<< HEAD
 title: 初期バージョン
 description: Typstの初期バージョンにおける変更点
 ---
@@ -7,13 +6,6 @@ description: Typstの初期バージョンにおける変更点
 <!-- textlint-disable ja-technical-writing/no-unmatched-pair -->
 
 # Typstの初期バージョンにおける変更点
-=======
-title: Earlier
-description: Changes in early, unversioned Typst
----
-
-# Changes in early, unversioned Typst
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 
 ## March 28, 2023
 - **Breaking changes:**
@@ -36,11 +28,7 @@ description: Changes in early, unversioned Typst
   - Numberings now allow zeros. To reset a counter, you can write
     `[#counter(..).update(0)]`
   - Added documentation for `{page()}` and `{position()}` methods on
-<<<<<<< HEAD
     [`location`]($location) type
-=======
-    [`location`] type
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
   - Added symbols for double, triple, and quadruple dot accent
   - Added smart quotes for Norwegian Bokmål
   - Added Nix flake
@@ -49,11 +37,7 @@ description: Changes in early, unversioned Typst
   - Fixed parsing of unbalanced delimiters in fractions: `[$1/(2 (x)$]`
   - Fixed unexpected parsing of numbers as enumerations, e.g. in `[1.2]`
   - Fixed combination of page fill and header
-<<<<<<< HEAD
   - Fixed compiler crash if [`repeat`]($repeat) is used in page with automatic width
-=======
-  - Fixed compiler crash if [`repeat`] is used in page with automatic width
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
   - Fixed [matrices]($math.mat) with explicit delimiter
   - Fixed [`indent`]($terms.indent) property of term lists
   - Numerous documentation fixes
@@ -73,53 +57,33 @@ description: Changes in early, unversioned Typst
     - `[$ A = pi r^2 $ <area>]`
 
 - Introspection system for interactions between different parts of the document
-<<<<<<< HEAD
   - [`counter`]($counter) function
-=======
-  - [`counter`] function
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     - Access and modify counters for pages, headings, figures, and equations
     - Define and use your own custom counters
     - Time travel: Find out what the counter value was or will be at some other
       point in the document (e.g. when you're building a list of figures, you
       can determine the value of the figure counter at any given figure).
     - Counters count in layout order and not in code order
-<<<<<<< HEAD
   - [`state`]($state) function
-=======
-  - [`state`] function
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     - Manage arbitrary state across your document
     - Time travel: Find out the value of your state at any position in the
       document
     - State is modified in layout order and not in code order
-<<<<<<< HEAD
   - [`query`]($query) function
-=======
-  - [`query`] function
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     - Find all occurrences of an element or a label, either in the whole
       document or before/after some location
     - Link to elements, find out their position on the pages and access their
       fields
     - Example use cases: Custom list of figures or page header with current
       chapter title
-<<<<<<< HEAD
   - [`locate`]($locate) function
-=======
-  - [`locate`] function
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     - Determines the location of itself in the final layout
     - Can be accessed to get the `page` and `x`, `y` coordinates
     - Can be used with counters and state to find out their values at that
       location
     - Can be used with queries to find elements before or after its location
 
-<<<<<<< HEAD
 - New [`measure`]($measure) function
-=======
-- New [`measure`] function
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
   - Measure the layouted size of elements
   - To be used in combination with the new `style` function that lets you
     generate different content based on the style context something is inserted
@@ -129,33 +93,21 @@ description: Changes in early, unversioned Typst
   - Content is not opaque anymore
   - Content can be compared for equality
   - The tree of content elements can be traversed with code
-<<<<<<< HEAD
   - Can be observed in hover tooltips or with [`repr`]($repr)
-=======
-  - Can be observed in hover tooltips or with [`repr`]
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
   - New [methods]($content) on content: `func`, `has`, `at`, and `location`
   - All optional fields on elements are now settable
   - More uniform field names (`heading.title` becomes `heading.body`,
     `list.items` becomes `list.children`, and a few more changes)
 
 - Further improvements
-<<<<<<< HEAD
   - Added [`figure`]($figure) function
-=======
-  - Added [`figure`] function
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
   - Added [`numbering`]($math.equation.numbering) parameter on equation function
   - Added [`numbering`]($page.numbering) and
     [`number-align`]($page.number-align) parameters on page function
   - The page function's [`header`]($page.header) and [`footer`]($page.footer)
     parameters do not take functions anymore. If you want to customize them
     based on the page number, use the new [`numbering`]($page.numbering)
-<<<<<<< HEAD
     parameter or [`counter`]($counter) function instead.
-=======
-    parameter or [`counter`] function instead.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
   - Added [`footer-descent`]($page.footer-descent) and
     [`header-ascent`]($page.header-ascent) parameters
   - Better default alignment in header and footer
@@ -167,11 +119,7 @@ description: Changes in early, unversioned Typst
   - Renamed paragraph `indent` to [`first-line-indent`]($par.first-line-indent)
   - More accurate [logarithm]($calc.log) when base is `2` or `10`
   - Improved some error messages
-<<<<<<< HEAD
   - Fixed layout of [`terms`]($terms) list
-=======
-  - Fixed layout of [`terms`] list
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 
 - Web app improvements
   - Added template gallery
@@ -198,15 +146,9 @@ description: Changes in early, unversioned Typst
   - Lots of new math fonts available
   - Removed Latin Modern fonts in favor of New Computer Modern family
   - Removed unnecessary smallcaps fonts which are already accessible through the
-<<<<<<< HEAD
     corresponding main font and the [`smallcaps`]($smallcaps) function
 - Improved default spacing for headings
 - Added [`panic`]($panic) function
-=======
-    corresponding main font and the [`smallcaps`] function
-- Improved default spacing for headings
-- Added [`panic`] function
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 - Added [`clusters`]($str.clusters) and [`codepoints`]($str.codepoints) methods
   for strings
 - Support for multiple authors in [`set document`]($document.author)
@@ -219,22 +161,14 @@ description: Changes in early, unversioned Typst
 - Improved incremental compilation for user-defined functions
 
 ## February 15, 2023
-<<<<<<< HEAD
 - [Box]($box) and [block]($block) have gained `fill`, `stroke`, `radius`, and `inset`
-=======
-- [Box]($box) and [block] have gained `fill`, `stroke`, `radius`, and `inset`
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
   properties
 - Blocks may now be explicitly sized, fixed-height blocks can still break across
   pages
 - Blocks can now be configured to be [`breakable`]($block.breakable) or not
 - [Numbering style]($enum.numbering) can now be configured for nested enums
 - [Markers]($list.marker) can now be configured for nested lists
-<<<<<<< HEAD
 - The [`eval`]($eval) function now expects code instead of markup and returns an
-=======
-- The [`eval`] function now expects code instead of markup and returns an
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
   arbitrary value. Markup can still be evaluated by surrounding the string with
   brackets.
 - PDFs generated by Typst now contain XMP metadata
@@ -244,11 +178,7 @@ description: Changes in early, unversioned Typst
 
 ## February 12, 2023
 - Shapes, images, and transformations (move/rotate/scale/repeat) are now
-<<<<<<< HEAD
   block-level. To integrate them into a paragraph, use a [`box`]($box) as with other
-=======
-  block-level. To integrate them into a paragraph, use a [`box`] as with other
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
   elements.
 - A colon is now required in an "everything" show rule: Write `{show: it => ..}`
   instead of `{show it => ..}`. This prevents intermediate states that ruin your
@@ -262,22 +192,14 @@ description: Changes in early, unversioned Typst
 - Fixed bug where columns jump to next page
 - Fixed bug where list items have no leading
 - Fixed relative sizing in lists, squares and grid auto columns
-<<<<<<< HEAD
 - Fixed relative displacement in [`place`]($place) function
-=======
-- Fixed relative displacement in [`place`] function
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 - Fixed that lines don't have a size
 - Fixed bug where `{set document(..)}` complains about being after content
 - Fixed parsing of `{not in}` operation
 - Fixed hover tooltips in math
 - Fixed bug where a heading show rule may not contain a pagebreak when an
   outline is present
-<<<<<<< HEAD
 - Added [`baseline`]($box.baseline) property on [`box`]($box)
-=======
-- Added [`baseline`]($box.baseline) property on [`box`]
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 - Added [`tg`]($math.op) and [`ctg`]($math.op) operators in math
 - Added delimiter setting for [`cases`]($math.cases) function
 - Parentheses are now included when accepting a function autocompletion
diff --git a/docs/changelog/welcome.md b/docs/changelog/welcome.md
index 5c2b8dea96..befefbfc64 100644
--- a/docs/changelog/welcome.md
+++ b/docs/changelog/welcome.md
@@ -1,26 +1,13 @@
 ---
 description: |
-<<<<<<< HEAD
   最新のTypstリリースで追加された新機能を確認し、あなたのドキュメントをさらに進化させましょう。
 ---
 
 # 変更履歴
 最新のTypstリリースで追加された新機能を確認し、あなたのドキュメントをさらに進化させましょう。本セクションでは、Typstの最初の一般公開リリース以降に行われた全ての変更内容を記録しています。
 
-## Versions
-=======
-  Learn what has changed in the latest Typst releases and move your documents
-  forward.
----
-
-# Changelog
-Learn what has changed in the latest Typst releases and move your documents
-forward. This section documents all changes to Typst since its initial public
-release.
-
 ## Versions
 - [Typst 0.14.1]($changelog/0.14.1)
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 - [Typst 0.14.0]($changelog/0.14.0)
 - [Typst 0.13.1]($changelog/0.13.1)
 - [Typst 0.13.0]($changelog/0.13.0)
@@ -37,8 +24,4 @@ release.
 - [Typst 0.3.0]($changelog/0.3.0)
 - [Typst 0.2.0]($changelog/0.2.0)
 - [Typst 0.1.0]($changelog/0.1.0)
-<<<<<<< HEAD
 - [初期バージョン]($changelog/earlier)
-=======
-- [Earlier]($changelog/earlier)
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
diff --git a/docs/guides/accessibility.md b/docs/guides/accessibility.md
index 51b2a490dd..2c65f4f3f8 100644
--- a/docs/guides/accessibility.md
+++ b/docs/guides/accessibility.md
@@ -1,6 +1,5 @@
 ---
 description: |
-<<<<<<< HEAD
   Typstを使ってアクセシブルな文書を作成する方法を学びます。このガイドでは、セマンティックマークアップ、読み上げ順序、代替テキスト、色のコントラスト、言語設定、PDF/UA準拠などをカバーし、全ての読者と支援技術に対応するファイルを作成する方法を説明します。
 ---
 
@@ -33,40 +32,6 @@ Typstは、スクリーンリーダーで読み取りやすく、異なる画面
 ATによる利用や再利用のために正しいセマンティック情報をファイルに付与するためには、ファイル中の各部分がどのようなセマンティック上の役割を果たすのかをTypstは把握する必要があります。例えば、これはコンパイルされたPDFの見出しが単なる大きく太い文字のテキストであってはならないということを意味します。代わりに、その特定のテキストが見出しを構成することを示す明示的な情報（_タグ_として知られます）を含めるべきです。そうするとスクリーンリーダーはそれを見出しとして読み上げ、ユーザーが見出し間を移動できるようになります。
 
 Typstの慣用的な使い方、すなわち組み込みのマークアップや要素を用いている場合、Typstは自動的にリッチなセマンティック情報を持つタグをファイルへ付与します。次の2つのコード例を見てみましょう。
-=======
-  Learn how to create accessible documents with Typst. This guide covers semantic markup, reading order, alt text, color contrast, language settings, and PDF/UA compliance to ensure your files work for all readers and Assistive Technology.
----
-
-# Accessibility Guide
-
-Making a document accessible means that it can be used and understood by everyone. That not only includes people with permanent or temporary disabilities, but also those with different devices or preferences. To underscore why accessibility is important, consider that people might read your document in more contexts than you expected:
-
-- A user may print the document on paper
-- A user may read your document on a phone, with reflow in their PDF reader enabled
-- A user may have their computer read the document back to them
-- A user may ask artificial intelligence to summarize your document for them
-- A user may convert your document to another file format like HTML that is more accessible to them
-
-To accommodate all of these people and scenarios, you should design your document for **Universal Access.** Universal Access is a simple but powerful principle: instead of retrofitting a project for accessibility after the fact, design from the beginning to work for the broadest possible range of people and situations. This will improve the experience for all readers!
-
-Typst can help you to create accessible files that read well on screen readers, look good even when reflowed for a different screen size, and pass automated accessibility checkers. However, to create accessible files, you will have to keep some rules in mind. This guide will help you learn what issues impact accessibility, how to design for Universal Access, and what tools Typst gives you to accomplish this. Much of the guidance here applies to all export targets, but the guide focuses on PDF export. Notable differences to HTML export are called out.
-
-## Basics of Accessibility { #basics }
-
-Accessible files allow software to do more with them than to just render them. Instead, your computer can understand what each part of the document is supposed to represent and use this information to present the document to the user.
-
-This information is consumed by different software to provide access. When exporting a PDF from Typst, the _PDF viewer_ (sometimes also called a reader) will display the document's pages just as you designed them with Typst's preview. Some people rely on _Assistive Technology_ (AT) such as screen readers, braille displays, screen magnifiers, and more for consuming PDF files. In that case, the semantic information in the file is used to adapt the contents of a file into spoken or written text, or into a different visual representation. Other users will make the PDF viewer reflow the file to create a layout similar to a web page: The content will fit the viewport's width and scroll continuously. Finally, some users will repurpose the PDF into another format, for example plain text for ingestion into a Large Language Model (LLM) or HTML. A special form of repurposing is copy and paste where users use the clipboard to extract content from a file to use it in another application.
-
-Accessibility support differs based on viewer and AT. Some combinations work better than others. In our testing, [Adobe Acrobat][Acrobat] paired with [NVDA][NVDA] on Windows and [VoiceOver][VoiceOver] on macOS provided the richest accessibility support. Paired with HTML export, browsers provide a more consistent baseline of accessibility when compared to PDF readers.
-
-Only PDF and HTML export produce accessible files. Neither PNGs nor SVGs are accessible on their own. Both formats can be used in an accessible larger work by providing a [textual representation](#textual-representations).
-
-## Maintaining semantics
-
-To add correct semantic information for AT and repurposing to a file, Typst needs to know what semantic role each part of the file plays. For example, this means that a heading in a compiled PDF should not just be text that is large and bold. Instead, the file should contain the explicit information (known as a _tag_) that a particular text makes up a heading. A screen reader will then announce it as a heading and allow the user to navigate between headings.
-
-If you are using Typst idiomatically, using the built-in markup and elements, Typst automatically adds tags with rich semantic information to your files. Let's take a look at two code examples:
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 
 ```example
 // ❌ Don't do this
@@ -82,7 +47,6 @@ If you are using Typst idiomatically, using the built-in markup and elements, Ty
 = Heading
 ```
 
-<<<<<<< HEAD
 どちらの例も、見た目は同じです。どちらも"Heading"というテキストが太字で、サイズは16ptになっています。しかしながら、アクセシブルなのは例のうち2つ目のみです。見出し用のマークアップを使うことで、Typstはこのテキストのセマンティックな意味が「見出し」であることを理解し、その情報を最終的なPDFに反映できます。1つ目の例では、Typstは通常のテキストに対して太字と大きめの文字を適用すべきだということしかわかりません。そのため、それが見出しを意図したものなのか、スタイル上の選択なのか、あるいは引用のような別の要素なのかを推測できません。
 
 セマンティクスの利用は見出しに限りません。以下はセマンティクスを利用すべき要素のさらなる例です。
@@ -96,21 +60,6 @@ If you are using Typst idiomatically, using the built-in markup and elements, Ty
 - キャプションを提供する場合は、テキストを関数呼び出しの下に追加するのではなく、[`figure`要素の`caption`引数]($figure.caption)を使用する
 
 要素のデフォルトのスタイルを調整したい時であっても、独自のカスタム関数で置き換えるのではなく、[setルール]($styling/#set-rules)、show-setルール、そして[showルール]($styling/#show-rules)を使用して外観をカスタマイズしてください。以下は、文書内の強い強調の見た目を変更する方法の例です。
-=======
-Both of these examples look the same. They both contain the text "Heading" in boldface, sized at 16 point. However, only the second example is accessible. By using the heading markup, Typst knows that the semantic meaning of this text is that of a heading and can propagate that information to the final PDF. In the first example, it just knows that it should use boldface and larger type on otherwise normal text and cannot make the assumption that you meant that to be a heading and not a stylistic choice or some other element like a quote.
-
-Using semantics is not limited to headings. Here are a few more examples for elements you should use:
-
-- Use underscores / [`emph`] instead of the [`text`] function to make text emphasized
-- Use stars / [`strong`] instead of the text function to make text carry strong emphasis
-- Use lists ([`list`], [`enum`], [`terms`]) instead of normal text with newlines when working with itemized or ordered content
-- Use [`quote`] for inline and block quotes
-- Use the built-in [`bibliography`] and [`cite`] functions instead of manually printing a bibliography
-- Use labels and [`ref`] or `@references` to reference other parts of your documents instead of just typing out a reference
-- Use the [`caption` argument of the `figure` element]($figure.caption) to provide captions instead of adding them as text below the function call
-
-If you want to style the default appearance of an element, do not replace it with your own custom function. Instead, use [set]($styling/#set-rules), show-set, and [show rules]($styling/#show-rules) to customize its appearance. Here is an example on how you can change how strong emphasis looks in your document:
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 
 ```example
 // Change how text inside of strong emphasis looks
@@ -119,7 +68,6 @@ If you want to style the default appearance of an element, do not replace it wit
 When setting up your tents, *never forget* to secure the pegs.
 ```
 
-<<<<<<< HEAD
 show-setルールは[`strong`]($strong)要素のデフォルトの見た目を完全に変更しますが、そのセマンティックな意味は保持します。さらにカスタマイズが必要な場合は、完全に独自のレイアウトコードを持つshowルールを指定できますが、それでもTypstはその要素のセマンティックな目的を保持します。
 
 ## 読み上げ順序 { #reading-order }
@@ -200,88 +148,6 @@ WCAGのような一般的なアクセシビリティフレームワークでは
 ATの利用や一部の再利用ワークフローをサポートするためには、セマンティックな意味を持つ全ての要素にテキストによる表現が必要です。これをユニバーサルアクセスの観点で考えてみてください。ある項目が[アーティファクト](#artifacts)でないなら、それはセマンティックな意味を持っています。しかし、ATがその項目を取り込めない場合、文書の持つセマンティックな意味をATユーザーは完全には受け取れません。したがって、ユニバーサルアクセスを実現するために、代替表現を提供するためのTypstの組み込み機能を利用してください。
 
 画像を追加する際は、画像内で見えている内容を説明するために、必ず[image関数の`alt`引数]($image.alt)を使用してください。この代替説明（altテキストとも呼ばれます）は、画像の要点を説明するものにすべきです。電話で友人にその画像を説明するとしたら、どのように説明するかを考えてみてください。良い代替説明を書くためには、その画像が現れる文脈を考慮してください。
-=======
-The show-set rule completely changes the default appearance of the [`strong`] element, but its semantic meaning will be preserved. If you need even more customization, you can provide show rules with fully custom layout code and Typst will still retain the semantic purpose of the element.
-
-## Reading order
-
-For AT to read the contents of a document in the right order and for repurposing applications, accessible files must make their reading order explicit. This is because the logical reading order can differ from layout order. Floating figures are a common example for such a difference: A figure may be relevant to a paragraph in the center of a page but appear at the top or bottom edge. In non-accessible files, PDF readers and AT have to assume that layout order equals the logical reading order, often leading to confusion for AT users. When the reading order is well-defined, screen readers read a footnote or a floating figure immediately where it makes sense.
-
-Fortunately, Typst markup already implies a single reading order. You can assume that Typst documents will read in the order that content has been placed in the markup. For most documents, this is good enough. However, when using the [`place`] and [`move`] function or [floating figures]($figure.placement), you must pay special attention to place the function call at an appropriate spot in the logical reading order in markup, even if this has no consequence on the layout. Just ask yourself where you would want a screen reader to announce the content that you are placing.
-
-## Layout containers
-
-Typst provides some layout containers like [`grid`], [`stack`], [`box`], [`columns`], and [`block`] to visually arrange your content. None of these containers come with any semantic meaning attached. Typst will conserve some of these containers during PDF reflow while other containers will be discarded.
-
-When designing for Universal Access, you need to be aware that AT users often cannot view the visual layout that the container creates. Instead, AT will just read its contents, so it is best to think about these containers as transparent in terms of accessibility. For example, a grid's contents will just be read out flatly, in the order that you have added the cells in the source code. If the layout you created is merely visual and decorative, this is fine. If, however, the layout carries semantic meaning that is apparent to a sighted user viewing the file in a regular PDF reader, it is not accessible. Instead, create an alternative representation of your content that leverages text or wrap your container in the [`figure`] element to provide an alternative textual description.
-
-Do not use the grid container to represent tabular data. Instead, use [`table`]. Tables are accessible to AT users: their AT will allow them to navigate the table two-dimensionally. Tables are conserved during reflow and repurposing. When creating tables, use the [`table.header`]($table.header) and [`table.footer`]($table.footer) elements to mark up the semantic roles of individual rows. The table documentation contains an [accessibility section]($table/#accessibility) with more information on how to make your tables accessible. Keep in mind that while AT users can access tables, it is often cumbersome to them: Tables are optimized for visual consumption. Being read the contents of a set of cells while having to recall their row and column creates additional mental load. Consider making the core takeaway of the table accessible as text or a caption elsewhere.
-
-Likewise, if you use functions like [`rotate`], [`scale`], and [`skew`], take care that this transformation either has no semantic meaning or that the meaning is available to AT users elsewhere, i.e. in figure [alt text](#textual-representations) or a caption.
-
-## Artifacts
-
-Some things on a page have no semantic meaning and are irrelevant to the content of a document. We call these items _artifacts._ Artifacts are hidden from AT and repurposing and will vanish during reflow. Here are some examples for artifacts:
-
-- The hyphens inserted by automatic hyphenation at the end of a line
-- The headers and footers on each page
-- A purely decorative page background image
-
-In general, every element on a page must either have some way for AT to announce it or be an artifact for a document to be considered accessible.
-
-Typst automatically tags many layout artifacts such as headers, footers, page back- and foregrounds, and automatic hyphenation as artifacts. However, if you'd like to add purely decorative content to your document, you can use the [`pdf.artifact`] function to mark a piece of content as an artifact. If you are unsure if you should mark an element as an artifact, ask yourself this: Would it be purely annoying if a screen reader announced the element to you? Then, it may be an artifact. If, instead, it could be useful to have it announced, then it is not an artifact.
-
-For technical reasons, once in an artifact, content cannot become semantic again. To stack artifacts and semantic contents, use [`place`] to move the contents on top of one another.
-
-Please note that Typst will mark shapes and paths like [`square`] and [`circle`] as artifacts while their content will remain semantically relevant and accessible to AT. If your shapes have a semantic meaning, please wrap them in the [`figure`] element to provide an alternative textual description.
-
-## Color use and contrast
-
-Universal Access not only means that your documents works with AT, reflow, and repurposing, but also that visual access is possible to everyone, including people with impaired eyesight. Not only does aging often come with worse sight, a significant portion of people have problems differentiating color: About 8% of men and 0.5% of women are color blind.
-
-<div style="display:flex; gap: 8px 16px; width: 100%; flex-wrap: wrap; margin: 24px auto; ">
-<img src="chart-bad-regular.png" alt="Bar chart showing Energy production in Germany by kind in terawatt-hours on the X axis and the year on the y-axis. Each bar has up to four segments, for Nuclear (violet), Renewables (green), Fossil Fuels (red), and Other (blue). There is a legend in the top right corner associating the segment colors with their labels" width="958" height="637" style="box-shadow: 0 4px 12px rgb(89 85 101 / 20%); width: 200px; max-width: 100%; height: auto; display: block; border-radius: 6px; flex-grow: 1">
-<img src="chart-bad-deuteranopia.png" alt="The same bar chart with changed colors, with the segments for Nuclear and Other in a very similar dark blue, and the neighboring segments of Renewables and Fossil Fuels in two almost indistinguishable shades of sickly yellow" width="958" height="637" style="box-shadow: 0 4px 12px rgb(89 85 101 / 20%); width: 200px; max-width: 100%; height: auto; display: block; border-radius: 6px; flex-grow: 1">
-</div>
-
-This means that color must not be the only way you make information accessible to sighted users in your documents. As an example, consider a stacked bar chart with multiple colored segments per bar. Our example shows a chart of the domestic energy production in Germany by kind[^1]. In the picture, you can see the chart as it would normally appear and a simulation of how it would appear to people with deuteranopia-type color blindness. You can see that the two pairs of the first and last segment both look blue and the center pair looks yellow-ish. The first challenge for the colorblind user is thus to make out the boundary of the "Renewable" and "Fossil Fuels" bar. Then, they must keep track of which bar is which by only their order, adding to their mental load. A way to make this chart even less accessible would be to make the order of segments not match their order in the legend.
-
-How can we improve the chart? First, make sure that no information is solely communicated through color use. One possible way to do this by adding a pattern to each bar. Then, we can help the user make out the boundaries of each segment by adding a high-contrast border. Then, our chart could look something like this:
-
-<div>
-<img src="chart-good.png" alt="The same bar chart with the original colors. This time, black outlines around each segment are added. Additionally, each segment has a unique pattern." width="958" height="637" style="box-shadow: 0 4px 12px rgb(89 85 101 / 20%); width: 500px; max-width: 100%; height: auto; display: block; margin: 24px auto; border-radius: 6px">
-</div>
-
-This could be further improved by choosing colors that are differentiable to people afflicted by common colorblindness types. You could also iterate on the design by choosing two-tone patterns, aligning them to the bars, or changing font use.
-
-You can check your design in the web app by using the built-in color blindness simulator. To use it, open the "View" menu and select the desired mode in the "Simulate color blindness" menu. You can also use other tools on the web to [simulate the color perception of various color blindnesses][color-blind-simulator] if you are not using our web app.
-
-Also consider the color contrast between background and foreground. For example, when you are using light gray text for footnotes, they could become hard to read. Another situation that often leads to low contrast is superimposing text on an image.
-
-<div>
-<img src="color-contrast.png" alt="Two callout boxes with the text 'Caution: Keep hands away from active stapler' with different designs. Each box has a contrast gauge for its text and graphical elements below it. The left box is shaded in a light red and the text is a regular shade of red. It has a text contrast of 2.8:1 and a graphics contrast of 1.4:1. The right box is white with a red outline and dark red text. It has a text contrast of 5.9:1 and a graphics contrast of 3.9:1." width="1536" height="708" style="box-shadow: 0 4px 12px rgb(89 85 101 / 20%); width: 512px; max-width: 100%; height: auto; display: block; margin: 24px auto; border-radius: 6px">
-</div>
-
-In our example, we can see two designs for callout boxes. Because these boxes aim to help the user avoid a hazard, it is paramount that they can actually read them. However, in the first box, the background is fairly light, making it hard to make out the box. Worse, the red text is difficult to read on the light red background. The text has a 2.8:1 contrast ratio, failing the bar of 4.5:1 contrast the Web Content Accessibility Guidelines (WCAG) set. Likewise, the box has an 1.4:1 contrast ratio with the white page background, falling short of the 3:1 threshold for graphical objects.
-
-Colors in the second example have been adjusted to meet WCAG AA color contrast thresholds. It should be markedly easier to read the text in the box, even if you have good vision!
-
-There are [tools to compare how much contrast a pair of colors has][wcag-contrast] as foreground and background. The most common one is the WCAG color contrast ratio. For a given font size, a color pair may either fail the test, get to the AA level, or reach the higher AAA level. Aim for at least AA contrast for all your color pairings.
-
-| Content                                | AA Ratio | AAA Ratio |
-|----------------------------------------|---------:|----------:|
-| Large text (≥18pt, or bold and ≥14pt)  | 3:1      | 4.5:1     |
-| Small text                             | 4.5:1    | 7:1       |
-| Non-text content                       | 3:1      | 3:1       |
-
-Note that common accessibility frameworks like WCAG make an exception for purely decorative text and logos: Due to their graphic character, they can have contrast ratios that fail to achieve AA contrast ratio.
-
-## Textual representations
-
-To support AT use and some repurposing workflows, all elements with a semantic meaning must have a textual representation. Think about it in terms of Universal Access: If an item is not an [artifact](#artifacts), it has a semantic meaning. If, however, AT cannot ingest the item, the full semantic meaning of a document is not available to AT users. Hence, to provide Universal Access, use the mechanisms built into Typst to provide alternative representations.
-
-When you add an image, be sure to use the [`alt` argument of the image function]($image.alt) to describe what's visible in the image. This alternative description (sometimes known as alt text) should describe the gist of the image: Think about how you would describe the image to a friend if you called them on the phone. To write good alternative descriptions, consider the context in which the image appears:
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 
 ```example
 #image("heron.jpg", alt: "?")
@@ -292,7 +158,6 @@ when swimming, and wings that span
 up to 2.3 m.
 ```
 
-<<<<<<< HEAD
 [この画像][heron]には、どのような代替説明が適切でしょうか？_避けるべき_例をいくつか見てみましょう。
 
 - `{"サギの画像"}` \
@@ -317,32 +182,6 @@ up to 2.3 m.
 文字を画像にしたものは使わないでください。同様に、パス操作を使って文字を手動で描画しないでください。Typstは、画像内の文字をネイティブなテキストと同じようにアクセシブルなものとして処理できません。このルールには1つだけ例外があります。文字の見た目が文書の意味にとって本質的であり、かつTypstのネイティブ機能では再現できない場合だけ、文字の画像を使用してください。その場合は、代替説明の中で、文字としての内容と本質的な視覚的特徴の両方を記述しなければなりません。
 
 image関数と同様に、figure関数も[alt属性]($figure.alt)を持ちます。この属性を使用すると、多くのスクリーンリーダーやその他のATはfigure内部の内容を読み上げず、代わりに代替説明のみを読み上げます。代替説明は、AT利用者がfigure本体にアクセスする必要がないよう、十分に包括的でなければなりません。代替説明は、figureの内容にほかの方法ではアクセスできない場合にのみ使用してください。例えば、figureに`table`要素が含まれている場合は、そのfigureの`alt`属性を使用しないでください。一方、セマンティックな意味を持つ図形をfigure内で使用している場合は、`alt`属性を使用してください。`alt`と`caption`の両方を指定すると、その両方がATによって読み上げられます。figureに画像が含まれている場合、代替説明はfigureではなく[画像自体]($image.alt)に設定してください。両方への設定は行わないでください。画像の説明がfigureの説明によって上書きされてしまうためです。
-=======
-What could be a good alternative description for [this image][heron]? Let's consider a few examples for what _not_ to do:
-
-- `{"Image of a heron"}` \
-  ❌ The screen reader will already announce the image on its own, so saying this is an image is redundant. In this example, the AT user would hear "Image, Image of a heron".
-
-- `{"A bird"}` \
-  ❌ The alternative description is not specific enough. For example, it is relevant to a user that the image depicts a heron and both its feet and wings are visible.
-
-- `{"Gray heron in flight. Picture by Makasch1966 on Wikimedia Commons, CC Attribution 4.0 International license"}` \
-  ❌ The alternative description should not include details not visible in the image, such as attribution, jokes, or metadata. Keep in mind that it is not accessible to sighted users. That information belongs elsewhere.
-
-- `{"Gray heron flying low, heading from the right to left. Its feet are extended and slightly point downwards, touching a blurred horizon where a dark forest becomes visible. The bird's wings are extended and arc upwards. There are out-of-focus branches visible in the lower left corner of the image."}` \
-  ❌ The alternative description is too verbose. Use your discretion and determine how important the image is to the content. Think about how long a sighted user would realistically look at the image; your alt text should take about the same effort to 'consume.' For example, the anatomic description contained above could be appropriate for a longer discussion in a zoology textbook while the compositional information is useful when writing about photography. The context the example image comes with is relatively short, so write a more brief description.
-
-Instead, in the given example, you could use this alternative text:
-
-- `{"Heron in flight with feet and wings spread"}` \
-  ✅ This alternative description describes the image, is relevant to the context, and matches its brevity.
-
-There are resources available on the web [to learn more about writing good alternative descriptions][alt-text-tips]. The requirement to add alternative text to images applies to all image formats. Typst does not currently retain the tags of a PDF image in the compiled document, even if the PDF image file on its own was accessible.
-
-Do not use images of text; likewise, do not use the path operations to draw text manually. Typst will not be able to process text in any images to make it accessible in the same way that native text is. There is one exception to this rule: Use an image of text when the appearance of the text is essential to the semantic meaning of the document and cannot be reproduced with Typst natively. In that case, you must describe both the textual content and the essential visual characteristics in the alternative description.
-
-Like the image function, the figure function has a [`alt` attribute]($figure.alt). When you use this attribute, many screen readers and other AT will not announce the content inside of the figure and instead just read the alternative description. Your alternative description must be comprehensive enough so that the AT user does not need to access the body of the figure. Only use the alternative description if the content of the figure are not otherwise accessible. For example, do not use the `alt` attribute of a figure if it contains a `table` element, but do use it if you used shapes within that come with a semantic meaning. If you specify both `alt` and `caption`, both will be read by AT. When your figure contains an image, set the alternative description on the [image itself]($image.alt), not on the figure. Do not set both, as the image description would be overridden by the figure description.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 
 ```typ
 #figure(
@@ -359,24 +198,16 @@ Like the image function, the figure function has a [`alt` attribute]($figure.alt
 )
 ```
 
-<<<<<<< HEAD
 最後に、[`math.equation`]($math.equation)を使って数式に代替説明を指定できます。数式は、自然言語で声に出して読み上げる場合を想定して記述してください。現時点では、全てのエクスポート形式で数式をアクセシブルにするには、代替説明の追加が必要です。数式に代替説明を追加しなかった場合、PDF/UA-1としてのエクスポートは失敗します。将来的には、TypstはMathML技術を活用し、HTMLおよびPDF 2.0における数式を自動的にアクセシブルにする予定です。
-=======
-Finally, you can specify an alternative description on math using [`math.equation`]. Describe your formula as if read out loud in natural language. Currently, adding an alternative description is required for accessible math for all export formats. Not adding an alternative description for your formula will result in a failure of PDF/UA-1 export. In the future, Typst will automatically make math accessible in HTML and PDF 2.0 by leveraging MathML technology.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 
 ```typ
 #math.equation(
   alt: "a squared plus b squared equals c squared",
-<<<<<<< HEAD
-=======
   block: true,
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
   $ a^2 + b^2 = c^2 $,
 )
 ```
 
-<<<<<<< HEAD
 テキストとして表現されるもう1つの要素はリンクです。_here_や_go_のような、説明的でないリンクテキストは避けるのが望ましいです。こうしたリンクテキストは、文書において検索エンジン最適化（Search Engine Optimization、SEO）を考慮する場合にも悪影響を及ぼします。代わりに、リンク先がわかるテキストを、リンク自体に含めてください。なお、最高レベルのアクセシビリティを目指しているのでなければ、リンク自体の文言が説明的でなくても、その目的が直近の周辺の文脈から理解できるのであれば問題ありません。
 
 ## 自然言語 { #natural-language }
@@ -384,21 +215,11 @@ Finally, you can specify an alternative description on math using [`math.equatio
 スクリーンリーダーが文書を正しく読み上げ、翻訳ソフトウェアが適切に動作するためには、文書がどの自然言語で書かれているかを明示する必要があります。文書の冒頭で[`[#set text(lang: "..")]`]($text.lang)ルールを使用するか、テンプレート側の言語設定機能を使用してください。そうしない場合、Typstはその内容を英語で書かれているものとみなします。選択した自然言語は、アクセシビリティだけでなく、Typstがどのようにハイフネーションを適用するか、どの組版規則が適用されるか、図や参照のラベル、そしてWebアプリではスペルチェックにどの言語が使われるかにも影響します。
 
 中国語や英語のように地域差が大きい言語を使用する場合は、[`region`引数]($text.region)も使用してください。例えば、香港で話される中国語は次のように指定します。
-=======
-Another element that represents itself as text are links. It is best to avoid non-descriptive link texts such as _here_ or _go._ These link texts also hurt Search Engine Optimization (SEO) if that is a consideration for your document. Instead, try to have the link contain text about where it is pointing to. Note that, unless you are aiming for the highest level of accessibility, it is also okay if the link itself is not descriptive but its purpose can be understood from the content immediately surrounding it.
-
-## Natural Language
-
-In order for screen readers to pronounce your document correctly and translation software to work properly, you must indicate in which natural language your document is written. Use the rule [`[#set text(lang: "..")]`]($text.lang) at the very start of your document or your template's capability to set a language. If you do not do so, Typst will assume that your content is in English. The natural language you choose not only impacts accessibility, but also how Typst will apply hyphenation, what typesetting conventions are applied, the labels of figures and references, and, in the web app, what language is used for spellcheck.
-
-If you are using a language with significant variation between regions, such as Chinese or English, also use [the `region` argument]($text.region). For example, Chinese as it is spoken in Hong Kong would look like this:
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 
 ```typ
 #set text(lang: "zh", region: "HK")
 ```
 
-<<<<<<< HEAD
 言語を指定するには、ISO 639コードを使用します。地域については、[ISO 3166-1 alpha-2][iso-3166-1-alpha-2]コードを使用します。ISO 639には3種類の規格があり、ドイツ語の"de"のような2文字の言語コード用のものが1つ（[ISO 639-1][iso-639-1-list]）、"deu"のような3文字の言語コード用のものが2つ（[ISO 639-2][iso-639-2-list]と[ISO 639-3][iso-639-3-list]）あります。使用する言語に2文字のISO 639-1コードがある場合は、常にそちらを使用してください。ISO 639-2と639-3はほとんどのコードを共有していますが、いくつかの違いがあります。言語コードが両規格で異なる場合は、PDF 1.7（Typstのデフォルト）およびそれ以下へのエクスポートにはISO 639-2を、PDF 2.0とHTMLへのエクスポートにはISO 639-3を使用してください。
 
 通常の言語コードを提供するのが難しい場合に使用できる、ISO 639-2とISO 639-3の両方で定義されている3つの特別な言語コードがあります。
@@ -408,17 +229,6 @@ If you are using a language with significant variation between regions, such as
 - `mis`は言語コードが割り当てられていない言語のテキスト用
 
 文書に複数言語のテキストが含まれている場合は、text関数やスコープ付きのtext setルールを使用して、他の言語のインスタンスを囲むことができます。
-=======
-To specify your language, use ISO 639 codes. For regions, use the [ISO 3166-1 alpha-2][iso-3166-1-alpha-2] code. ISO 639 contains three variants, one for two-letter language codes like "de" for German [(ISO 639-1)][iso-639-1-list] and two for three-letter language codes like "deu" ([ISO 639-2][iso-639-2-list] and [ISO 639-3][iso-639-3-list]). If your language has a two-letter ISO 639-1 code, always prefer using that. ISO 639-2 and 639-3 share most codes, but there are some differences. When your language code differs between the two standards, use ISO 639-2 when exporting to PDF 1.7 (Typst's default) and below and ISO 639-3 for export to PDF 2.0 and HTML.
-
-There are three special language codes defined by both ISO 639-2 and ISO 639-3 that you can use when providing a normal language code is difficult:
-
-- `zxx` for text that is not in a natural language
-- `und` for text for which you cannot determine the natural language
-- `mis` for text in languages that have not been assigned a language code
-
-If your document contains text in multiple languages, you can use the text function or a scoped text set rule to enclose instances of other languages:
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 
 ```example
 This is #text(lang: "fr")[français].
@@ -430,25 +240,16 @@ This is #text(lang: "fr")[français].
 ]
 ```
 
-<<<<<<< HEAD
 ## 文書タイトルと見出し { #document-title-and-headings }
 
 文書にタイトルを付けると、ATユーザーにとっても、通常のPDFビューアーのユーザーにとっても、その文書を見つけたり、ほかの文書との間を移動したりしやすくなります。このため、WCAGやPDF/UAなどのアクセシビリティ規格では、文書に機械可読なタイトルを設定することが求められています。
 
 Typstでこれを行うには、以下のsetルールを、文書内のどのコンテンツよりも前に配置してください。
-=======
-## Document Title and Headings
-
-Titling your document makes it easier to retrieve it and to navigate between it and other documents, both for AT users and regular users of PDF viewers. This is why accessibility standards such as WCAG and PDF/UA require you to set a machine-readable title for your document.
-
-To do so in Typst, place this set rule in your document before any content:
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 
 ```typ
 #set document(title: "GlorboCorp Q1 2023 Revenue Report")
 ```
 
-<<<<<<< HEAD
 これにより、[文書メタデータ内のタイトル]($document.title)と、PDFビューアーやWebブラウザーのタイトルバーのタイトルが設定されます。テンプレートを使用していてこれがエラーになる場合は、テンプレート側で文書タイトルを設定する別の方法が用意されていないか確認してください。
 
 おそらく、文書内にもタイトルを目に見える形で示したくなるでしょう。そのためには、[`title`]($title)要素を使用します。title要素を引数なしで呼び出すと、文書タイトルとして設定したコンテンツがそのまま出力されます。あるいは、コンテンツを位置引数のbodyとして渡して、タイトルをカスタマイズもできます。文書内でtitle要素を複数回使用しないでください。
@@ -456,15 +257,6 @@ To do so in Typst, place this set rule in your document before any content:
 文書タイトルに見出しを使ってはいけません。代わりにtitle要素を使用してください。HTMLの経験がある場合は、Typstにおけるheading要素のセマンティクスがHTMLの見出しとは異なることを覚えておくことが重要です。Typst文書では、セクション見出しとして複数の第1レベルの見出しを使用することが推奨されます。HTMLにエクスポートする際、[`title`]($title)は`h1`タグとしてシリアル化される一方、[第1レベルの見出し]($heading.level)は`h2`タグとしてシリアル化されます。PDFエクスポートでは、対象とするPDFバージョンに基づいて、タイトルと見出しが正しくタグ付けされます。
 
 使用する見出しの階層は、順番通りであることが重要です。より深い階層へ進むとき、見出しレベルを飛ばしてはいけません。つまり、第3レベルの見出しの後は、レベル4以下の見出しを続ける必要があります。ただし、レベル5以上を続けてはいけません。
-=======
-This will set the [title in the document's metadata]($document.title) and in the title bar of the PDF viewer or web browser. If this results in an error when using a template, consider whether your template may provide an alternative way to set the document title.
-
-Most likely, you will also want to include the title visibly in your document. To do so, use the [`title`] element. When you add a call to the title element without any arguments, it will print the contents of what you set as the document's title. Alternatively, you can customize the title by passing content as the positional body argument. Do not use the title element more than once in your document.
-
-Never use a heading for your document title; instead, use the title element. Should you have experience with HTML, it is important to remember that the semantics of the heading element in Typst differ from HTML headings. It is encouraged to use multiple first-level headings for section headings in Typst documents. When exporting to HTML, a [title] will be serialized as a `h1` tag while a [first-level heading]($heading.level) will be serialized as a `h2` tag. In PDF export, the title and headings will be correctly tagged based on the PDF version targeted.
-
-It is important that the sequence of headings you use is sequential: Never skip a heading level when going deeper. This means that a third-level heading must be followed by a heading of level four or lower, but never a heading of level five or higher.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 
 ```typ
 // ❌ Don't do this:
@@ -472,7 +264,6 @@ It is important that the sequence of headings you use is sequential: Never skip
 === Third level heading
 ```
 
-<<<<<<< HEAD
 [Adobe Acrobatの自動アクセシビリティチェック][acro-check-outline]を通過するためには、21ページ以上の文書にはアウトライン化された見出しが必要であることに注意してください。
 
 ## アクセシビリティ規格と法令 { #accessibility-standards-and-legislation }
@@ -548,83 +339,6 @@ PDF文書がアクセシブルかどうかをテストするには、自動ツ
 [^1]: ドイツ連邦統計局（Statistisches Bundesamt, Destatis）のデータセット。["Bruttostromerzeugung nach Energieträgern in Deutschland ab 1990"](https://www.destatis.de/DE/Themen/Branchen-Unternehmen/Energie/Erzeugung/bar-chart-race.html)。2025年。_Data licence Germany – attribution – version 2.0._の下で利用可能です。
 
 [^2]: 例えば脚注を使用する場合、「List」セクションにある「Lbl and LBody must be children of LI」というチェック項目が失敗（不合格）になることが想定されます。
-=======
-Note that in order to pass the [automated accessibility check in Adobe Acrobat][acro-check-outline], documents with 21 pages or more must contain outlined headings.
-
-## Accessibility Standards and Legislation
-
-Typst can help you to assert that your document is accessible by checking it against international standards. For PDF export, there are multiple standards for accessible files, most notably the PDF/UA standard. Its first part (PDF/UA-1) is already supported by Typst while support for the second part (PDF/UA-2) is planned for the future. Below, you can find an explanation of all relevant standards:
-
-- **Tagged PDF:** Tagged PDFs contain machine-readable data about the semantic structure of a document that AT can parse. Typst will write Tagged PDFs by default, but keep in mind that Typst can only write appropriate tags if it knows about the semantic structure of your document. Refer to the Section [_Maintaining semantics_](#maintaining-semantics) to learn how to use Typst's elements to communicate semantics. To provide Universal Access, you are also responsible to provide textual representation of non-text content yourself.
-
-- **PDF/UA-1:** The PDF/UA standard explains how to write a PDF 1.7 file optimized for Universal Access. It implies Tagged PDF, enforces alternative descriptions for images and mathematics, requires a document title, and introduces rules how document contents like tables should be structured. If you are following this guide, you are already avoiding most of the compiler errors that can occur during PDF/UA-1 export.
-
-- **PDF/UA-2:** There is also the more recent part PDF/UA-2 that targets PDF 2.0 files. It improves accessibility for mathematics and some semantic elements. Support for PDF/UA-2 not yet available in Typst, but planned.
-
-- **Well Tagged PDF (WTPDF):** This is an industry standard that is very similar to PDF/UA-2. Like PDF/UA-2, it is not currently supported by Typst. Originally, it was drafted because both parts of the PDF/UA specification were only available at a high cost from the International Standards Organization. Hence, [WTPDF][WTPDF] was designed so that all conforming files can also declare conformance with PDF/UA-2. By now, [both parts of the PDF/UA specification are available free of charge][pdf-ua-free], decreasing the relevance of WTPDF.
-
-- **PDF/A-1a:** The PDF/A standard describes how to produce PDF files that are well-suited for archival. Parts one to three of the PDF/A standard feature multiple conformance levels. The strictest conformance level A contains rules for accessibility as only files meeting those rules remain usable to the broadest range of people in the far future. Level A implies conformance with Tagged PDF and forces you to provide alternative descriptions for images. Other PDF/A rules not relating to accessibility, e.g. about transparency, colors, and more also apply. This part of the PDF/A standard is based on the outdated PDF 1.4 specification. Only use it if your venue requires it or if you need a very compatible file. Otherwise, PDF/UA-1 and the second and third part of PDF/A provide better alternatives.
-
-- **PDF/A-2a** and **PDF/A-3a:** Like the first part of PDF/A, these standards focus on creating files suitable for archival and long-term storage. Both of these standards target the newer PDF version 1.7 instead of PDF 1.4. Here too, the strictest conformance level A contains rules for accessibility. In addition to the rules in PDF/A-1a, these standards disallow the use of characters in the [Unicode Private Use Area][unic-pua] whose meaning is not universally defined. Improvements over PDF/A-1 include the ability to use transparency and better reflow. When choosing between these two parts of the PDF/A standard, choose PDF/A-2a unless you need to [attach]($pdf.attach) other files. Note that conformance level A has been removed from PDF/A-4 in favor of the dedicated PDF/UA standard.
-
-The [PDF reference page]($pdf/#pdf-standards) contains more information about each supported standard. To enable either PDF/UA, PDF/A-2a, or PDF/A-3a, use the [appropriate flag in the CLI]($pdf/#command-line) or use the export dropdown and click on PDF in the web app. At the moment, you must choose between PDF/A and PDF/UA. For accessibility-focused documents, we recommend the latter.
-
-When you select one of these standards for PDF export, Typst will detect if you are in violation of their rules and fail the export with a descriptive error message. For the strictest accessibility check currently available, choose PDF/UA-1. Do not disable tagging unless you have a good reason, as tags provide a baseline of accessibility across all documents you export.
-
-Maybe you already noticed that some of the factors that go into Universal Access are hard to check automatically. For example, Typst will currently not automatically check that your color contrasts are sufficient or whether the configured natural language matches the actual natural language (although the amount of spellcheck errors should provide a hint if you are using the web app). There are two international standards that address some of these human factors in more detail:
-
-- The **[Web Content Accessibility Guidelines (WCAG)][WCAG]**: Designed by the W3C, a big international consortium behind the technologies that power the internet, WCAG describes how to make a web site accessible. All of these rules are applicable to Typst's HTML output, and many of them apply to its PDF output. WCAG separates its rules into the three levels A, AA, and AAA. It is recommended that normal documents aim for AA. If you have high standards for Universal Access, you can also consider AAA Success Criteria. However, Typst does not yet expose all PDF features needed for AAA compliance, e.g. an AT-accessible way to define expansions for abbreviations.
-- The **[European Norm EN 301 549][EN301549]**: Its Section 9 describes how to create accessible websites and its Section 10 describes what rules apply to non-web documents, including PDFs created by Typst. It points out which WCAG clauses are also applicable to PDFs. Conformance with this standard is a good start for complying with EU and national accessibility laws.
-
-Keep in mind that in order to conform with EN 301 549 and the relevant WCAG provisions, your document must be tagged. If you aim for conformance, we strongly suggest using PDF/UA-1 for export to automate many of the checks for the success criteria within.
-
-Many territories have accessibility legislation that requires you to create accessible files under some circumstances. Here are only some of them:
-
-- **[European Accessibility Act (EAA, EU 2019/882)][EAA]**: This regulation applies to e-books, consumer banking services, e-commerce services, and more. It requires the files distributed in these applications to be accessible.
-- **Americans with Disabilities Act (ADA)**: The Department of Justice will [require public sector organizations to provide files][ADA-2] in accordance to WCAG under Title II of the ADA by 2026. Likewise, [private organizations can be held liable][ADA-dominos] for inaccessible digital services under the ADA and state law.
-
-Using this guide can help you reach compliance with either regulation.
-
-## Testing for Accessibility
-
-In order to test whether your PDF document is accessible, you can use automated tools and manual testing. Some standards like PDF/UA and PDF/A can be checked exclusively through automated tools, while some rules in WCAG and other standards require manual checks. Many of the automatable checks are automatically passed by Typst when Tagged PDF is enabled. For many other automatable checks, you can enable PDF/UA-1 export so that Typst will run them instead. Automated tools can only provide a baseline of accessibility. For truly Universal Access, it is best if you try the document yourself with AT.
-
-Here is a list of automated checkers to try to test for conformance:
-
-- **[veraPDF][veraPDF]:** This open-source tool can check if your PDF file conforms to the parts of the PDF/A and PDF/UA standards it declared conformance with. Use this tool if you have chosen one of these standards during export. Failures are considered bugs in Typst and should be [reported on GitHub](https://github.com/typst/typst/issues).
-
-- **[PDF Accessibility Checker (PAC)][PAC]:** The freeware PAC checks whether your document complies with PDF/UA and WCAG rules. When you receive a hard error in the PDF/UA tab, this is considered a bug in Typst and should be [reported on GitHub](https://github.com/typst/typst/issues). Warnings in the PDF/UA and Quality tabs may either be bugs, problems in your document, or neither. Check on the [Forum][Typst Forum] or on [Discord][Discord] if you are unsure. Errors and warnings in the WCAG tab indicate problems with your document.
-
-- **[Accessibility Check in Adobe Acrobat Pro][acro-check]:** The accessibility checker in the paid version of Adobe Acrobat checks all PDF documents for problems. Instead of checking compliance with a well-known international or industry standard, Adobe has created their own suite of tests. Because the rules behind these tests sometimes contradict international standards like PDF/UA, some of Acrobat's checks are expected to fail for Typst documents[^2]. Other checks, such as the contrast check are useful and indicate problems with your document.
-
-When doing manual checking, you can start with a checklist. If your organization places emphasis on accessibility, they will sometimes have their own list. In absence of one, you can try lists by universities such as [Universität Bremen (in English)][checklist-unib] or governments such as in [Canada][checklist-canada] or by the [US Social Security Administration][checklist-us-ssa]. Although these checklists differ in verbosity, they all cover the most essential manual checks. Many of the technical checks in them can be skipped if you choose PDF/UA-1 export in Typst. If unsure which checklist to use, choose one from an organization culturally similar to yours.
-
-However, to reach the highest standard of accessibility for widely circulated documents, consider checking your document with AT. Although there are many AT products and PDF viewers, it is typically sufficient to test a single combination. Which is best differs depending on your operating system:
-
-- Windows: Test with [Adobe Acrobat][Acrobat] and [NVDA][NVDA]. NVDA is free, open-source software. A free version of Acrobat is available.
-- macOS: Test with [Adobe Acrobat][Acrobat] and [VoiceOver][VoiceOver]. VoiceOver is the screen reader that is built into macOS and other Apple platforms.
-- Linux: Test with [Evince][Evince] or [Okular][Okular] and [Orca][Orca]. All three tools are free, open-source software. However, AT support across Linux platforms lags behind what is available on Windows and macOS. Likewise, Evince and Okular have less accessibility support than Acrobat. We strongly suggest testing with Acrobat instead.
-
-When first getting into testing, consider completing the interactive training program your screen reader offers, if any. Building confidence with a screen reader helps you experience your document like a full-time screen reader user. When checking your document, check that it not only makes all the same information accessible that is available to a sighted user, but also that it is easy to navigate. The experience your users will have will vary based on the pairing of PDF viewer and AT they use.
-
-## Limits and considerations for export formats
-
-Even when you design your document with accessibility in mind, you should be aware of the limitations of your export format. Fundamentally, AT support for PDF files is more difficult to implement than for other formats such as HTML. PDF was conceived in 1993 to accurately render print documents on a computer. Accessibility features were first added with PDF 1.4 in 2001, and improved in PDF 1.5 (2003) and PDF 2.0 (2017). By contrast, HTML offers a richer semantic model and more flexibility, so AT support in browsers generally surpasses what is possible in PDF viewers.
-
-Also keep in mind that PDF files are mostly static. This allows you to disregard many WCAG and EN 301 549 rules designed for interactive content and multimedia. However, the lack of interactivity also makes it more difficult for users to customize a document's layout to their needs.
-
-For example, [WCAG Success Criterion 1.4.12][wcag-sg-1412-us] (codified in Clause 10.1.4.12 of EN 301 549) prescribes that a user must be able to increase character, letter, line, and paragraph spacing to very wide values. This benefits users with reduced vision or dyslexia. The Success Criterion does not require you to design your document with these layout parameters. Instead, it only requires a mechanism through which users can increase these parameters when reading the document. For HTML files, it is easy to comply with this Success Criterion because the browser lets the user override these spacing parameters on a page. For PDF, the situation is more nuanced: Theoretically, Typst adds tags and attributes designed for reflow to a file. A PDF reader, when reflowing, could allow its user to increase spacings beyond what is codified in these tags. In practice, we are not aware of a PDF viewer with this feature. Instead, this Success Criterion can be satisfied by repurposing the PDF into a HTML file and opening it in a browser.
-
-In practice, even if your file is technically compliant, you cannot expect your users to know about these workarounds. Therefore, if you are aiming to meet the highest standards of Universal Access, consider distributing an HTML version of your document alongside your PDF. Export this file directly using Typst's [HTML export]($html) (in preview). Even though HTML export will not conserve many aspects of your visual layout, it will produce a file that leverages semantic HTML and technologies like [Digital Publishing ARIA][dpub-aria] to provide Universal Access. It will be of a higher quality than a PDF file repurposed to HTML.
-
-Finally, keep in mind that PDFs are designed for print. Hence, you should not assume that interactive features like links are available to users who chose to print your document.
-
-As mentioned above, files created by PNG and SVG export are not accessible.
-
-[^1]: Dataset from the German Federal Statistics Authority (Statistisches Bundesamt, Destatis). ["Bruttostromerzeugung nach Energieträgern in Deutschland ab 1990"](https://www.destatis.de/DE/Themen/Branchen-Unternehmen/Energie/Erzeugung/bar-chart-race.html), 2025, available under the _Data licence Germany – attribution – version 2.0._
-
-[^2]: For example, when using footnotes, the check "Lbl and LBody must be children of LI" in the "List" section is expected to fail.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 
 [NVDA]: https://www.nvaccess.org/download/
 [Acrobat]: https://www.adobe.com/acrobat.html
diff --git a/docs/guides/guide-for-latex-users.md b/docs/guides/guide-for-latex-users.md
index 6d341a0e18..bd2cd3d8bb 100644
--- a/docs/guides/guide-for-latex-users.md
+++ b/docs/guides/guide-for-latex-users.md
@@ -1,17 +1,9 @@
 ---
 description: |
-<<<<<<< HEAD
   あなたはLaTeXユーザーですか？ このガイドではTypstとLaTeXの違いや類似点を説明し、すぐにTypstを使い始められるよう手助けをします。
 ---
 
 # LaTeXユーザー向けガイド { # }
-=======
-  Are you a LaTeX user? This guide explains the differences and
-  similarities between Typst and LaTeX so you can get started quickly.
----
-
-# Guide for LaTeX Users { # }
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 This page is a good starting point if you have used LaTeX before and want to try
 out Typst. We will explore the main differences between these two systems from a
 user perspective. Although Typst is not built upon LaTeX and has a different
@@ -30,11 +22,7 @@ provide instant previews.
 
 In the following, we will cover some of the most common questions a user
 switching from LaTeX will have when composing a document in Typst. If you prefer
-<<<<<<< HEAD
 a step-by-step introduction to Typst, check out our [tutorial]($tutorial).
-=======
-a step-by-step introduction to Typst, check out our [tutorial].
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 
 ## Installation
 You have two ways to use Typst: In [our web app](https://typst.app/signup/) or
@@ -188,11 +176,7 @@ A function call always involves the name of the function ([`rect`],
 parentheses (as opposed to LaTeX where the square brackets and curly braces are
 optional if the macro requires no arguments). The expected list of arguments
 passed within those parentheses depends on the concrete function and is
-<<<<<<< HEAD
 specified in the [reference]($reference).
-=======
-specified in the [reference].
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 
 ### Arguments
 A function can have multiple arguments. Some arguments are positional, i.e., you
@@ -217,17 +201,10 @@ Named arguments are similar to how some LaTeX environments are configured, for
 example, you would type `\begin{enumerate}[label={\alph*)}]` to start a list
 with the labels `a)`, `b)`, and so on.
 
-<<<<<<< HEAD
 Often, you want to provide some [content]($content) to a function. For example, the LaTeX
 command `\underline{Alternative A}` would translate to
 `[#underline([Alternative A])]` in Typst. The square brackets indicate that a
 value is [content]($content). Within these brackets, you can use normal markup.
-=======
-Often, you want to provide some [content] to a function. For example, the LaTeX
-command `\underline{Alternative A}` would translate to
-`[#underline([Alternative A])]` in Typst. The square brackets indicate that a
-value is [content]. Within these brackets, you can use normal markup.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 However, that's a lot of parentheses for a pretty simple construct. This is why
 you can also move trailing content arguments after the parentheses (and omit the
 parentheses if they would end up empty).
@@ -330,11 +307,7 @@ You can achieve the effects of LaTeX commands like `\textbf`, `\textsf`,
 `\rmfamily`, `\mdseries`, and `\itshape` with the [`font`]($text.font),
 [`style`]($text.style), and [`weight`]($text.weight) arguments of the `text`
 function. The text function can be used in a set rule (declaration style) or
-<<<<<<< HEAD
 with a content argument. To replace `\textsc`, you can use the [`smallcaps`]($smallcaps)
-=======
-with a content argument. To replace `\textsc`, you can use the [`smallcaps`]
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 function, which renders its content argument as smallcaps. Should you want to
 use it declaration style (like `\scshape`), you can use an
 [_everything_ show rule]($styling/#show-rules) that applies the function to the
@@ -670,11 +643,7 @@ a reusable template?
 ## Bibliographies
 Typst includes a fully-featured bibliography system that is compatible with
 BibTeX files. You can continue to use your `.bib` literature libraries by
-<<<<<<< HEAD
 loading them with the [`bibliography`]($bibliography) function. Another possibility is to use
-=======
-loading them with the [`bibliography`] function. Another possibility is to use
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 [Typst's YAML-based native format](https://github.com/typst/hayagriva/blob/main/docs/file-format.md).
 
 Typst uses the Citation Style Language to define and process citation and
@@ -686,21 +655,13 @@ your own.
 
 You can cite an entry in your bibliography or reference a label in your document
 with the same syntax: `[@key]` (this would reference an entry called `key`).
-<<<<<<< HEAD
 Alternatively, you can use the [`cite`]($cite) function.
-=======
-Alternatively, you can use the [`cite`] function.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 
 Alternative forms for your citation, such as year only and citations for natural
 use in prose (cf. `\citet` and `\textcite`) are available with
 [`[#cite(<key>, form: "prose")]`]($cite.form).
 
-<<<<<<< HEAD
 You can find more information on the documentation page of the [`bibliography`]($bibliography)
-=======
-You can find more information on the documentation page of the [`bibliography`]
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 function.
 
 ## What limitations does Typst currently have compared to LaTeX? { #limitations }
diff --git a/docs/guides/page-setup.md b/docs/guides/page-setup.md
index 0e8e3e8545..382452b16f 100644
--- a/docs/guides/page-setup.md
+++ b/docs/guides/page-setup.md
@@ -1,17 +1,9 @@
 ---
 description: |
-<<<<<<< HEAD
   Typstでページサイズ、余白、ページ番号を設定するための詳しいガイドです。魅力的で見やすいレイアウトを素早く作成する方法を学びましょう。
 ---
 
 # ページ設定ガイド
-=======
-  An in-depth guide to setting page dimensions, margins, and page numbers in
-  Typst. Learn how to create appealing and clear layouts and get there quickly.
----
-
-# Page Setup Guide
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 Your page setup is a big part of the first impression your document gives. Line
 lengths, margins, and columns influence
 [appearance](https://practicaltypography.com/page-margins.html) and
@@ -194,11 +186,7 @@ conditionally remove the header on the first page:
 
 This example may look intimidating, but let's break it down: By using the
 `{context}` keyword, we are telling Typst that the header depends on where we
-<<<<<<< HEAD
 are in the document. We then ask Typst if the page [counter]($counter) is larger than one
-=======
-are in the document. We then ask Typst if the page [counter] is larger than one
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 at our (context-dependent) current position. The page counter starts at one, so
 we are skipping the header on a single page. Counters may have multiple levels.
 This feature is used for items like headings, but the page counter will always
@@ -211,11 +199,7 @@ the first page instead.
 The technique described in the previous section can be adapted to perform more
 advanced tasks using Typst's labels. For example, pages with big tables could
 omit their headers to help keep clutter down. We will mark our tables with a
-<<<<<<< HEAD
 `<big-table>` [label]($label) and use the [query system]($query) to find out if such a
-=======
-`<big-table>` [label] and use the [query system]($query) to find out if such a
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 label exists on the current page:
 
 ```typ
@@ -347,15 +331,9 @@ This page has a custom footer.
 ```
 
 In this example, we use the number of pages to create an array of
-<<<<<<< HEAD
 [circles]($circle). The circles are wrapped in a [box]($box) so they can all appear on
 the same line because they are blocks and would otherwise create paragraph
 breaks. The length of this [array]($array) depends on the current page number.
-=======
-[circles]($circle). The circles are wrapped in a [box] so they can all appear on
-the same line because they are blocks and would otherwise create paragraph
-breaks. The length of this [array] depends on the current page number.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 
 We then insert the circles at the right side of the footer, with 1pt of space
 between them. The join method of an array will attempt to
@@ -372,11 +350,7 @@ want to start with the first page only after the title page. Or maybe you need
 to skip a few page numbers because you will insert pages into the final printed
 product.
 
-<<<<<<< HEAD
 The right way to modify the page number is to manipulate the page [counter]($counter). The
-=======
-The right way to modify the page number is to manipulate the page [counter]. The
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 simplest manipulation is to set the counter back to 1.
 
 ```typ
@@ -396,11 +370,7 @@ counter and `n + 5` is the return value of our function.
 
 In case you need to retrieve the actual page number instead of the value of the
 page counter, you can use the [`page`]($location.page) method on the return
-<<<<<<< HEAD
 value of the [`here`]($here) function:
-=======
-value of the [`here`] function:
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 
 ```example
 #counter(page).update(n => n + 5)
diff --git a/docs/guides/tables.md b/docs/guides/tables.md
index 9f96eec395..50b2542cbb 100644
--- a/docs/guides/tables.md
+++ b/docs/guides/tables.md
@@ -1,17 +1,9 @@
 ---
 description: |
-<<<<<<< HEAD
   表の罫線の変更方法がわからない？表を回転したい？このガイドでは、Typstで表を扱うために必要な知識をすべて解説します。
 ---
 
 # 表ガイド
-=======
-  Not sure how to change table strokes? Need to rotate a table? This guide
-  explains all you need to know about tables in Typst.
----
-
-# Table Guide
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 Tables are a great way to present data to your readers in an easily readable,
 compact, and organized manner. They are not only used for numerical values, but
 also survey responses, task planning, schedules, and more. Because of this wide
@@ -170,11 +162,7 @@ the last column is `1fr` wide as to fill the whole page.
 )
 ```
 
-<<<<<<< HEAD
-Here, we have passed our list of column lengths as an [array]($array), enclosed in round
-=======
 Here, we have passed our list of column lengths as an [array], enclosed in round
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 parentheses, with its elements separated by commas. The first two columns are
 automatically sized, so that they take on the size of their content and the
 third column is sized as `{1fr}` so that it fills up the remainder of the space
@@ -494,11 +482,7 @@ depends on the modification you want to make and your intent:
 - Do you want to change, add, or remove the stroke around a single cell? Use the
   `table.cell` element in the argument list of your table call.
 - Do you want to change, add, or remove a single horizontal or vertical stroke
-<<<<<<< HEAD
-  in a single table? Use the [`table.hline`]($table.hline) and [`table.vline`]($table.vline) elements in the
-=======
   in a single table? Use the [`table.hline`] and [`table.vline`] elements in the
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
   argument list of your table call.
 
 We will go over all of these options with examples next! First, we will tackle
@@ -584,13 +568,8 @@ achieve more complex stroking patterns.
 
 ### Adding individual lines in the table { #individual-lines }
 If you want to add a single horizontal or vertical line in your table, for
-<<<<<<< HEAD
-example to separate a group of rows, you can use the [`table.hline`]($table.hline) and
-[`table.vline`]($table.vline) elements for horizontal and vertical lines, respectively. Add
-=======
 example to separate a group of rows, you can use the [`table.hline`] and
 [`table.vline`] elements for horizontal and vertical lines, respectively. Add
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 them to the argument list of the `table` function just like you would add
 individual cells and a header.
 
@@ -820,15 +799,9 @@ calendar.
 >>>
 >>> #show table.cell.where(y: 0): strong
 #set table(stroke: (x, y) => (
-<<<<<<< HEAD
-  left: if x == 0 or y > 0 { 1pt } else { 0pt },
-  right: 1pt,
-  top: if y <= 1 { 1pt } else { 0pt },
-=======
   left: if x == 0 or y > 0 { 1pt } else { 0pt },
   right: 1pt,
   top: if y <= 1 { 1pt } else { 0pt },
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
   bottom: 1pt,
 ))
 
@@ -884,19 +857,11 @@ rows, since it is the last entry in the array.
 You can use multiple mechanisms to align the content in your table. You can
 either use the `table` function's `align` argument to set the alignment for your
 whole table (or use it in a set rule to set the alignment for tables throughout
-<<<<<<< HEAD
-your document) or the [`align`]($align) function (or `table.cell`'s `align` argument) to
-override the alignment of a single cell.
-
-When using the `table` function's align argument, you can choose between three
-methods to specify an [alignment]($alignment):
-=======
 your document) or the [`align`] function (or `table.cell`'s `align` argument) to
 override the alignment of a single cell.
 
 When using the `table` function's align argument, you can choose between three
 methods to specify an [alignment]:
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 
 - Just specify a single alignment like `right` (aligns in the top-right corner)
   or `center + horizon` (centers all cell content). This changes the alignment
@@ -970,11 +935,7 @@ you can group for example a sales data table by quarter in the first row and by
 months in the second row.
 
 A merged cell spans multiple rows and/or columns. You can achieve it with the
-<<<<<<< HEAD
-[`table.cell`]($table.cell) function's `rowspan` and `colspan` arguments: Just specify how
-=======
 [`table.cell`] function's `rowspan` and `colspan` arguments: Just specify how
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 many rows or columns you want your cell to span.
 
 The example below contains an attendance calendar for an office with in-person
@@ -1075,11 +1036,7 @@ on the right of the table.
     inset: (x: 0.6em,),
     stroke: (_, y) => (
       x: 1pt,
-<<<<<<< HEAD
-      top: if y <= 1 { 1pt } else { 0pt },
-=======
       top: if y <= 1 { 1pt } else { 0pt },
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
       bottom: 1pt,
     ),
     align: (left, right, right, right, right, left),
@@ -1132,11 +1089,7 @@ upright:
     inset: (x: 0.6em,),
     stroke: (_, y) => (
       x: 1pt,
-<<<<<<< HEAD
-      top: if y <= 1 { 1pt } else { 0pt },
-=======
       top: if y <= 1 { 1pt } else { 0pt },
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
       bottom: 1pt,
     ),
     align: (left, right, right, right, right, left),
@@ -1163,38 +1116,22 @@ upright:
 ```
 
 Here, we take the same table and the other content we want to set with it and
-<<<<<<< HEAD
-put it into a call to the [`page`]($page) function while supplying `{true}` to the
-`flipped` argument. This will instruct Typst to create new pages with width and
-height swapped and place the contents of the function call onto a new page.
-Notice how the page number is also on the long edge of the paper now. At the
-bottom of the page, we use the [`pad`]($pad) function to constrain the width of the
-=======
 put it into a call to the [`page`] function while supplying `{true}` to the
 `flipped` argument. This will instruct Typst to create new pages with width and
 height swapped and place the contents of the function call onto a new page.
 Notice how the page number is also on the long edge of the paper now. At the
 bottom of the page, we use the [`pad`] function to constrain the width of the
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 paragraph to achieve a nice and legible line length.
 
 ## How to break a table across pages? { #table-across-pages }
 It is best to contain a table on a single page. However, some tables just have
 many rows, so breaking them across pages becomes unavoidable. Fortunately, Typst
 supports breaking tables across pages out of the box. If you are using the
-<<<<<<< HEAD
-[`table.header`]($table.header) and [`table.footer`]($table.footer) functions, their contents will be repeated
-on each page as the first and last rows, respectively. If you want to disable
-this behavior, you can set `repeat` to `{false}` on either of them.
-
-If you have placed your table inside of a [figure]($figure), it becomes unable to break
-=======
 [`table.header`] and [`table.footer`] functions, their contents will be repeated
 on each page as the first and last rows, respectively. If you want to disable
 this behavior, you can set `repeat` to `{false}` on either of them.
 
 If you have placed your table inside of a [figure], it becomes unable to break
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 across pages by default. However, you can change this behavior. Let's take a
 look:
 
@@ -1224,11 +1161,7 @@ look:
 )
 ```
 
-<<<<<<< HEAD
-A figure automatically produces a [block]($block) which cannot break by default.
-=======
 A figure automatically produces a [block] which cannot break by default.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 However, we can reconfigure the block of the figure using a show rule to make it
 `breakable`. Now, the figure spans multiple pages with the headers and footers
 repeating.
@@ -1267,11 +1200,7 @@ whom the metric applies), Code, the year, and the number of transistors per
 microprocessor. Only the last two columns change between each row, so we can
 disregard "Entity" and "Code".
 
-<<<<<<< HEAD
-First, let's start by loading this file with the [`csv`]($csv) function. It accepts
-=======
 First, let's start by loading this file with the [`csv`] function. It accepts
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 the file name of the file we want to load as a string argument:
 
 ```typ
@@ -1327,22 +1256,6 @@ style:
 #let moore = csv("moore.csv")
 
 #table(
-<<<<<<< HEAD
-   columns: moore.first().len(),
-   ..moore.map(m => m.slice(2)).flatten(),
-)
-```
-
-This example renders the same as the previous one, but first uses the `map`
-function to change each row of the data. We pass a function to map that gets run
-on each row of the CSV and returns a new value to replace that row with. We use
-it to discard the first two columns with `slice`. Then, we spread the data into
-the `table` function. However, we need to pass a one-dimensional array and
-`moore`'s value is two-dimensional (that means that each of its row values
-contains an array with the cell data). That's why we call `flatten` which
-converts it to a one-dimensional array. We also extract the number of columns
-from the data itself.
-=======
    columns: 2,
    ..moore.map(m => m.slice(2, 4)).flatten(),
 )
@@ -1358,7 +1271,6 @@ The `flatten` function converts this nested structure into a one-dimensional
 array, which is required when spreading the data into the `table` function.
 Finally, we explicitly specify `{columns: 2}` because we are keeping exactly two
 columns from each row.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 
 Now that we have nice code for our table, we should try to also make the table
 itself nice! The transistor counts go from millions in 1995 to trillions in 2021
@@ -1414,28 +1326,17 @@ cells itself conveys information.
 To make this difference clear to other software and allow templates to heavily
 style tables, Typst has two functions for grid and table layout:
 
-<<<<<<< HEAD
-- The [`table`]($table) function explained throughout this guide which is intended for
-  tabular data.
-- The [`grid`]($grid) function which is intended for presentational purposes and page
-=======
 - The [`table`] function explained throughout this guide which is intended for
   tabular data.
 - The [`grid`] function which is intended for presentational purposes and page
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
   layout.
 
 Both elements work the same way and have the same arguments. You can apply
 everything you have learned about tables in this guide to grids. There are only
 three differences:
 
-<<<<<<< HEAD
-- You'll need to use the [`grid.cell`]($grid.cell), [`grid.vline`]($grid.vline), and [`grid.hline`]($grid.hline)
-  elements instead of [`table.cell`]($table.cell), [`table.vline`]($table.vline), and [`table.hline`]($table.hline).
-=======
 - You'll need to use the [`grid.cell`], [`grid.vline`], and [`grid.hline`]
   elements instead of [`table.cell`], [`table.vline`], and [`table.hline`].
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 - The grid has different defaults: It draws no strokes by default and has no
   spacing (`inset`) inside of its cells.
 - Elements like `figure` do not react to grids since they are supposed to have
diff --git a/docs/guides/welcome.md b/docs/guides/welcome.md
index 7545341aad..ababcac570 100644
--- a/docs/guides/welcome.md
+++ b/docs/guides/welcome.md
@@ -1,5 +1,4 @@
 ---
-<<<<<<< HEAD
 description: Typstのガイドです。
 ---
 
@@ -11,18 +10,3 @@ description: Typstのガイドです。
 - [ページ設定ガイド]($guides/page-setup)
 - [表ガイド]($guides/tables)
 - [アクセシビリティガイド]($guides/accessibility)
-=======
-description: Guides for Typst.
----
-
-# Guides
-Welcome to the Guides section! Here, you'll find helpful material for specific
-user groups or use cases. Please see the list below for the available guides.
-Feel free to propose other topics for guides!
-
-## List of Guides
-- [Guide for LaTeX Users]($guides/for-latex-users)
-- [Page Setup Guide]($guides/page-setup)
-- [Table Guide]($guides/tables)
-- [Accessibility Guide]($guides/accessibility)
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
diff --git a/docs/overview.md b/docs/overview.md
index 3ebb9ad8e8..28bbdf3549 100644
--- a/docs/overview.md
+++ b/docs/overview.md
@@ -1,6 +1,5 @@
 ---
 description: |
-<<<<<<< HEAD
   Typstで素早く文書を作成する方法について学びましょう。お手軽なチュートリアルも、詳しく調べられるリファレンスもあります。
 ---
 
@@ -17,21 +16,3 @@ Typstは、学術用途のために新たに生まれたマークアップベー
 このドキュメントは、2つの部分に分かれています：実際の使用例を通じてTypstの使い方を学べる、初心者にやさしいチュートリアル。そして、Typstのあらゆる仕様・機能を扱った包括的なリファレンスです。
 
 また、私たちが開いたTypstの関連コミュニティにもぜひご参加ください。Typstはまだ出来て間もないプロジェクトであるため、皆さんからのフィードバックが非常に貴重なのです。
-=======
-  Learn how to use Typst to compose documents faster. Get started with the
-  tutorial, or dive into the reference.
----
-
-# Overview
-Welcome to Typst's documentation! Typst is a new markup-based typesetting system
-for the sciences. It is designed to be an alternative both to advanced tools
-like LaTeX and simpler tools like Word and Google Docs. Our goal with Typst is
-to build a typesetting tool that is highly capable _and_ a pleasure to use.
-
-This documentation is split into two parts: A beginner-friendly tutorial that
-introduces Typst through a practical use case and a comprehensive reference that
-explains all of Typst's concepts and features.
-
-We also invite you to join the community we're building around Typst. Typst is
-still a very young project, so your feedback is more than valuable.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
diff --git a/docs/reference/export/html.md b/docs/reference/export/html.md
index b5db544cb6..241174a219 100644
--- a/docs/reference/export/html.md
+++ b/docs/reference/export/html.md
@@ -1,6 +1,5 @@
 <div class="info-box">
 
-<<<<<<< HEAD
 TypstのHTMLエクスポートは現在積極的に開発されています。
 この機能はまだ非常に不完全であり、機能フラグを有効にした場合のみ、実験目的で利用可能です。
 本番環境における利用ではこの機能を使用しないでください。
@@ -60,64 +59,3 @@ CSSを自動的に出力するオプションを提供する予定です。
 # HTML固有の機能
 Typstでは、グローバルな`html`モジュールを通じてHTMLに固有の機能を提供しています。
 そのモジュールに含まれる定義については、以下を参照してください。
-=======
-Typst's HTML export is currently under active development. The feature is still
-very incomplete and only available for experimentation behind a feature flag. Do
-not use this feature for production use cases. In the CLI, you can experiment
-with HTML export by passing `--features html` or setting the `TYPST_FEATURES`
-environment variables to `html`. In the web app, HTML export is not available at
-this time. Visit the [tracking issue](https://github.com/typst/typst/issues/5512)
-to follow progress on HTML export and learn more about planned features.
-</div>
-
-HTML files describe a document structurally. The aim of Typst's HTML export is
-to capture the structure of an input document and produce semantically rich HTML
-that retains this structure. The resulting HTML should be accessible,
-human-readable, and editable by hand and downstream tools.
-
-PDF, PNG, and SVG export, in contrast, all produce _visual_ representations of a
-fully-laid out document. This divergence in the formats' intents means that
-Typst cannot simply produce perfect HTML for your existing Typst documents. It
-cannot always know what the best semantic HTML representation of your content
-is.
-
-Instead, it gives _you_ full control: You can check the current export format
-through the [`target`] function and when it is set to HTML, generate [raw HTML
-elements]($html.elem). The primary intended use of these elements is in
-templates and show rules. This way, the document's contents can be fully
-agnostic to the export target and content can be shared between PDF and HTML
-export.
-
-Currently, Typst will always output a single HTML file. Support for outputting
-directories with multiple HTML documents and assets, as well as support for
-outputting fragments that can be integrated into other HTML documents is
-planned.
-
-Typst currently does not output CSS style sheets, instead focussing on emitting
-semantic markup. You can of course write your own CSS styles and still benefit
-from sharing your _content_ between PDF and HTML. For the future, we plan to
-give you the option of automatically emitting CSS, taking more of your existing
-set rules into account.
-
-# Exporting as HTML
-## Command Line
-Pass `--format html` to the `compile` or `watch` subcommand or provide an output
-file name that ends with `.html`. Note that you must also pass `--features html`
-or set `TYPST_FEATURES=html` to enable this experimental export target.
-
-When using `typst watch`, Typst will spin up a live-reloading HTTP server. You
-can configure it as follows:
-
-- Pass `--port` to change the port. (Defaults to the first free port in the
-  range 3000-3005.)
-- Pass `--no-reload` to disable injection of a live reload script. (The HTML
-  that is written to disk isn't affected either way.)
-- Pass `--no-serve` to disable the server altogether.
-
-## Web App
-Not currently available.
-
-# HTML-specific functionality
-Typst exposes HTML-specific functionality in the global `html` module. See below
-for the definitions it contains.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
diff --git a/docs/reference/export/pdf.md b/docs/reference/export/pdf.md
index 10d437e566..56e91127db 100644
--- a/docs/reference/export/pdf.md
+++ b/docs/reference/export/pdf.md
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 PDFファイルは文書を視覚的に正確な形で記述することに重点を置いていますが、文書構造に注釈をつける機能も備えています。
 このハイブリッドなアプローチにより、
 PDFファイルは文書交換に適した形式となっています。
@@ -204,244 +203,3 @@ Typstでは、グローバルな`pdf`モジュールを通じてPDFに特化し
 これらの関数は全て、将来のTypstのリリースにおいて、表関数に統合されるか、または完全に削除される予定です。
 これらの関数を有効にするには、`--features a11y-extras`を渡すか、環境変数`TYPST_FEATURES`を`a11y-extras`に設定します。
 現在、Webアプリではこれらの機能は利用できません。
-=======
-PDF files focus on accurately describing documents visually, but also have
-facilities for annotating their structure. This hybrid approach makes
-them a good fit for document exchange: They render exactly the same on every
-device, but also support extraction of a document's content and structure (at
-least to an extent). Unlike PNG files, PDFs are not bound to a specific
-resolution. Hence, you can view them at any size without incurring a loss of
-quality.
-
-# Exporting as PDF
-## Command Line
-PDF is Typst's default export format. Running the `compile` or `watch`
-subcommand without specifying a format will create a PDF. When exporting to PDF,
-you have the following configuration options:
-
-- Which [PDF standards](#pdf-standards) Typst should enforce conformance with by
-  specifying `--pdf-standard` followed by one or multiple comma-separated
-  standards. Valid standards are `1.4`, `1.5`, `1.6`, `1.7`, `2.0`, `a-1b`,
-  `a-1a`, `a-2b`, `a-2u`, `a-2a`, `a-3b`, `a-3u`, `a-3a`, `a-4`, `a-4f`, `a-4e`,
-  and `ua-1`. By default, Typst outputs PDF-1.7-compliant files.
-
-- You can disable PDF tagging completely with `--no-pdf-tags`. By default, Typst
-  will always write _Tagged PDF_ to provide a baseline level of accessibility.
-  Using this flag, you can turn tags off. This will make your file inaccessible
-  and prevent conformance with accessible conformance levels of PDF/A and all
-  parts of PDF/UA.
-
-- Which pages to export by specifying `--pages` followed by a comma-separated
-  list of numbers or dash-separated number ranges. Ranges can be half-open.
-  Example: `2,3,7-9,11-`.
-
-## Web App
-Click the quick download button at the top right to export a PDF with default
-settings. For further configuration, click "File" > "Export as" > "PDF" or click
-the downwards-facing arrow next to the quick download button and select "Export
-as PDF". When exporting to PDF, you have the following configuration options:
-
-- Which PDF standards Typst should enforce conformance with. By default, Typst
-  outputs PDF-1.7-compliant files. You can choose the PDF version freely between
-  1.4 and 2.0. Valid additional standards are `A-1b`, `A-1a`, `A-2b`, `A-2u`,
-  `A-2a`, `A-3b`. `A-3u`, `A-3a`, `A-4`, `A-4f`, `A-4e`, and `UA-1`.
-
-- Which pages to export. Valid options are "All pages", "Current page", and
-  "Custom ranges". Custom ranges are a comma-separated list of numbers or
-  dash-separated number ranges. Ranges can be half-open. Example: `2,3,7-9,11-`.
-
-# PDF standards
-The International Standards Organization (ISO) has published the base PDF
-standard and various standards that extend it to make PDFs more suitable for
-specific use-cases. By default, Typst exports PDF 1.7 files. Adobe Acrobat 8 and
-later as well as all other commonly used PDF viewers are compatible with this
-PDF version.
-
-Some features of Typst may not be available depending on the PDF standard you
-choose. You currently cannot choose both PDF/A and PDF/UA at the same time.
-
-## PDF versions
-Typst supports five different PDF versions: 1.4, 1.5, 1.6, 1.7 (default), and
-2.0. You can choose each of these versions for your document export. However,
-based on the features you used there may be a minimum version. Likewise, the
-standards you target can limit which versions you can choose (see below for
-more).
-
-Here is a list on how each new version improves over PDF 1.4 for Typst
-documents:
-
-- **PDF 1.5** (2003): Improved color management, text extraction, table
-  accessibility, reflow, and emoji fonts
-- **PDF 1.6** (2004): More flexible links
-- **PDF 1.7** (2006): Allows [attachments]($pdf.attach), improved reflow
-- **PDF 2.0** (2017): Improved both metadata and tag semantics for accessibility
-
-The software used to read your file must support your PDF version. Under normal
-circumstances, this poses no problem, but it can be a source of errors when
-working with older hardware. For general exchange, we recommend keeping the
-default PDF 1.7 setting or choosing PDF 2.0.
-
-When using PDF files as [images]($image) in your document, the export PDF
-version must equal or exceed the image file versions.
-
-## PDF/UA
-Typst supports writing PDF/UA-conformant files. PDF/UA files are designed
-for _[Universal Access]($guides/accessibility/#basics)._ When you choose this PDF
-standard, Typst will run additional checks when exporting your document. These
-checks will make sure that you are following accessibility best practices. For
-example, it will make sure that all your images come with alternative
-descriptions.
-
-Note that there are some rules in PDF/UA that are crucial for accessibility but
-cannot be automatically checked. Hence, when exporting a PDF/UA-1 document, make
-sure you did the following:
-
-- If your document is written in a different language than English, make sure
-  [set the text language]($text.lang) before any content.
-- Make sure to use Typst's semantic elements (like [headings]($heading),
-  [figures]($figure), and [lists]($list)) when appropriate instead of defining
-  custom constructs. This lets Typst know (and export) the role a construct
-  plays in the document. See [the Accessibility guide]($guides/accessibility)
-  for more details.
-- Do not exclusively use contrast, color, format, or layout to communicate an
-  idea. Use text or alternative descriptions instead of or in addition to these
-  elements.
-- Wrap all decorative elements without a semantic meaning in [`pdf.artifact`].
-- Do not use images of text. Instead, insert the text directly into your markup.
-
-Typst currently only supports part one (PDF/UA-1) which is based on PDF 1.7
-(2006). When exporting to PDF/UA-1, be aware that you will need to manually
-provide [alternative descriptions of mathematics]($category/math/#accessibility)
-in natural language.
-
-New accessibility features were added to PDF 2.0 (2017). When set to PDF 2.0
-export, Typst will leverage some of these features. PDF 2.0 and PDF/UA-1,
-however, are mutually incompatible. For accessible documents, we currently
-recommend exporting to PDF/UA-1 instead of PDF 2.0 for the additional checks and
-greater compatibility. The second part of PDF/UA is designed for PDF 2.0, but
-not yet supported by Typst.
-
-## PDF/A
-Typst optionally supports emitting PDF/A-conformant files. PDF/A files are
-geared towards maximum compatibility with current and future PDF tooling. They
-do not rely on difficult-to-implement or proprietary features and contain
-exhaustive metadata. This makes them suitable for long-term archival.
-
-The PDF/A Standard has multiple versions (_parts_ in ISO terminology) and most
-parts have multiple profiles that indicate the file's conformance level. You can
-target one part and conformance level at a time. Currently, Typst supports these
-PDF/A output profiles:
-
-- **PDF/A-1b:** The _basic_ conformance level of ISO 19005-1. This version of
-  PDF/A is based on PDF 1.4 (2001) and results in self-contained, archivable PDF
-  files. As opposed to later parts of the PDF/A standard, transparency is not
-  allowed in PDF/A-1 files.
-
-- **PDF/A-1a:** This is the _accessible_ conformance level that builds on the
-  basic level PDF/A-1b. To conform to this level, your file must be an
-  accessible _Tagged PDF_ file. Note that accessibility is improved with later
-  parts as not all PDF accessibility features are available for PDF 1.4 files.
-  Furthermore, all text in the file must consist of known Unicode code points.
-
-- **PDF/A-2b:** The _basic_ conformance level of ISO 19005-2. This version of
-  PDF/A is based on PDF 1.7 (2006) and results in self-contained, archivable PDF
-  files.
-
-- **PDF/A-2u:** This is the _Unicode-mappable_ conformance level that builds on
-  the basic level A-2b. It also adds rules that all text in the document must
-  consist of known Unicode code points. If possible, always prefer this standard
-  over PDF/A-2b.
-
-- **PDF/A-2a:** This is the _accessible_ conformance level that builds on the
-  Unicode-mappable level A-2u. This conformance level also adds two
-  requirements: Your file must be an accessible _Tagged PDF_ file. Typst
-  automatically adds tags to help you reach this conformance level. Also pay
-  attention to the Accessibility Sections throughout the reference and the
-  [Accessibility Guide]($guides/accessibility) when targeting this conformance
-  level. Finally, PDF/A-2a forbids you from using code points in the [Unicode
-  Private Use area](https://en.wikipedia.org/wiki/Private_Use_Areas). If you
-  want to build an accessible file, also consider additionally targeting
-  PDF/UA-1, which enables more automatic accessibility checks.
-
-- **PDF/A-3b:** The _basic_ conformance level of ISO 19005-3. This version of
-  PDF/A is based on PDF 1.7 (2006) and results in archivable PDF files that can
-  contain arbitrary other related files as [attachments]($pdf.attach). The only
-  difference between it and PDF/A-2b is the capability to attach
-  non-PDF/A-conformant files.
-
-- **PDF/A-3u:** This is the _Unicode-mappable_ conformance level that builds on
-  the basic level A-3b. Just like PDF/A-2b, this requires all text to consist
-  of known Unicode code points. These rules do not apply to attachments. If
-  possible, always prefer this standard over PDF/A-3b.
-
-- **PDF/A-3a:** This is the _accessible_ conformance level that builds on the
-  Unicode-mappable level A-3u. Just like PDF/A-2a, this requires files to be
-  accessible _Tagged PDF_ and to not use characters from the Unicode Private Use
-  area. Just like before, these rules do not apply to attachments.
-
-- **PDF/A-4:** The basic conformance level of ISO 19005-4. This version of PDF/A
-  is based on PDF 2.0 (2017) and results in self-contained, archivable PDF
-  files. PDF/A-4 has no parts relating to accessibility. Instead, the topic has
-  been elaborated on more in the dedicated PDF/UA standard. PDF/A-4 files can
-  conform to PDF/UA-2 (currently not supported in Typst).
-
-- **PDF/A-4f:** The _embedded files_ conformance level that builds on the basic
-  level A-4. Files conforming to this level can contain arbitrary other related
-  files as [attachments]($pdf.attach), just as files conforming to part 3 of ISO
-  19005. The only difference between it and PDF/A-4 is the capability to attach
-  non-PDF/A-conformant files.
-
-- **PDF/A-4e:** The _engineering_ conformance level that builds on the embedded
-  files level A-4f. Files conforming to this level can contain 3D objects. Typst
-  does not support 3D content, so this is functionally equivalent to PDF/A-4f
-  from a Typst perspective.
-
-If you want to target PDF/A but are unsure about which particular setting to
-use, there are some good rules of thumb. First, you must determine your
-**part,** that's the "version number" of the standard. Ask yourself these
-questions:
-
-1. **Does pre-2006 software or equipment need to be able to read my file?** If
-   so, choose part one (PDF/A-1).
-
-2. **If not, does my file need [attachments]($pdf.attach)?** If so, you must
-   choose part three (PDF/A-3) or the embedded files level of part four
-   (PDF/A-4f).
-
-3. **Does your file need to use features introduced in PDF 2.0?** Currently, use
-   of PDF 2.0 features in Typst is limited to minor improvements in
-   accessibility, e.g. for the [title element]($title). If you can do without
-   these improvements, maximize compatibility by choosing part two (when you
-   don't need attachments) or part three (when you do need attachments). If you
-   rely on PDF 2.0 features, use part four.
-
-Now, you only need to choose a **conformance level** (the lowercase letter at
-the end).
-
-- **If you decided on part one, two, or three,** you should typically choose the
-  accessible conformance level of your part, indicated by a lowercase `a` at the
-  end. If your document is inherently inaccessible, e.g. an artist's portfolio
-  that cannot be boiled down to alternative descriptions, choose conformance
-  level `u` instead. Only if this results in a compiler error, e.g. because you
-  used code points from the Unicode Private Use Area, use the basic level `b`.
-
-- **If you have chosen part four,** you should choose the basic conformance
-  level (PDF/A-4) except when needing to embed files.
-
-When choosing between exporting PDF/A and regular PDF, keep in mind that PDF/A
-files contain additional metadata, and that some readers will prevent the user
-from modifying a PDF/A file.
-
-# PDF-specific functionality
-Typst exposes PDF-specific functionality in the global `pdf` module. See below
-for the definitions it contains.
-
-This module contains some functions without a final API. They are designed to
-enhance accessibility for documents with complex tables. This includes
-[`table-summary`]($pdf.table-summary), [`header-cell`]($pdf.header-cell), and
-[`data-cell`]($pdf.data-cell). All of these functions will be removed in a
-future Typst release, either through integration into table functions or through
-full removal. You can enable these functions by passing `--features a11y-extras`
-or setting the `TYPST_FEATURES` environment variable to `a11y-extras`. In the
-web app, these features are not available at this time.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
diff --git a/docs/reference/export/png.md b/docs/reference/export/png.md
index e9032d4a2a..4d2bed8d49 100644
--- a/docs/reference/export/png.md
+++ b/docs/reference/export/png.md
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 PDFを作成する代わりに、Typstはページを直接PNG形式のラスター画像にもレンダリングできます。
 PNGは可逆圧縮の画像形式で、1枚に1ページを含むことができます。
 複数ページの文書をエクスポートする場合、Typstは複数のPNGを出力します。
@@ -60,66 +59,3 @@ PNG形式でエクスポートする際には、以下の設定項目を指定
 - エクスポートするページ。有効なオプションは「All pages（全てのページ）」、「Current page（現在のページ）」、および「Custom ranges（カスタム範囲）」です。
   カスタム範囲は、カンマ区切りの番号リストまたはダッシュで区切られた番号範囲です。
   範囲は半開区間にもできます。例：`2,3,7-9,11-`。
-=======
-Instead of creating a PDF, Typst can also directly render pages to PNG raster
-graphics. PNGs are losslessly compressed images that can contain one page at a
-time. When exporting a multi-page document, Typst will emit multiple PNGs. PNGs
-are a good choice when you want to use Typst's output in an image editing
-software or when you can use none of Typst's other export formats.
-
-In contrast to Typst's other export formats, PNGs are bound to a specific
-resolution. When exporting to PNG, you can configure the resolution as pixels
-per inch (PPI). If the medium you view the PNG on has a finer resolution than
-the PNG you exported, you will notice a loss of quality. Typst calculates the
-resolution of your PNGs based on each page's physical dimensions and the PPI. If
-you need guidance for choosing a PPI value, consider the following:
-
-- A value of 300 or 600 is typical for desktop printing.
-- Professional prints of detailed graphics can go up to 1200 PPI.
-- If your document is only viewed at a distance, e.g. a poster, you may choose a
-  smaller value than 300.
-- If your document is viewed on screens, a typical PPI value for a smartphone is
-  400-500.
-
-Because PNGs only contain a pixel raster, the text within cannot be extracted
-automatically (without OCR), for example by copy/paste or a screen reader. If
-you need the text to be accessible, export a PDF or HTML file instead.
-
-PNGs can have transparent backgrounds. By default, Typst will output a PNG with
-an opaque white background. You can make the background transparent using
-`[#set page(fill: none)]`. Learn more on the
-[`page` function's reference page]($page.fill).
-
-# Exporting as PNG
-## Command Line
-Pass `--format png` to the `compile` or `watch` subcommand or provide an output
-file name that ends with `.png`.
-
-If your document has more than one page, Typst will create multiple image files.
-The output file name must then be a template string containing at least one of
-- `[{p}]`, which will be replaced by the page number
-- `[{0p}]`, which will be replaced by the zero-padded page number (so that all
-  numbers have the same length)
-- `[{t}]`, which will be replaced by the total number of pages
-
-When exporting to PNG, you have the following configuration options:
-
-- Which resolution to render at by specifying `--ppi` followed by a number of
-  pixels per inch. The default is `144`.
-
-- Which pages to export by specifying `--pages` followed by a comma-separated
-  list of numbers or dash-separated number ranges. Ranges can be half-open.
-  Example: `2,3,7-9,11-`.
-
-## Web App
-Click "File" > "Export as" > "PNG" or click the downwards-facing arrow next to
-the quick download button and select "Export as PNG". When exporting to PNG, you
-have the following configuration options:
-
-- The resolution at which the pages should be rendered, as a number of pixels
-  per inch. The default is `144`.
-
-- Which pages to export. Valid options are "All pages", "Current page", and
-  "Custom ranges". Custom ranges are a comma-separated list of numbers or
-  dash-separated number ranges. Ranges can be half-open. Example: `2,3,7-9,11-`.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
diff --git a/docs/reference/export/svg.md b/docs/reference/export/svg.md
index e5ba638786..5024dc5992 100644
--- a/docs/reference/export/svg.md
+++ b/docs/reference/export/svg.md
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 PDFを出力する代わりに、Typstはページを直接スケーラブル・ベクター・グラフィックス（SVG）としてもレンダリングできます。
 これは、ウェブページにベクターグラフィックスを埋め込むための推奨される形式です。
 PDFファイルと同様に、SVGはTypstでレイアウトした通りに文書を表示します。
@@ -47,53 +46,3 @@ SVG形式でエクスポートする際には、以下の設定項目を指定
 - エクスポートするページ。有効なオプションは「All pages（全てのページ）」、「Current page（現在のページ）」、および「Custom ranges（カスタム範囲）」です。
   カスタム範囲は、カンマ区切りの番号リストまたはダッシュで区切られた番号範囲です。
   範囲は半開区間にもできます。例：`2,3,7-9,11-`。
-=======
-Instead of creating a PDF, Typst can also directly render pages to scalable
-vector graphics (SVGs), which are the preferred format for embedding vector
-graphics in web pages. Like PDF files, SVGs display your document exactly how
-you have laid it out in Typst. Likewise, they share the benefit of not being
-bound to a specific resolution. Hence, you can print or view SVG files on any
-device without incurring a loss of quality. (Note that font printing quality may
-be better with a PDF.) In contrast to a PDF, an SVG cannot contain multiple
-pages. When exporting a multi-page document, Typst will emit multiple SVGs.
-
-SVGs can represent text in two ways: By embedding the text itself and rendering
-it with the fonts available on the viewer's computer or by embedding the shapes
-of each glyph in the font used to create the document. To ensure that the SVG
-file looks the same across all devices it is viewed on, Typst chooses the latter
-method. This means that the text in the SVG cannot be extracted automatically,
-for example by copy/paste or a screen reader. If you need the text to be
-accessible, export a PDF or HTML file instead.
-
-SVGs can have transparent backgrounds. By default, Typst will output an SVG with
-an opaque white background. You can make the background transparent using
-`[#set page(fill: none)]`. Learn more on the
-[`page` function's reference page]($page.fill).
-
-# Exporting as SVG
-## Command Line
-Pass `--format svg` to the `compile` or `watch` subcommand or provide an output
-file name that ends with `.svg`.
-
-If your document has more than one page, Typst will create multiple image files.
-The output file name must then be a template string containing at least one of
-- `[{p}]`, which will be replaced by the page number
-- `[{0p}]`, which will be replaced by the zero-padded page number (so that all
-  numbers have the same length)
-- `[{t}]`, which will be replaced by the total number of pages
-
-When exporting to SVG, you have the following configuration options:
-
-- Which pages to export by specifying `--pages` followed by a comma-separated
-  list of numbers or dash-separated number ranges. Ranges can be half-open.
-  Example: `2,3,7-9,11-`.
-
-## Web App
-Click "File" > "Export as" > "SVG" or click the downwards-facing arrow next to
-the quick download button and select "Export as SVG". When exporting to SVG, you
-have the following configuration options:
-
-- Which pages to export. Valid options are "All pages", "Current page", and
-  "Custom ranges". Custom ranges are a comma-separated list of numbers or
-  dash-separated number ranges. Ranges can be half-open. Example: `2,3,7-9,11-`.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
diff --git a/docs/reference/groups.yml b/docs/reference/groups.yml
index c9d68b0cea..5fceff6857 100644
--- a/docs/reference/groups.yml
+++ b/docs/reference/groups.yml
@@ -7,16 +7,9 @@
   path: ["math"]
   filter: ["serif", "sans", "frak", "mono", "bb", "cal", "scr"]
   details: |
-<<<<<<< HEAD
     数式中の別書体。
 
     数式フォントには各文字に対して複数の書体・字体のバリエーションが用意されているため、これらの関数は[`text`]関数とは異なります。
-=======
-    Alternate typefaces within formulas.
-
-    These functions are distinct from the [`text`] function because math fonts
-    contain multiple variants of each letter.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 
 - name: styles
   title: Styles
@@ -24,16 +17,9 @@
   path: ["math"]
   filter: ["upright", "italic", "bold"]
   details: |
-<<<<<<< HEAD
     数式中の別字体。
 
     数式フォントには各文字に対して複数の書体・字体のバリエーションが用意されているため、これらの関数は[`text`]関数とは異なります。
-=======
-    Alternate letterforms within formulas.
-
-    These functions are distinct from the [`text`] function because math fonts
-    contain multiple variants of each letter.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 
 - name: sizes
   title: Sizes
@@ -41,17 +27,9 @@
   path: ["math"]
   filter: ["display", "inline", "script", "sscript"]
   details: |
-<<<<<<< HEAD
     数式中の式に大きさに関するスタイルを強制します。
 
     これらの関数を用いると、数式要素の大きさを、ブロック/インライン数式中や、根号、下付き文字、上付き文字の中で使われているかのようなものに手動で設定できます。
-=======
-    Forced size styles for expressions within formulas.
-
-    These functions allow manual configuration of the size of equation elements
-    to make them look as in a display/inline equation or as if used in a root or
-    sub/superscripts.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 
 - name: underover
   title: Under/Over
@@ -70,16 +48,9 @@
     "overshell",
   ]
   details: |
-<<<<<<< HEAD
     数式の一部の上部または下部の区切り文字。
 
     波括弧や角括弧を用いると、それら自身の上部または下部にオプションの注釈を追加できます。
-=======
-    Delimiters above or below parts of an equation.
-
-    The braces and brackets further allow you to add an optional annotation
-    below or above themselves.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 
 - name: roots
   title: Roots
@@ -87,15 +58,9 @@
   path: ["math"]
   filter: ["root", "sqrt"]
   details: |
-<<<<<<< HEAD
     平方根とその他の冪根。
 
     # 例
-=======
-    Square and non-square roots.
-
-    # Example
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     ```example
     $ sqrt(3 - 2 sqrt(2)) = sqrt(2) - 1 $
     $ root(3, x) $
@@ -107,7 +72,6 @@
   path: ["math"]
   filter: ["attach", "scripts", "limits"]
   details: |
-<<<<<<< HEAD
     下付き文字、上付き文字、limits。
 
     アタッチメントは下付き文字、上付き文字、limitsのいずれかで表示できます。
@@ -116,33 +80,13 @@
     上部と下部の長いアタッチメント（例えば上部に文字がある矢印）に合うようにベースを伸縮させたい場合は[`stretch`]($math.stretch)関数を使用してください。
 
     # 例
-=======
-    Subscript, superscripts, and limits.
-
-    Attachments can be displayed either as sub/superscripts, or limits. Typst
-    automatically decides which is more suitable depending on the base, but you
-    can also control this manually with the `scripts` and `limits` functions.
-
-    If you want the base to stretch to fit long top and bottom attachments (for
-    example, an arrow with text above it), use the [`stretch`]($math.stretch)
-    function.
-
-    # Example
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     ```example
     $ sum_(i=0)^n a_i = 2^(1+i) $
     ```
 
-<<<<<<< HEAD
     # 構文
     この関数にはベースの後ろのアタッチメントのための専用の構文があります。
     下付き文字、すなわち下部のアタッチメントにはアンダースコア（`_`）を、上付き文字、すなわち上部のアタッチメントにはサーカムフレックス（`^`）を使用してください。
-=======
-    # Syntax
-    This function also has dedicated syntax for attachments after the base: Use
-    the underscore (`_`) to indicate a subscript i.e. bottom attachment and the
-    hat (`^`) to indicate a superscript i.e. top attachment.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 
 - name: lr
   title: Left/Right
@@ -150,7 +94,6 @@
   path: ["math"]
   filter: ["lr", "mid", "abs", "norm", "floor", "ceil", "round"]
   details: |
-<<<<<<< HEAD
     区切り文字の対応。
 
     `lr`関数を用いると、2つの区切り文字を対応させ、内部のコンテンツにあわせて大きさを拡大縮小できます。
@@ -161,22 +104,6 @@
     あるいは自動的な拡大縮小自体を完全に無効化したい場合は、`{set math.lr(size: 1em)}`を使用してください。
 
     # 例
-=======
-    Delimiter matching.
-
-    The `lr` function allows you to match two delimiters and scale them with the
-    content they contain. While this also happens automatically for delimiters
-    that match syntactically, `lr` allows you to match two arbitrary delimiters
-    and control their size exactly. Apart from the `lr` function, Typst provides
-    a few more functions that create delimiter pairings for absolute, ceiled,
-    and floored values as well as norms.
-
-    To prevent a delimiter from being matched by Typst, and thus auto-scaled,
-    escape it with a backslash. To instead disable auto-scaling completely, use
-    `{set math.lr(size: 1em)}`.
-
-    # Example
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     ```example
     $ [a, b/2] $
     $ lr(]sum_(x=1)^n], size: #50%) x $
@@ -191,25 +118,14 @@
   category: foundations
   path: ["calc"]
   details: |
-<<<<<<< HEAD
     数値の計算と処理を行うためのモジュール。
 
     これらの定義は`calc`モジュールの一部であり、デフォルトではインポートされません。
     以下に挙げる関数のほかに、`calc`モジュールは定数`pi`、`tau`、`e`、および`inf`
     を定義しています。
 
-- name: std
-  title: Standard library
-=======
-    Module for calculations and processing of numeric values.
-
-    These definitions are part of the `calc` module and not imported by default.
-    In addition to the functions listed below, the `calc` module also defines
-    the constants `pi`, `tau`, `e`, and `inf`.
-
 - name: std
   title: Standard Library
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
   category: foundations
   path: ["std"]
   details: |
@@ -322,20 +238,11 @@
     # Example
     ```typ
     #html.video(
-<<<<<<< HEAD
-      controls: true,
-      width: 1280,
-      height: 720,
-      src: "sunrise.mp4",
-    )[
-      Your browser does not support the video tag.
-=======
       controls: true,
       width: 1280,
       height: 720,
       src: "sunrise.mp4",
     )[
       Your browser does not support the video tag.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     ]
     ```
diff --git a/docs/reference/language/context.md b/docs/reference/language/context.md
index c3bf6b8ddd..27d03e4a8d 100644
--- a/docs/reference/language/context.md
+++ b/docs/reference/language/context.md
@@ -1,6 +1,5 @@
 ---
 description: |
-<<<<<<< HEAD
    文書内の位置に応じて反応するコンテンツの扱い方を説明します。
 ---
 
@@ -28,54 +27,14 @@ description: |
 setルールを使用すると、文書の一部または全体の書式のプロパティを調整できます。
 これらは文書の進行に伴って変更される可能性があるため、既知のコンテキストがなければアクセスできません。コンテキストが利用可能な場合、
 個別の要素関数のフィールドとして書式のプロパティにアクセスすることでこれらを簡単に取得できます。
-=======
-   How to deal with content that reacts to its location in the document.
----
-
-# Context
-Sometimes, we want to create content that reacts to its location in the
-document. This could be a localized phrase that depends on the configured text
-language or something as simple as a heading number which prints the right
-value based on how many headings came before it. However, Typst code isn't
-directly aware of its location in the document. Some code at the beginning of
-the source text could yield content that ends up at the back of the document.
-
-To produce content that is reactive to its surroundings, we must thus
-specifically instruct Typst: We do this with the `{context}` keyword, which
-precedes an expression and ensures that it is computed with knowledge of its
-environment. In return, the context expression itself ends up opaque. We cannot
-directly access whatever results from it in our code, precisely because it is
-contextual: There is no one correct result, there may be multiple results in
-different places of the document. For this reason, everything that depends on
-the contextual data must happen inside of the context expression.
-
-Aside from explicit context expressions, context is also established implicitly
-in some places that are also aware of their location in the document:
-[Show rules]($styling/#show-rules) provide context[^1] and numberings in the
-outline, for instance, also provide the proper context to resolve counters.
-
-## Style context
-With set rules, we can adjust style properties for parts or the whole of our
-document. We cannot access these without a known context, as they may change
-throughout the course of the document. When context is available, we can
-retrieve them simply by accessing them as fields on the respective element
-function.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 
 ```example
 #set text(lang: "de")
 #context text.lang
 ```
 
-<<<<<<< HEAD
 上記の説明の通り、コンテキスト式はそれが配置されるさまざまな環境に反応します。以下の例では、単一のコンテキスト式を作成し、それを `value` 変数に格納して複数回使用します。
 それぞれのコンテキスト式は、現在の環境に適切に反応します。
-=======
-As explained above, a context expression is reactive to the different
-environments it is placed into. In the example below, we create a single context
-expression, store it in the `value` variable and use it multiple times. Each use
-properly reacts to the current surroundings.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 
 ```example
 #let value = context text.lang
@@ -88,7 +47,6 @@ properly reacts to the current surroundings.
 #value
 ```
 
-<<<<<<< HEAD
 重要なのは、作成時に `value` は中身を覗くことができない不透明な [content]($content) になることです。それはどこかに配置されたときにのみ解決されます。なぜなら、そのときに初めてコンテキストが認識されるからです。コンテキスト式の本体は、それが配置される場所の数に応じて、0回、1回、または複数回評価される可能性があります。
 
 ## 位置コンテキスト {#location-context}
@@ -104,28 +62,6 @@ properly reacts to the current surroundings.
 この関数は、カウンターの値を解決するためにコンテキストから現在の位置にアクセスします。
 カウンターには複数のレベルがあり、`get`は解決された数値の配列を返します。
 したがって、以下の結果が得られます。
-=======
-Crucially, upon creation, `value` becomes opaque [content] that we cannot peek
-into. It can only be resolved when placed somewhere because only then the
-context is known. The body of a context expression may be evaluated zero, one,
-or multiple times, depending on how many different places it is put into.
-
-## Location context
-We've already seen that context gives us access to set rule values. But it can
-do more: It also lets us know _where_ in the document we currently are, relative
-to other elements, and absolutely on the pages. We can use this information to
-create very flexible interactions between different document parts. This
-underpins features like heading numbering, the table of contents, or page
-headers dependent on section headings.
-
-Some functions like [`counter.get`]($counter.get) implicitly access the current
-location. In the example below, we want to retrieve the value of the heading
-counter. Since it changes throughout the document, we need to first enter a
-context expression. Then, we use `get` to retrieve the counter's current value.
-This function accesses the current location from the context to resolve the
-counter value. Counters have multiple levels and `get` returns an array with the
-resolved numbers. Thus, we get the following result:
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 
 ```example
 #set heading(numbering: "1.")
@@ -141,27 +77,11 @@ resolved numbers. Thus, we get the following result:
 #context counter(heading).get()
 ```
 
-<<<<<<< HEAD
 より柔軟性を持たせるために、[`here`]($here) 関数を使用してコンテキストから直接現在の[location]($location) を抽出もできます。以下の例でこれを示します。
 
 - 最初に `{counter(heading).get()}` があり、これは先程のように `{(2,)}` に解決されます。
 - 次に、より強力な [`counter.at`]($counter.at) と [`here`]($here) を組み合わせて使用します。これは `get` と同等であるため `{(2,)}` が得られます。
 - 最後に、[label]($label) と組み合わせて `at` を使用して、文書内の_異なる_位置、つまり導入見出しの位置でカウンターの値を取得します。これにより `{(1,)}` が得られます。Typstのコンテキストシステムは、文書内の_任意の_位置でカウンターや状態の値を取得できるタイムトラベル能力を提供します。
-=======
-For more flexibility, we can also use the [`here`] function to directly extract
-the current [location] from the context. The example below
-demonstrates this:
-
-- We first have `{counter(heading).get()}`, which resolves to `{(2,)}` as
-  before.
-- We then use the more powerful  [`counter.at`] with [`here`], which in
-  combination is equivalent to `get`, and thus get `{(2,)}`.
-- Finally, we use `at` with a [label] to retrieve the value of the counter at a
-  _different_ location in the document, in our case that of the introduction
-  heading. This yields `{(1,)}`. Typst's context system gives us time travel
-  abilities and lets us retrieve the values of any counters and states at _any_
-  location in the document.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 
 ```example
 #set heading(numbering: "1.")
@@ -179,17 +99,9 @@ demonstrates this:
 ]
 ```
 
-<<<<<<< HEAD
 前述の通り、コンテキストを使用してページ上の要素の物理的位置も取得できます。
 これは、`counter.at` と同様に機能する [`locate`]($locate) 関数を使用して行います。
 この関数は一意の要素（ラベルでも可）に解決される位置または他の [selector]($selector) を取り、その要素のページ上の位置を返します。
-=======
-As mentioned before, we can also use context to get the physical position of
-elements on the pages. We do this with the [`locate`] function, which works
-similarly to `counter.at`: It takes a location or other [selector] that resolves
-to a unique element (could also be a label) and returns the position on the
-pages for that element.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 
 ```example
 Background is at: \
@@ -203,23 +115,12 @@ Background is at: \
 #lorem(5)
 ```
 
-<<<<<<< HEAD
 位置コンテキストを利用する関数は他にもありますが、最も顕著なのは [`query`]($query) です。
 これらの詳細については、[introspection]($category/introspection) カテゴリを参照してください。
 
 ## ネストされたコンテキスト {#nested-contexts}
 コンテキストは、コンテキストブロック内にネストされた関数呼び出しからもアクセス可能です。
 以下の例では、`foo` 自体が [`to-absolute`]($length.to-absolute) と同様のコンテキスト依存の関数になります。
-=======
-There are other functions that make use of the location context, most
-prominently [`query`]. Take a look at the
-[introspection]($category/introspection) category for more details on those.
-
-## Nested contexts
-Context is also accessible from within function calls nested in context blocks.
-In the example below, `foo` itself becomes a contextual function, just like
-[`to-absolute`]($length.to-absolute) is.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 
 ```example
 #let foo() = 1em.to-absolute()
@@ -228,20 +129,11 @@ In the example below, `foo` itself becomes a contextual function, just like
 }
 ```
 
-<<<<<<< HEAD
 コンテキストブロックはネストできます。
 この場合、コンテキスト依存のコードは常に最も内側のコンテキストにアクセスします。
 以下の例ではこれを示しています。最初の `text.lang` は外側のコンテキストブロックのスタイルにアクセスするため、
 `{set text(lang: "fr")}` の効果は**見られません**。
 しかし、2番目の `text.lang` の周りにあるネストされたコンテキストブロックはsetルールの後に始まるため、その効果が表示されます。
-=======
-Context blocks can be nested. Contextual code will then always access the
-innermost context. The example below demonstrates this: The first `text.lang`
-will access the outer context block's styles and as such, it will **not**
-see the effect of `{set text(lang: "fr")}`. The nested context block around the
-second `text.lang`, however, starts after the set rule and will thus show
-its effect.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 
 ```example
 #set text(lang: "de")
@@ -252,16 +144,7 @@ its effect.
 ]
 ```
 
-<<<<<<< HEAD
 なぜTypstが上記の例で最初の `text.lang` を計算する際にフランス語のsetルールを無視するのか疑問に思うかもしれません。その理由は、一般的な場合、setルールがコンテンツの構築後に適用される可能性があるため、Typstは適用される全てのスタイルを知ることができないからです。以下の例では、テンプレート関数が適用されるときに `text.lang` がすでに計算されています。そのため、Typstがテンプレート内のフランス語への言語変更に気づくことは不可能です。
-=======
-You might wonder why Typst ignores the French set rule when computing the first
-`text.lang` in the example above. The reason is that, in the general case, Typst
-cannot know all the styles that will apply as set rules can be applied to
-content after it has been constructed. Below, `text.lang` is already computed
-when the template function is applied. As such, it cannot possibly be aware of
-the language change to French in the template.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 
 ```example
 #let template(body) = {
@@ -277,21 +160,11 @@ the language change to French in the template.
 ]
 ```
 
-<<<<<<< HEAD
 しかし、2番目の `text.lang` は言語の変更に反応_します_。なぜなら、その周囲のコンテキストブロックの評価が、それに対するスタイルがわかるまで遅延されるからです。これは、正確なスタイルにアクセスできるよう、コンテキストにとって適切な挿入ポイントを選択することの重要性を示しています。
 
 同様のことが位置コンテキストにも当てはまります。
 以下の例では、最初の `{c.display()}` 呼び出しは外側のコンテキストブロックにアクセスするため、 `{c.update(2)}` の効果を見ることはできません。
 一方、2番目の `{c.display()}` は内部のコンテキストにアクセスするため、効果を見ることができます。
-=======
-The second `text.lang`, however, _does_ react to the language change because
-evaluation of its surrounding context block is deferred until the styles for it
-are known. This illustrates the importance of picking the right insertion point for a context to get access to precisely the right styles.
-
-The same also holds true for the location context. Below, the first
-`{c.display()}` call will access the outer context block and will thus not see
-the effect of `{c.update(2)}` while the second `{c.display()}` accesses the inner context and will thus see it.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 
 ```example
 #let c = counter("mycounter")
@@ -303,7 +176,6 @@ the effect of `{c.update(2)}` while the second `{c.display()}` accesses the inne
 ]
 ```
 
-<<<<<<< HEAD
 ## コンパイラの反復 {#compiler-iterations}
 コンテキスト依存の相互作用を解決するため、Typstのコンパイラは文書を複数回処理します。
 例えば、`locate` の呼び出しを解決するために、Typstはまずプレースホルダーの位置を提供し、文書をレイアウトし、レイアウト完了後に既知となった位置で再コンパイルします。
@@ -315,30 +187,3 @@ Typstが5回の試行で全てを解決できない場合、警告 "layout did n
 非常に注意深い読者の方は、上記で紹介した関数のうち、全ての関数が現在の位置を実際に使用しているわけではないことに気づいたかもしれません。`{counter(heading).get()}` は確かに現在の位置に依存していますが、例えば `{counter(heading).at(<intro>)}` についてはそうではありません。しかし、それでもコンテキストが必要です。その値は1つのコンパイラ反復内では常に同じですが、複数のコンパイラ反復の間に変化する可能性があります。もしこれをモジュールのトップレベルで直接呼び出すことができれば、モジュール全体とそのエクスポートは複数のコンパイラ反復の間に変化する可能性があり、それは望ましくありません。
 
 [^1]: 現在、全てのshowルールは[書式コンテキスト](#style-context)を提供しますが、[locatable]($location/#locatable)要素のshowルールのみが[位置コンテキスト](#location-context)を提供します。
-=======
-## Compiler iterations
-To resolve contextual interactions, the Typst compiler processes your document
-multiple times. For instance, to resolve a `locate` call, Typst first provides a
-placeholder position, layouts your document and then recompiles with the known
-position from the finished layout. The same approach is taken to resolve
-counters, states, and queries. In certain cases, Typst may even need more than
-two iterations to resolve everything. While that's sometimes a necessity, it may
-also be a sign of misuse of contextual functions (e.g. of
-[state]($state/#caution)). If Typst cannot resolve everything within five
-attempts, it will stop and output the warning "layout did not converge within 5
-attempts."
-
-A very careful reader might have noticed that not all of the functions presented
-above actually make use of the current location. While
-`{counter(heading).get()}` definitely depends on it,
-`{counter(heading).at(<intro>)}`, for instance, does not. However, it still
-requires context. While its value is always the same _within_ one compilation
-iteration, it may change over the course of multiple compiler iterations. If one
-could call it directly at the top level of a module, the whole module and its
-exports could change over the course of multiple compiler iterations, which
-would not be desirable.
-
-[^1]: Currently, all show rules provide [style context](#style-context), but
-      only show rules on [locatable]($location/#locatable) elements provide a
-      [location context](#location-context).
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
diff --git a/docs/reference/language/scripting.md b/docs/reference/language/scripting.md
index 55c303d8b9..5bd49cf41c 100644
--- a/docs/reference/language/scripting.md
+++ b/docs/reference/language/scripting.md
@@ -1,5 +1,4 @@
 ---
-<<<<<<< HEAD
 description: Typstのスクリプト記述機能を用いて、ドキュメントを自動化しましょう。
 ---
 
@@ -14,24 +13,6 @@ Typstでは、マークアップとコードが一体となっています。
 この式が終了すると通常のマークアップの解析が再開されます。
 式の直後に通常の文字列として解釈されるべき文字が続く場合、セミコロン（`;`）を使って式を強制的に終了できます。
 バックスラッシュで文字リテラルの`#`や`;`を[エスケープ]($syntax/#escapes)できます。
-=======
-description: Automate your document with Typst's scripting capabilities.
----
-
-# Scripting
-Typst embeds a powerful scripting language. You can automate your documents and
-create more sophisticated styles with code. Below is an overview over the
-scripting concepts.
-
-## Expressions
-In Typst, markup and code are fused into one. All but the most common elements
-are created with _functions._ To make this as convenient as possible, Typst
-provides compact syntax to embed a code expression into markup: An expression is
-introduced with a hash (`#`) and normal markup parsing resumes after the
-expression is finished. If a character would continue the expression but should
-be interpreted as text, the expression can forcibly be ended with a semicolon
-(`;`). You can [escape a literal `#` or `;` with a backslash]($syntax/#escapes).
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 
 ```example
 #emph[Hello] \
@@ -39,7 +20,6 @@ be interpreted as text, the expression can forcibly be ended with a semicolon
 #"hello".len()
 ```
 
-<<<<<<< HEAD
 上記の例では、[関数呼び出し]($function)、
 [フィールドアクセス]($scripting/#fields)、
 そして[メソッド呼び出し]($scripting/#methods)などのいくつかの使用可能な式を示しています。
@@ -63,39 +43,6 @@ be interpreted as text, the expression can forcibly be ended with a semicolon
   任意の数のコンテンツブロックを可変長引数として関数に渡せます。つまり、`{list[A][B]}`は`{list([A], [B])}`と等価です。
 
 コンテンツブロックとコードブロックは任意にネストできます。以下の例では、`{[hello ]}`が`{a + [ the ] + b}`の出力と結合され、`{[hello from the *world*]}`が生成されます。
-=======
-The example above shows a few of the available expressions, including
-[function calls]($function), [field accesses]($scripting/#fields), and
-[method calls]($scripting/#methods). More kinds of expressions are
-discussed in the remainder of this chapter. A few kinds of expressions are not
-compatible with the hash syntax (e.g. binary operator expressions). To embed
-these into markup, you can use parentheses, as in `[#(1 + 2)]`.
-
-## Blocks
-To structure your code and embed markup into it, Typst provides two kinds of
-_blocks:_
-
-- **Code block:** `{{ let x = 1; x + 2 }}` \
-  When writing code, you'll probably want to split up your computation into
-  multiple statements, create some intermediate variables and so on. Code blocks
-  let you write multiple expressions where one is expected. The individual
-  expressions in a code block should be separated by line breaks or semicolons.
-  The output values of the individual expressions in a code block are joined to
-  determine the block's value. Expressions without useful output, like `{let}`
-  bindings yield `{none}`, which can be joined with any value without effect.
-
-- **Content block:** `{[*Hey* there!]}` \
-  With content blocks, you can handle markup/content as a programmatic value,
-  store it in variables and pass it to [functions]($function). Content
-  blocks are delimited by square brackets and can contain arbitrary markup. A
-  content block results in a value of type [content]. An arbitrary number of
-  content blocks can be passed as trailing arguments to functions. That is,
-  `{list([A], [B])}` is equivalent to `{list[A][B]}`.
-
-Content and code blocks can be nested arbitrarily. In the example below,
-`{[hello ]}` is joined with the output of  `{a + [ the ] + b}` yielding
-`{[hello from the *world*]}`.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 
 ```example
 #{
@@ -106,7 +53,6 @@ Content and code blocks can be nested arbitrarily. In the example below,
 }
 ```
 
-<<<<<<< HEAD
 ## バインディングと分割 { #bindings }
 前述のように、変数は`{let}`バインディングで定義できます。
 変数には`=`記号のあとに続く式の値が代入されます。
@@ -114,17 +60,6 @@ Content and code blocks can be nested arbitrarily. In the example below,
 値の代入は任意であり、値が代入されなければ変数は`{none}`として初期化されます。
 `{let}`キーワードは、[カスタム名前付き関数]($function/#defining-functions)を作成するためにも使用できます。
 変数は、それが含まれるブロックの残りの部分（または、変数が含まれるブロックのない場合はファイル全体）の中でアクセスできます。
-=======
-## Bindings and Destructuring { #bindings }
-As already demonstrated above, variables can be defined with `{let}` bindings.
-The variable is assigned the value of the expression that follows the `=` sign.
-A [valid variable name](#identifiers) may contain `-`, but cannot start with `-`.
-The assignment of a value is optional, if no value is assigned, the variable
-will be initialized as `{none}`. The `{let}` keyword can also be used to create
-a [custom named function]($function/#defining-functions). Variables can be
-accessed for the rest of the containing block (or the rest of the file if there
-is no containing block).
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 
 ```example
 #let name = "Typst"
@@ -135,17 +70,9 @@ It explains #name.
 Sum is #my-add(2, 3).
 ```
 
-<<<<<<< HEAD
 letバインディングは[配列]($array)や[辞書]($dictionary)の分割にも使用できます。
 この場合、代入の左辺は配列や辞書と同じ形式でなければなりません。
 `..`演算子はパターン内で一度だけ、配列や辞書の残りの項目を受け取るために使用できます。
-=======
-Let bindings can also be used to destructure [arrays]($array) and
-[dictionaries]($dictionary). In this case, the left-hand side of the
-assignment should mirror an array or dictionary. The `..` operator can be used
-once in the pattern to collect the remainder of the array's or dictionary's
-items.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 
 ```example
 #let (x, y) = (1, 2)
@@ -173,22 +100,14 @@ Homer wrote #h.
 ]
 ```
 
-<<<<<<< HEAD
 分割パターンでアンダースコアを使用して、要素を破棄できます。
-=======
-You can use the underscore to discard elements in a destructuring pattern:
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 
 ```example
 #let (_, y, _) = (1, 2, 3)
 The y coordinate is #y.
 ```
 
-<<<<<<< HEAD
 分割は関数の引数リスト内でも機能します。
-=======
-Destructuring also works in argument lists of functions ...
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 
 ```example
 #let left = (2, 4, 5)
@@ -198,12 +117,7 @@ Destructuring also works in argument lists of functions ...
 )
 ```
 
-<<<<<<< HEAD
 そして通常の代入の左辺でも機能します。これは、変数の値を交換するなどの場合に便利です。
-=======
-... and on the left-hand side of normal assignments. This can be useful to
-swap variables among other things.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 
 ```example
 #{
@@ -214,19 +128,10 @@ swap variables among other things.
 }
 ```
 
-<<<<<<< HEAD
 ## 条件式 { #conditionals }
 条件式を使用すると、ある条件が満たされているかどうかに応じて、異なるものを表示したり計算したりできます。
 Typstは`{if}`式、`{else if}`式、および`{else}`式をサポートしています。
 条件が`{true}`の場合、条件式は`if`の部分の結果が得られ、そうでない場合は`else`の部分の結果が得られます。
-=======
-## Conditionals
-With a conditional, you can display or compute different things depending on
-whether some condition is fulfilled. Typst supports `{if}`, `{else if}` and
-`{else}` expressions. When the condition evaluates to `{true}`, the conditional
-yields the value resulting from the if's body, otherwise yields the value
-resulting from the else's body.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 
 ```example
 #if 1 < 2 [
@@ -236,18 +141,13 @@ resulting from the else's body.
 ]
 ```
 
-<<<<<<< HEAD
 各条件分岐は、その本文としてコードブロックまたはコンテンツブロックを含められます。
-=======
-Each branch can have a code or content block as its body.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 
 - `{if condition {..}}`
 - `{if condition [..]}`
 - `{if condition [..] else {..}}`
 - `{if condition [..] else if condition {..} else [..]}`
 
-<<<<<<< HEAD
 ## ループ { #loops }
 ループを使用すると、コンテンツを繰り返したり、何かを反復的に計算したりできます。
 Typstは、`{for}`ループと`{while}`ループの2つのループをサポートしています。
@@ -255,18 +155,6 @@ Typstは、`{for}`ループと`{while}`ループの2つのループをサポー
 ブロックと同様に、ループは各反復からの結果を1つの値に_結合_します。
 
 以下の例では、forループによって作成された3つの文が1つのコンテンツ値に結合され、whileループの中の長さ1の配列が1つの大きな配列に結合されます。
-=======
-## Loops
-With loops, you can repeat content or compute something iteratively. Typst
-supports two types of loops: `{for}` and `{while}` loops. The former iterate
-over a specified collection whereas the latter iterate as long as a condition
-stays fulfilled. Just like blocks, loops _join_ the results from each iteration
-into one value.
-
-In the example below, the three sentences created by the for loop join together
-into a single content value and the length-1 arrays in the while loop join
-together into one larger array.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 
 ```example
 #for c in "ABC" [
@@ -280,7 +168,6 @@ together into one larger array.
 }
 ```
 
-<<<<<<< HEAD
 forループはさまざまなコレクションを反復処理できます。
 
 - `{for value in array {..}}` \
@@ -297,34 +184,6 @@ forループはさまざまなコレクションを反復処理できます。
 
 ループの実行を制御するために、Typstは`{break}`と`{continue}`ステートメントを提供しています。
 前者はループを早期終了し、後者はループの次の反復を開始します。
-=======
-For loops can iterate over a variety of collections:
-
-- `{for value in array {..}}` \
-  Iterates over the items in the [array]. The destructuring syntax described in
-  [Let binding]($scripting/#bindings) can also be used here.
-
-- `{for pair in dict {..}}` \
-  Iterates over the key-value pairs of the [dictionary]. The pairs can also be
-  destructured by using `{for (key, value) in dict {..}}`. It is more efficient
-  than `{for pair in dict.pairs() {..}}` because it doesn't create a temporary
-  array of all key-value pairs.
-
-- `{for letter in "abc" {..}}` \
-  Iterates over the characters of the [string]($str). Technically, it iterates
-  over the grapheme clusters of the string. Most of the time, a grapheme cluster
-  is just a single codepoint. However, a grapheme cluster could contain multiple
-  codepoints, like a flag emoji.
-
-- `{for byte in bytes("😀") {..}}` \
-  Iterates over the [bytes], which can be converted from a [string]($str) or
-  [read] from a file without encoding. Each byte value is an [integer]($int)
-  between `{0}` and `{255}`.
-
-To control the execution of the loop, Typst provides the `{break}` and
-`{continue}` statements. The former performs an early exit from the loop while
-the latter skips ahead to the next iteration of the loop.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 
 ```example
 #for letter in "abc nope" {
@@ -336,18 +195,13 @@ the latter skips ahead to the next iteration of the loop.
 }
 ```
 
-<<<<<<< HEAD
 ループの本体はコードブロックまたはコンテンツブロックにできます。
-=======
-The body of a loop can be a code or content block:
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 
 - `{for .. in collection {..}}`
 - `{for .. in collection [..]}`
 - `{while condition {..}}`
 - `{while condition [..]}`
 
-<<<<<<< HEAD
 ## フィールド { #fields }
 _ドット記法_を使用することで値のフィールドにアクセスできます。[コンテンツ]($content)型の値については、[fields]($content.fields)関数を使用してフィールドを一覧表示できます。
 
@@ -360,21 +214,6 @@ _ドット記法_を使用することで値のフィールドにアクセスで
 - 指定されたフィールドを持つ要素で構成された[コンテンツ]($content)。利用可能なフィールドは、その要素が構築された際に与えられた[要素関数]($function/#element-functions)の引数と一致します。
 
 <!-- textlint-enable -->
-=======
-## Fields
-You can use _dot notation_ to access fields on a value. For values of type
-[`content`], you can also use the [`fields`]($content.fields) function to list
-the fields.
-
-The value in question can be either:
-- a [dictionary] that has the specified key,
-- a [symbol] that has the specified modifier,
-- a [module] containing the specified definition,
-- [content] consisting of an element that has the specified field. The
-  available fields match the arguments of the
-  [element function]($function/#element-functions) that were given when the
-  element was constructed.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 
 ```example
 #let it = [= Heading]
@@ -388,30 +227,16 @@ The value in question can be either:
 
 ```
 
-<<<<<<< HEAD
 ## メソッド { #methods }
 メソッド呼び出しは、値の[型]($type)で定義された関数を呼び出す便利な方法です。
 例えば、[`str.len`]($str.len)関数は下記の2つの同等の方法で呼び出せます。
-=======
-## Methods
-A _method call_ is a convenient way to call a function that is scoped to a
-value's [type]. For example, we can call the [`str.len`]($str.len) function in
-the following two equivalent ways:
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 
 ```example
 #str.len("abc") is the same as
 #"abc".len()
 ```
 
-<<<<<<< HEAD
 メソッド呼び出しの構造は`{value.method(..args)}`であり、これと等価である完全な関数呼び出しは`{type(value).method(value, ..args)}`です。各型のドキュメントには、その型に関連付けられた関数が一覧表示されています。現在、独自のメソッドは定義できません。
-=======
-The structure of a method call is `{value.method(..args)}` and its equivalent
-full function call is `{type(value).method(value, ..args)}`. The documentation
-of each type lists its scoped functions. You cannot currently define your own
-methods.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 
 ```example
 #let values = (1, 2, 3, 4)
@@ -426,7 +251,6 @@ methods.
 #str.len("abc")
 ```
 
-<<<<<<< HEAD
 特定の値に対して呼び出された際に、その値を変更する特別な関数がいくつかあります（例： [`array.push`]($array.push)）。
 これらの関数は、_必ず_メソッド形式で呼び出す必要があります。
 場合によっては、メソッドが副作用のためだけに呼び出されるとき、その戻り値は無視されるべきです（結合に加わるべきではありません）。
@@ -458,53 +282,15 @@ Typstプロジェクトを、_モジュール_と呼ばれる複数のファイ
 <!-- textlint-enable -->
 
 以下の例に示すように、パスの代わりに[モジュール値]($module)を使用できます。
-=======
-There are a few special functions that modify the value they are called on (e.g.
-[`array.push`]($array.push)). These functions _must_ be called in method form.
-In some cases, when the method is only called for its side effect, its return
-value should be ignored (and not participate in joining). The canonical way to
-discard a value is with a let binding: `{let _ = array.remove(1)}`.
-
-## Modules
-You can split up your Typst projects into multiple files called _modules._ A
-module can refer to the content and definitions of another module in multiple
-ways:
-
-- **Including:** `{include "bar.typ"}` \
-  Evaluates the file at the path `bar.typ` and returns the resulting [content].
-
-- **Import:** `{import "bar.typ"}` \
-  Evaluates the file at the path `bar.typ` and inserts the resulting [module]
-  into the current scope as `bar` (filename without extension). You can use the
-  `as` keyword to rename the imported module: `{import "bar.typ" as baz}`. You
-  can import nested items using dot notation: `{import "bar.typ": baz.a}`.
-
-- **Import items:** `{import "bar.typ": a, b}` \
-  Evaluates the file at the path `bar.typ`, extracts the values of the variables
-  `a` and `b` (that need to be defined in `bar.typ`, e.g. through `{let}`
-  bindings) and defines them in the current file. Replacing `a, b` with `*`
-  loads all variables defined in a module. You can use the `as` keyword to
-  rename the individual items: `{import "bar.typ": a as one, b as two}`
-
-Instead of a path, you can also use a [module value]($module), as shown in the
-following example:
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 
 ```example
 #import emoji: face
 #face.grin
 ```
 
-<<<<<<< HEAD
 ## パッケージ { #packages }
 プロジェクト間でビルド中のブロックを再利用するために、Typstの_パッケージ_を作成してインポートできます。
 パッケージのインポートは、名前空間、名前、バージョンの3つの組み合わせとして指定されます。
-=======
-## Packages
-To reuse building blocks across projects, you can also create and import Typst
-_packages._ A package import is specified as a triple of a namespace, a name,
-and a version.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 
 ```example
 >>> #let add(x, y) = x + y
@@ -512,7 +298,6 @@ and a version.
 #add(2, 7)
 ```
 
-<<<<<<< HEAD
 `preview`名前空間には、コミュニティで共有されているパッケージが含まれています。全ての利用可能なコミュニティパッケージは[Typst Universe]($universe)にあります。
 
 Typstをローカルで使用している場合、独自のシステムローカルパッケージを作成できます。詳細については、[パッケージリポジトリ](https://github.com/typst/packages)を参照してください。
@@ -547,45 +332,5 @@ Typstをローカルで使用している場合、独自のシステムローカ
 |   `{-=}`   | 減算代入                             |    二項    |   1    |
 |   `{*=}`   | 乗算代入                             |    二項    |   1    |
 |   `{/=}`   | 除算代入                             |    二項    |   1    |
-=======
-The `preview` namespace contains packages shared by the community. You can find
-all available community packages on [Typst Universe]($universe).
-
-If you are using Typst locally, you can also create your own system-local
-packages. For more details on this, see the
-[package repository](https://github.com/typst/packages).
-
-## Operators
-The following table lists all available unary and binary operators with effect,
-arity (unary, binary) and precedence level (higher binds stronger). Some
-operations, such as [modulus]($calc.rem-euclid), do not have a special syntax
-and can be achieved using functions from the
-[`calc`]($category/foundations/calc) module.
-
-| Operator   | Effect                          | Arity  | Precedence |
-|:----------:|---------------------------------|:------:|:----------:|
-|  `{-}`     | Negation                        | Unary  |     7      |
-|  `{+}`     | No effect (exists for symmetry) | Unary  |     7      |
-|  `{*}`     | Multiplication                  | Binary |     6      |
-|  `{/}`     | Division                        | Binary |     6      |
-|  `{+}`     | Addition                        | Binary |     5      |
-|  `{-}`     | Subtraction                     | Binary |     5      |
-|  `{==}`    | Check equality                  | Binary |     4      |
-|  `{!=}`    | Check inequality                | Binary |     4      |
-|  `{<}`     | Check less-than                 | Binary |     4      |
-|  `{<=}`    | Check less-than or equal        | Binary |     4      |
-|  `{>}`     | Check greater-than              | Binary |     4      |
-|  `{>=}`    | Check greater-than or equal     | Binary |     4      |
-|  `{in}`    | Check if in collection          | Binary |     4      |
-| `{not in}` | Check if not in collection      | Binary |     4      |
-|  `{not}`   | Logical "not"                   | Unary  |     3      |
-|  `{and}`   | Short-circuiting logical "and"  | Binary |     3      |
-|  `{or}`    | Short-circuiting logical "or"   | Binary |     2      |
-|  `{=}`     | Assignment                      | Binary |     1      |
-|  `{+=}`    | Add-Assignment                  | Binary |     1      |
-|  `{-=}`    | Subtraction-Assignment          | Binary |     1      |
-|  `{*=}`    | Multiplication-Assignment       | Binary |     1      |
-|  `{/=}`    | Division-Assignment             | Binary |     1      |
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 
 [semver]: https://semver.org/
diff --git a/docs/reference/language/styling.md b/docs/reference/language/styling.md
index d7838122b1..8633904efd 100644
--- a/docs/reference/language/styling.md
+++ b/docs/reference/language/styling.md
@@ -1,5 +1,4 @@
 ---
-<<<<<<< HEAD
 description: Typst で文書のスタイル設定をするために必要な概念
 ---
 
@@ -17,27 +16,6 @@ setルールを使うと、要素の外観をカスタマイズできます。
 setルールに指定できるのは、その関数のオプションのパラメーターだけです。
 どのパラメーターがオプションであるかは、各関数のドキュメントを参照してください。
 以下の例では、2つのsetルールを使って、[フォント]($text.font)と[見出し番号]($heading.numbering)を変更しています。
-=======
-description: All concepts needed to style your document with Typst.
----
-
-# Styling
-Typst includes a flexible styling system that automatically applies styling of
-your choice to your document. With _set rules,_ you can configure basic
-properties of elements. This way, you create most common styles. However, there
-might not be a built-in property for everything you wish to do. For this reason,
-Typst further supports _show rules_ that can completely redefine the appearance
-of elements.
-
-## Set rules
-With set rules, you can customize the appearance of elements. They are written
-as a [function call]($function) to an [element
-function]($function/#element-functions) preceded by the `{set}` keyword (or
-`[#set]` in markup). Only optional parameters of that function can be provided
-to the set rule. Refer to each function's documentation to see which parameters
-are optional. In the example below, we use two set rules to change the
-[font family]($text.font) and [heading numbering]($heading.numbering).
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 
 ```example
 #set heading(numbering: "I.")
@@ -50,18 +28,10 @@ With set rules, you can style
 your document.
 ```
 
-<<<<<<< HEAD
 setルールは、そのまま記述するとファイルの最後まで適用されます。
 ブロックの中にネストすると、そのブロックの終わりまで適用されます。
 ブロックを使えば、setルールの効果を指定した部分に限定できます。
 以下では、contentブロックを用いてスコープすることで、特定のリストのスタイルのみを変更しています。
-=======
-A top level set rule stays in effect until the end of the file. When nested
-inside of a block, it is only in effect until the end of that block. With a
-block, you can thus restrict the effect of a rule to a particular segment of
-your document. Below, we use a content block to scope the list styling to one
-particular list.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 
 ```example
 This list is affected: #[
@@ -73,13 +43,8 @@ This one is not:
 - Bullet
 ```
 
-<<<<<<< HEAD
 ときには、setルールを条件付きで設定したい場合もあるでしょう。
 その場合には_set-if_ルールを使用します。
-=======
-Sometimes, you'll want to apply a set rule conditionally. For this, you can use
-a _set-if_ rule.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 
 ```example
 #let task(body, critical: false) = {
@@ -91,7 +56,6 @@ a _set-if_ rule.
 #task(critical: false)[Work deadline]
 ```
 
-<<<<<<< HEAD
 ## showルール { #show-rules }
 
 showルールを使えば、特定の種類の要素の外観を詳細に設定できます。
@@ -99,15 +63,6 @@ showルールの基本的な記述方法は、show-setルールです。
 `{show}` キーワードの後に [セレクター]($selector)、コロン、setルールと続けて記述します。
 セレクターの基本的な記述方法は [要素関数]($function/#element-functions)を置くことであり、setルールは選択された要素にのみ適用されます。
 下の例では、見出しは紺色になり、他のテキストは黒色のままです。
-=======
-## Show rules
-With show rules, you can deeply customize the look of a type of element. The
-most basic form of show rule is a _show-set rule._ Such a rule is written as the
-`{show}` keyword followed by a [selector], a colon and then a set rule. The most
-basic form of selector is an [element function]($function/#element-functions).
-This lets the set rule only apply to the selected element. In the example below,
-headings become dark blue while all other text stays black.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 
 ```example
 #show heading: set text(navy)
@@ -116,7 +71,6 @@ headings become dark blue while all other text stays black.
 But this stays black.
 ```
 
-<<<<<<< HEAD
 show-setルールを使えば、異なる関数のプロパティを組み合わせてさまざまな効果を得られます。
 しかし、この記述方法による設定はTypst標準で定義されている範囲に制約されています。
 より柔軟な設定方法として、要素の整形方法をゼロから定義する_変換型_showルールによる記述も可能です。
@@ -134,33 +88,6 @@ show-setルールを使えば、異なる関数のプロパティを組み合わ
 これらのsetルールを既存のshowルールの中に追記する手もありますが、ここでは別々のshow-setルールとして追加しています。
 こうすることで、これらのルールは文書中の後続のshow-setルールによって上書き可能なままとなり、スタイル設定を組み合わせやすい状態が保たれます。
 これに対し、変換型showルールの内部に書かれたsetルールは、後から上書きできなくなります。
-=======
-With show-set rules you can mix and match properties from different functions to
-achieve many different effects. But they still limit you to what is predefined
-in Typst. For maximum flexibility, you can instead write a _transformational_
-show rule that defines how to format an element from scratch. To write such a
-show rule, replace the set rule after the colon with an arbitrary [function].
-This function receives the element in question and can return arbitrary content.
-The function is often defined inline as `{it => ..}` using the
-[unnamed function syntax]($function/#unnamed). The function's parameter is
-typically named `it` by convention.
-
-The available [fields]($scripting/#fields) on the element passed to the function
-match the parameters of the respective element function. Below, we define a show
-rule that formats headings for a fantasy encyclopedia.
-
-The show rule itself adds tilde characters around the title (these must be
-escaped with a backslash because otherwise they would indicate a non-breaking
-space), emphasizes the title with italics, and then displays the heading counter
-after the title.
-
-For this example, we also wanted center alignment and a different font. While we
-could've added these set rules into the existing show rule, we instead added
-them as separate show-set rules. This is good practice because now these rules
-can still be overridden by later show-set rules in the document, keeping styling
-composable. In contrast, set rules within a transformational show rule would not
-be overridable anymore.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 
 ```example
 #set heading(numbering: "(I)")
@@ -182,7 +109,6 @@ While less powerful than the dragon, the manticore
 gets extra style points.
 ```
 
-<<<<<<< HEAD
 setルールと同様に、showルールは、現在のブロック内またはファイルの終わりまで有効です。
 
 関数の代わりに、showルールのコロン右側は、要素に直接置換されるべきリテラル文字列またはコンテンツブロックを取ることもできます。
@@ -206,36 +132,6 @@ setルールと同様に、showルールは、現在のブロック内または
 - **ラベル：** `{show <intro>: ..}` \
   指定されたラベルを持つ要素に対して適用する。
   ラベルについては[labelタイプ]($label)を参照してください。
-=======
-Like set rules, show rules are in effect until the end of the current block or
-file.
-
-Instead of a function, the right-hand side of a show rule can also take a
-literal string or content block that should be directly substituted for the
-element. And apart from a function, the left-hand side of a show rule can also
-take a number of other _selectors_ that define what to apply the transformation
-to:
-
-- **Everything:** `{show: rest => ..}` \
-  Transform everything after the show rule. This is useful to apply a more
-  complex layout to your whole document without wrapping everything in a giant
-  function call.
-
-- **Text:** `{show "Text": ..}` \
-  Style, transform or replace text.
-
-- **Regex:** `{show regex("\w+"): ..}` \
-  Select and transform text with a regular expression for even more flexibility.
-  See the documentation of the [`regex` type]($regex) for details.
-
-- **Function with fields:** `{show heading.where(level: 1): ..}` \
-  Transform only elements that have the specified fields. For example, you might
-  want to only change the style of level-1 headings.
-
-- **Label:** `{show <intro>: ..}` \
-  Select and transform elements that have the specified label. See the
-  documentation of the [`label` type]($label) for more details.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 
 ```example
 #show "Project": smallcaps
diff --git a/docs/reference/language/syntax.md b/docs/reference/language/syntax.md
index c6aa9dae62..f56b76be05 100644
--- a/docs/reference/language/syntax.md
+++ b/docs/reference/language/syntax.md
@@ -1,6 +1,5 @@
 ---
 description: |
-<<<<<<< HEAD
    Typstの構文に関するコンパクトなリファレンスです。詳細については、言語のマークアップモード、数式モード、およびコードモードを参照してください。
 ---
 
@@ -140,146 +139,6 @@ Typstは、最も一般的な文書要素に対する組み込みのマークア
 これは古いバージョンを除外したり、注釈を追加したりするのに便利です。
 単一行をコメントアウトするには、行の先頭に`//`を付けます。
 
-=======
-   A compact reference for Typst's syntax. Learn more about the language within
-   markup, math, and code mode.
----
-
-# Syntax
-Typst is a markup language. This means that you can use simple syntax to
-accomplish common layout tasks. The lightweight markup syntax is complemented by
-set and show rules, which let you style your document easily and automatically.
-All this is backed by a tightly integrated scripting language with built-in and
-user-defined functions.
-
-## Modes
-Typst has three syntactical modes: Markup, math, and code. Markup mode is the
-default in a Typst document, math mode lets you write mathematical formulas, and
-code mode lets you use Typst's scripting features.
-
-You can switch to a specific mode at any point by referring to the following
-table:
-
-| New mode | Syntax                          | Example                         |
-|----------|---------------------------------|---------------------------------|
-| Code     | Prefix the code with `#`        | `[Number: #(1 + 2)]`            |
-| Math     | Surround equation with `[$..$]` | `[$-x$ is the opposite of $x$]` |
-| Markup   | Surround markup with `[[..]]`   | `{let name = [*Typst!*]}`       |
-
-Once you have entered code mode with `#`, you don't need to use further hashes
-unless you switched back to markup or math mode in between.
-
-## Markup
-Typst provides built-in markup for the most common document elements. Most of
-the syntax elements are just shortcuts for a corresponding function. The table
-below lists all markup that is available and links to the  best place to learn
-more about their syntax and usage.
-
-| Name               | Example                      | See                      |
-| ------------------ | ---------------------------- | ------------------------ |
-| Paragraph break    | Blank line                   | [`parbreak`]             |
-| Strong emphasis    | `[*strong*]`                 | [`strong`]               |
-| Emphasis           | `[_emphasis_]`               | [`emph`]                 |
-| Raw text           | ``[`print(1)`]``             | [`raw`]                  |
-| Link               | `[https://typst.app/]`       | [`link`]                 |
-| Label              | `[<intro>]`                  | [`label`]                |
-| Reference          | `[@intro]`                   | [`ref`]                  |
-| Heading            | `[= Heading]`                | [`heading`]              |
-| Bullet list        | `[- item]`                   | [`list`]                 |
-| Numbered list      | `[+ item]`                   | [`enum`]                 |
-| Term list          | `[/ Term: description]`      | [`terms`]                |
-| Math               | `[$x^2$]`                    | [Math]($category/math)   |
-| Line break         | `[\]`                        | [`linebreak`]            |
-| Smart quote        | `['single' or "double"]`     | [`smartquote`]           |
-| Symbol shorthand   | `[~]`, `[---]`               | [Symbols]($category/symbols/sym) |
-| Code expression    | `[#rect(width: 1cm)]`        | [Scripting]($scripting/#expressions) |
-| Character escape   | `[Tweet at us \#ad]`         | [Below](#escapes)        |
-| Comment            | `[/* block */]`, `[// line]` | [Below](#comments)       |
-
-## Math mode { #math }
-Math mode is a special markup mode that is used to typeset mathematical
-formulas. It is entered by wrapping an equation in `[$]` characters. This works
-both in markup and code. The equation will be typeset into its own block if it
-starts and ends with at least one space (e.g. `[$ x^2 $]`). Inline math can be
-produced by omitting the whitespace (e.g. `[$x^2$]`). An overview over the
-syntax specific to math mode follows:
-
-| Name                   | Example                  | See                      |
-| ---------------------- | ------------------------ | ------------------------ |
-| Inline math            | `[$x^2$]`                | [Math]($category/math)   |
-| Block-level math       | `[$ x^2 $]`              | [Math]($category/math)   |
-| Bottom attachment      | `[$x_1$]`                | [`attach`]($category/math/attach) |
-| Top attachment         | `[$x^2$]`                | [`attach`]($category/math/attach) |
-| Fraction               | `[$1 + (a+b)/5$]`        | [`frac`]($math.frac)     |
-| Line break             | `[$x \ y$]`              | [`linebreak`]            |
-| Alignment point        | `[$x &= 2 \ &= 3$]`      | [Math]($category/math)   |
-| Variable access        | `[$#x$, $pi$]`           | [Math]($category/math)   |
-| Field access           | `[$arrow.r.long$]`       | [Scripting]($scripting/#fields) |
-| Implied multiplication | `[$x y$]`                | [Math]($category/math)   |
-| Symbol shorthand       | `[$->$]`, `[$!=$]`       | [Symbols]($category/symbols/sym) |
-| Text/string in math    | `[$a "is natural"$]`     | [Math]($category/math)   |
-| Math function call     | `[$floor(x)$]`           | [Math]($category/math)   |
-| Code expression        | `[$#rect(width: 1cm)$]`  | [Scripting]($scripting/#expressions) |
-| Character escape       | `[$x\^2$]`               | [Below](#escapes)        |
-| Comment                | `[$/* comment */$]`      | [Below](#comments)       |
-
-## Code mode { #code }
-Within code blocks and expressions, new expressions can start without a leading
-`#` character. Many syntactic elements are specific to expressions. Below is
-a table listing all syntax that is available in code mode:
-
-| Name                     | Example                       | See                                |
-| ------------------------ | ----------------------------- | ---------------------------------- |
-| None                     | `{none}`                      | [`none`]                           |
-| Auto                     | `{auto}`                      | [`auto`]                           |
-| Boolean                  | `{false}`, `{true}`           | [`bool`]                           |
-| Integer                  | `{10}`, `{0xff}`              | [`int`]                            |
-| Floating-point number    | `{3.14}`, `{1e5}`             | [`float`]                          |
-| Length                   | `{2pt}`, `{3mm}`, `{1em}`, .. | [`length`]                         |
-| Angle                    | `{90deg}`, `{1rad}`           | [`angle`]                          |
-| Fraction                 | `{2fr}`                       | [`fraction`]                       |
-| Ratio                    | `{50%}`                       | [`ratio`]                          |
-| String                   | `{"hello"}`                   | [`str`]                            |
-| Label                    | `{<intro>}`                   | [`label`]                          |
-| Math                     | `[$x^2$]`                     | [Math]($category/math)             |
-| Raw text                 | ``[`print(1)`]``              | [`raw`]                            |
-| Variable access          | `{x}`                         | [Scripting]($scripting/#blocks)    |
-| Code block               | `{{ let x = 1; x + 2 }}`      | [Scripting]($scripting/#blocks)    |
-| Content block            | `{[*Hello*]}`                 | [Scripting]($scripting/#blocks)    |
-| Parenthesized expression | `{(1 + 2)}`                   | [Scripting]($scripting/#blocks)    |
-| Array                    | `{(1, 2, 3)}`                 | [Array]($array)                    |
-| Dictionary               | `{(a: "hi", b: 2)}`           | [Dictionary]($dictionary)          |
-| Unary operator           | `{-x}`                        | [Scripting]($scripting/#operators) |
-| Binary operator          | `{x + y}`                     | [Scripting]($scripting/#operators) |
-| Assignment               | `{x = 1}`                     | [Scripting]($scripting/#operators) |
-| Field access             | `{x.y}`                       | [Scripting]($scripting/#fields)    |
-| Method call              | `{x.flatten()}`               | [Scripting]($scripting/#methods)   |
-| Function call            | `{min(x, y)}`                 | [Function]($function)              |
-| Argument spreading       | `{min(..nums)}`               | [Arguments]($arguments)            |
-| Unnamed function         | `{(x, y) => x + y}`           | [Function]($function)              |
-| Let binding              | `{let x = 1}`                 | [Scripting]($scripting/#bindings)  |
-| Named function           | `{let f(x) = 2 * x}`          | [Function]($function)              |
-| Set rule                 | `{set text(14pt)}`            | [Styling]($styling/#set-rules)     |
-| Set-if rule              | `{set text(..) if .. }`       | [Styling]($styling/#set-rules)     |
-| Show-set rule            | `{show heading: set block(..)}` | [Styling]($styling/#show-rules)  |
-| Show rule with function  | `{show raw: it => {..}}`      | [Styling]($styling/#show-rules)    |
-| Show-everything rule     | `{show: template}`            | [Styling]($styling/#show-rules)    |
-| Context expression       | `{context text.lang}`         | [Context]($context)                |
-| Conditional              | `{if x == 1 {..} else {..}}`  | [Scripting]($scripting/#conditionals) |
-| For loop                 | `{for x in (1, 2, 3) {..}}`   | [Scripting]($scripting/#loops)     |
-| While loop               | `{while x < 10 {..}}`         | [Scripting]($scripting/#loops)     |
-| Loop control flow        | `{break, continue}`           | [Scripting]($scripting/#loops)     |
-| Return from function     | `{return x}`                  | [Function]($function)              |
-| Include module           | `{include "bar.typ"}`         | [Scripting]($scripting/#modules)   |
-| Import module            | `{import "bar.typ"}`          | [Scripting]($scripting/#modules)   |
-| Import items from module | `{import "bar.typ": a, b, c}` | [Scripting]($scripting/#modules)   |
-| Comment                  | `{/* block */}`, `{// line}`  | [Below](#comments)                 |
-
-## Comments
-Comments are ignored by Typst and will not be included in the output. This is
-useful to exclude old versions or to add annotations. To comment out a single
-line, start it with `//`:
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 ```example
 // our data barely supports
 // this claim
@@ -289,13 +148,8 @@ that the difference is
 significant.
 ```
 
-<<<<<<< HEAD
 コメントは `/*` と `*/` で囲むこともできます。この場合、コメントを複数行にわたって書くことができます。
 
-=======
-Comments can also be wrapped between `/*` and `*/`. In this case, the comment
-can span over multiple lines:
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 ```example
 Our study design is as follows:
 /* Somebody write this up:
@@ -303,28 +157,18 @@ Our study design is as follows:
    - 2x2 data design. */
 ```
 
-<<<<<<< HEAD
 ## エスケープシーケンス { #escapes }
 
 エスケープシーケンスは、Typstで入力が難しい特殊文字や他に特別な意味を持つ文字を挿入するために使用されます。
 文字をエスケープするには、バックスラッシュをその前に置きます。
 任意のUnicodeコードポイントを挿入するためには、16進エスケープシーケンス（`[\u{1f600}]`）を使用できます。
 このエスケープシーケンスは[文字列]($str)でも機能します。
-=======
-## Escape sequences { #escapes }
-Escape sequences are used to insert special characters that are hard to type or
-otherwise have special meaning in Typst. To escape a character, precede it with
-a backslash. To insert any Unicode codepoint, you can write a hexadecimal escape
-sequence: `[\u{1f600}]`. The same kind of escape sequences also work in
-[strings]($str).
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 
 ```example
 I got an ice cream for
 \$1.50! \u{1f600}
 ```
 
-<<<<<<< HEAD
 ## 識別子 { #identifiers }
 変数名や関数名など(_識別子_)には、
 文字、数字、ハイフン（`-`）、アンダースコア（`_`）を使用できます。
@@ -340,23 +184,6 @@ I got an ice cream for
 ケバブケースでは、単語は小文字で書かれ、ハイフンで区切られます（例： `top-edge`）。
 これは、予測可能性を維持できるため、
 他の人が利用するモジュールやパッケージを開発する際に特に重要です。
-=======
-## Identifiers
-Names of variables, functions, and so on (_identifiers_) can contain letters,
-numbers, hyphens (`-`), and underscores (`_`). They must start with a letter or
-an underscore.
-
-More specifically, the identifier syntax in Typst is based on the
-[Unicode Standard Annex #31](https://www.unicode.org/reports/tr31/), with two
-extensions: Allowing `_` as a starting character, and allowing both `_` and `-`
-as continuing characters.
-
-For multi-word identifiers, the recommended case convention is
-[Kebab case](https://en.wikipedia.org/wiki/Letter_case#Kebab_case). In Kebab
-case, words are written in lowercase and separated by hyphens (as in
-`top-edge`). This is especially relevant when developing modules and packages
-for others to use, as it keeps things predictable.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 
 ```example
 #let kebab-case = [Using hyphen]
@@ -370,7 +197,6 @@ for others to use, as it keeps things predictable.
 // so it's not a valid identifier
 ```
 
-<<<<<<< HEAD
 ## パス { #paths }
 
 Typstは、画像、Typstファイル、データファイルなどのリソース（他ファイル）を参照するためにファイルパスを必要とするさまざまな機能を持ちます。
@@ -378,31 +204,16 @@ Typstは、画像、Typstファイル、データファイルなどのリソー
 
 - **相対パス**は、その機能を呼び出すTypstファイルの場所からのパスを指定します。デフォルトはこれです。
 
-=======
-## Paths
-Typst has various features that require a file path to reference external
-resources such as images, Typst files, or data files. Paths are represented as
-[strings]($str). There are two kinds of paths: Relative and absolute.
-
-- A **relative path** searches from the location of the Typst file where the
-  feature is invoked. It is the default:
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
   ```typ
   #image("images/logo.png")
   ```
 
-<<<<<<< HEAD
 - **絶対パス**はプロジェクトの_ルートディレクトリ_からのパスを指定します。先頭を`/`から始めます。
 
-=======
-- An **absolute path** searches from the _root_ of the project. It starts with a
-  leading `/`:
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
   ```typ
   #image("/assets/logo.png")
   ```
 
-<<<<<<< HEAD
 ### プロジェクトのルートディレクトリ
 
 デフォルトでは、プロジェクトのルートディレクトリはメインのTypstファイルの親ディレクトリです。
@@ -411,20 +222,10 @@ resources such as images, Typst files, or data files. Paths are represented as
 プロジェクトのルートディレクトリとして特定のフォルダーを設定したい場合は、CLIの`--root`フラグを使用できます。
 対象のファイルがそのフォルダーのサブディレクトリ内に含まれていることを確認してください。
 
-=======
-### Project root
-By default, the project root is the parent directory of the main Typst file.
-For security reasons, you cannot read any files outside of the root directory.
-
-If you want to set a specific folder as the root of your project, you can use
-the CLI's `--root` flag. Make sure that the main file is contained in the
-folder's subtree!
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 ```bash
 typst compile --root .. file.typ
 ```
 
-<<<<<<< HEAD
 Webアプリでは、プロジェクト自体がルートディレクトリとして扱われます。
 どのファイルをプレビューしていても（プレビューはファイルパネル内の各Typstファイルの横にある目のアイコンで切り替え可能）、
 その中にある全てのファイルを常に読み取れます。
@@ -441,22 +242,3 @@ Webアプリでは、プロジェクト自体がルートディレクトリと
 将来的には、パスが[文字列とは異なるパス専用の型](https://github.com/typst/typst/issues/971)になるかもしれません。
 そうすることで、そのパスがどこで生成されたかという情報を保持できるようになります。
 これにより、異なるルートからリソースを読み込むことも可能になるでしょう。
-=======
-In the web app, the project itself is the root directory. You can always read
-all files within it, no matter which one is previewed (via the eye toggle next
-to each Typst file in the file panel).
-
-### Paths and packages
-A package can only load files from its own directory. Within it, absolute paths
-point to the package root, rather than the project root. For this reason, it
-cannot directly load files from the project directory. If a package needs
-resources from the project (such as a logo image), you must pass the already
-loaded image, e.g. as a named parameter `{logo: image("mylogo.svg")}`. Note that
-you can then still customize the image's appearance with a set rule within the
-package.
-
-In the future, paths might become a
-[distinct type from strings](https://github.com/typst/typst/issues/971), so that
-they can retain knowledge of where they were constructed. This way, resources
-could be loaded from a different root.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
diff --git a/docs/reference/library/data-loading.md b/docs/reference/library/data-loading.md
index fd74467f60..8918505dca 100644
--- a/docs/reference/library/data-loading.md
+++ b/docs/reference/library/data-loading.md
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 外部ファイルからのデータの読み込み。
 
 これらの関数は、
@@ -13,20 +12,3 @@
 一般に、数値、文字列、およびそれらから構成される[配列]($array)や[辞書]($dictionary)は確実に変換できますが、
 その他の型は[`repr`]($repr)経由で文字列にフォールバックされる場合があります。これは[デバッグ目的のみ]($repr/#debugging-only)に使用するものです。
 詳細は各データ形式のページを参照してください。
-=======
-Data loading from external files.
-
-These functions help you with loading and embedding data, for example from the
-results of an experiment.
-
-# Encoding
-Some of the functions are also capable of encoding, e.g. [`cbor.encode`]. They
-facilitate passing structured data to [plugins]($plugin).
-
-However, each data format has its own native types. Therefore, for an arbitrary
-Typst value, the encode-to-decode roundtrip might be lossy. In general, numbers,
-strings, and [arrays]($array) or [dictionaries]($dictionary) composed of them
-can be reliably converted, while other types may fall back to strings via [`repr`],
-which is [for debugging purposes only]($repr/#debugging-only). Please refer to
-the page of each data format for details.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
diff --git a/docs/reference/library/introspection.md b/docs/reference/library/introspection.md
index 58d7dd1c78..f4ac7a6ac6 100644
--- a/docs/reference/library/introspection.md
+++ b/docs/reference/library/introspection.md
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 文書内の相互作用。
 
 このカテゴリーはTypstの内省機能に関するものです。
@@ -8,15 +7,3 @@
 
 ほとんどの関数は_コンテキスト依存_です。
 先へ進む前に[コンテキスト]($context)の章を読むことをおすすめします。
-=======
-Interactions between document parts.
-
-This category is home to Typst's introspection capabilities: With the `counter`
-function, you can access and manipulate page, section, figure, and equation
-counters or create custom ones. Meanwhile, the `query` function lets you search
-for elements in the document to construct things like a list of figures or
-headers which show the current chapter title.
-
-Most of the functions are _contextual._ It is recommended to read the chapter on
-[context] before continuing here.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
diff --git a/docs/reference/library/layout.md b/docs/reference/library/layout.md
index 57ac918476..52d52ad065 100644
--- a/docs/reference/library/layout.md
+++ b/docs/reference/library/layout.md
@@ -1,9 +1,3 @@
-<<<<<<< HEAD
 ページ内の要素をさまざまな方法で配置。
 
 layout関数を組み合わせることで複雑なレイアウトを自動的に作成できます。
-=======
-Arranging elements on the page in different ways.
-
-By combining layout functions, you can create complex and automatic layouts.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
diff --git a/docs/reference/library/math.md b/docs/reference/library/math.md
index 4c02dd2857..643d1332b6 100644
--- a/docs/reference/library/math.md
+++ b/docs/reference/library/math.md
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 Typstには数式を組版するための特別な[構文]($syntax/#math)とライブラリ関数があります。
 数式は、テキスト中にインラインで、あるいは独立したブロックのいずれかで表示できます。
 始まりと終わりに少なくとも1つの空白がある場合（例えば、`[$ x^2 $]`）はブロックとして組版されます。
@@ -8,18 +7,6 @@ Typstには数式を組版するための特別な[構文]($syntax/#math)とラ
 しかし、複数の文字は変数か関数として解釈されます。
 複数の文字を文字通りに表示するには引用符で囲んでください。
 1文字の変数にアクセスしたい場合は[ハッシュ構文]($scripting/#expressions)を使用してください。
-=======
-Typst has special [syntax]($syntax/#math) and library functions to typeset
-mathematical formulas. Math formulas can be displayed inline with text or as
-separate blocks. They will be typeset into their own block if they start and end
-with at least one space (e.g. `[$ x^2 $]`).
-
-# Variables
-In math, single letters are always displayed as is. Multiple letters, however,
-are interpreted as variables and functions. To display multiple letters
-verbatim, you can place them into quotes and to access single letter variables,
-you can use the [hash syntax]($scripting/#expressions).
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 
 ```example
 $ A = pi r^2 $
@@ -30,36 +17,20 @@ $ cal(A) :=
 $ #x < 17 $
 ```
 
-<<<<<<< HEAD
 # 記号
 数式モードでは`pi`、`dot`、`RR`などのさまざまな[記号]($category/symbols/sym)が利用可能です。
 多くの数式記号ではバリアントが利用可能です。
 記号に[修飾子]($symbol)を適用することで異なるバリアントを選択できます。
 Typstはさらに`=>`のような、記号を近似するいくつかの省略記法を認識します。
 そのような省略記法が存在する場合、記号ドキュメントのリストに記載されています。
-=======
-# Symbols
-Math mode makes a wide selection of [symbols]($category/symbols/sym) like `pi`,
-`dot`, or `RR` available. Many mathematical symbols are available in different
-variants. You can select between different variants by applying
-[modifiers]($symbol) to the symbol. Typst further recognizes a number of
-shorthand sequences like `=>` that approximate a symbol. When such a shorthand
-exists, the symbol's documentation lists it.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 
 ```example
 $ x < y => x gt.eq.not y $
 ```
 
-<<<<<<< HEAD
 # 改行
 数式には改行を含めることもできます。
 各行には、その場所で配置することを指定する、1つまたは複数の_配置点_（`&`）を含めることができます。
-=======
-# Line Breaks
-Formulas can also contain line breaks. Each line can contain one or multiple
-_alignment points_ (`&`) which are then aligned.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 
 ```example
 $ sum_(k=0)^n k
@@ -67,7 +38,6 @@ $ sum_(k=0)^n k
     &= (n(n+1)) / 2 $
 ```
 
-<<<<<<< HEAD
 # 関数呼び出し
 数式モードはハッシュプレフィックスを用いない特別な関数呼び出しをサポートしています。
 このような「数式呼び出し」内では、引数リストは以下の通りコード中とは少し異なる動作をします。
@@ -78,19 +48,6 @@ $ sum_(k=0)^n k
 - 後続のコンテンツブロックはサポートされていません。
 - 2次元引数リストのための追加の構文があります。
 セミコロン（`;`）はその前のカンマ区切りの引数を配列引数へとマージします。
-=======
-# Function calls
-Math mode supports special function calls without the hash prefix. In these
-"math calls", the argument list works a little differently than in code:
-
-- Within them, Typst is still in "math mode". Thus, you can write math directly
-  into them, but need to use hash syntax to pass code expressions (except for
-  strings, which are available in the math syntax).
-- They support positional and named arguments, as well as argument spreading.
-- They don't support trailing content blocks.
-- They provide additional syntax for 2-dimensional argument lists. The semicolon
-  (`;`) merges preceding arguments separated by commas into an array argument.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 
 ```example
 $ frac(a^2, 2) $
@@ -101,7 +58,6 @@ $ lim_x =
     op("lim", limits: #true)_x $
 ```
 
-<<<<<<< HEAD
 数式呼び出しでカンマやセミコロンをそのまま書きたい場合は、バックスラッシュを用いてエスケープしてください。
 一方、コロンは識別子の直後にあるときにのみ特別な方法で認識されるため、そのまま表示したい場合は単にその前に空白を挿入してください。
 
@@ -114,24 +70,6 @@ $ lim_x =
 `& &`と`&&`は全く同じように振る舞います。
 一方、"multiply by 7"は、その前に`&`がただ1つあるため右揃えです。
 各配置点は単に右揃えと左揃えを交互に切り替えます。
-=======
-To write a verbatim comma or semicolon in a math call, escape it with a
-backslash. The colon on the other hand is only recognized in a special way if
-directly preceded by an identifier, so to display it verbatim in those cases,
-you can just insert a space before it.
-
-Functions calls preceded by a hash are normal code function calls and not
-affected by these rules.
-
-# Alignment
-When equations include multiple _alignment points_ (`&`), this creates blocks of
-alternatingly right- and left-aligned columns. In the example below, the
-expression `(3x + y) / 7` is right-aligned and `= 9` is left-aligned. The word
-"given" is also left-aligned because `&&` creates two alignment points in a row,
-alternating the alignment twice. `& &` and `&&` behave exactly the same way.
-Meanwhile, "multiply by 7" is right-aligned because just one `&` precedes it.
-Each alignment point simply alternates between right-aligned/left-aligned.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 
 ```example
 $ (3x + y) / 7 &= 9 && "given" \
@@ -140,23 +78,15 @@ $ (3x + y) / 7 &= 9 && "given" \
   x &= 21 - y/3 & "divide by 3" $
 ```
 
-<<<<<<< HEAD
 # 数式フォント
 以下に示すように、[show-setルール]($styling/#show-rules)を用いて数式フォントの設定が可能です。
 数式組版に適しているのは一部の特別なOpenType数式フォントのみであることに注意してください。
-=======
-# Math fonts
-You can set the math font by with a [show-set rule]($styling/#show-rules) as
-demonstrated below. Note that only special OpenType math fonts are suitable for
-typesetting maths.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 
 ```example
 #show math.equation: set text(font: "Fira Math")
 $ sum_(i in NN) 1 + i $
 ```
 
-<<<<<<< HEAD
 # mathモジュール
 全ての数学関数は、数式中ではデフォルトで利用できる`math`[モジュール]($scripting/#modules)に属しています。
 数式外では、`math.`プレフィックスを付けるとアクセスできます。
@@ -164,35 +94,13 @@ $ sum_(i in NN) 1 + i $
 # アクセシビリティ { #accessibility }
 数式をアクセシブルにするには、[`math.equation`の`alt`パラメーター]($math.equation.alt)を使い、自然言語による数式の代替説明を提供する必要があります。
 詳細は[アクセシビリティガイドの「テキストによる表現」セクション]($guides/accessibility/#textual-representations)を参照してください。
-=======
-# Math module
-All math functions are part of the `math` [module]($scripting/#modules), which
-is available by default in equations. Outside of equations, they can be accessed
-with the `math.` prefix.
-
-# Accessibility
-To make math accessible, you must provide alternative descriptions of equations
-in natural language using the [`alt` parameter of
-`math.equation`]($math.equation.alt). For more information, see the [Textual
-Representations section of the Accessibility
-Guide]($guides/accessibility/#textual-representations).
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 
 ```example
 #math.equation(
   alt: "d S equals delta q divided by T",
-<<<<<<< HEAD
-  $ d "S" = (delta q) / T $,
-)
-```
-
-将来的には、HTMLおよびPDF 2.0エクスポートにおいてTypstは代替説明のない数式を自動的にアクセシブルにする予定です。
-=======
   block: true,
   $ dif S = (delta q) / T $,
 )
 ```
 
-In the future, Typst will automatically make equations without alternative
-descriptions accessible in HTML and PDF 2.0 export.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
+将来的には、HTMLおよびPDF 2.0エクスポートにおいてTypstは代替説明のない数式を自動的にアクセシブルにする予定です。
diff --git a/docs/reference/library/visualize.md b/docs/reference/library/visualize.md
index c0fb283c5d..0906d707fd 100644
--- a/docs/reference/library/visualize.md
+++ b/docs/reference/library/visualize.md
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 描画とデータの可視化。
 
 より高度な図やプロットを作成したい場合は、
@@ -15,21 +14,3 @@ Typstが描画する全ての図形とパスは、PDFエクスポート時に支
 [`figure`]関数で囲んでアクセシブルにしてください。
 [テキストによる表現]($guides/accessibility/#textual-representations)を提供するには、
 `figure`関数の[`alt`パラメーター]($figure.alt)で指定します。
-=======
-Drawing and data visualization.
-
-If you want to create more advanced drawings or plots, also have a look at the
-[CeTZ](https://github.com/johannes-wolf/cetz) package as well as more
-specialized [packages]($universe) for your use case.
-
-# Accessibility
-
-All shapes and paths drawn by Typst are automatically marked as
-[artifacts]($pdf.artifact) to make them invisible to Assistive Technology (AT)
-during PDF export. However, their contents (if any) remain accessible.
-
-If you are using the functions in this model to create an illustration with
-semantic meaning, make it accessible by wrapping it in a [`figure`] function
-call. Use its [`alt` parameter]($figure.alt) to provide an
-[alternative description]($guides/accessibility/#textual-representations).
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
diff --git a/docs/reference/welcome.md b/docs/reference/welcome.md
index 587bd68fee..6d06138797 100644
--- a/docs/reference/welcome.md
+++ b/docs/reference/welcome.md
@@ -1,6 +1,5 @@
 ---
 description: |
-<<<<<<< HEAD
   Typst リファレンスは、Typst 言語の体系的かつ包括的なガイドです。
 ---
 
@@ -22,31 +21,3 @@ Typstを使うのが初めてであればまず[チュートリアル]($tutorial
 最後の章には、データを操作・変形するためにTypstのコードモード内で用いられる
 全ての関数の説明があります。前の章と同様に、それぞれの関数にはその役割の説明、
 引数の一覧、そして使い方の例が記載されています。
-=======
-  The Typst reference is a systematic and comprehensive guide to the Typst
-  typesetting language.
----
-
-# Reference
-This reference documentation is a comprehensive guide to all of Typst's syntax,
-concepts, types, and functions. If you are completely new to Typst, we recommend
-starting with the [tutorial] and then coming back to the reference to learn more
-about Typst's features as you need them.
-
-## Language
-The reference starts with a language part that gives an overview over
-[Typst's syntax]($syntax) and contains information about concepts involved in
-[styling documents,]($styling) using
-[Typst's scripting capabilities.]($scripting)
-
-## Functions
-The second part includes chapters on all functions used to insert, style, transform,
-and layout content in Typst documents. Each function is documented with a
-description of its purpose, a list of its parameters, and examples of how to use
-it.
-
-The final part of the reference explains all functions that are used within
-Typst's code mode to manipulate and transform data. Just as in the previous
-part, each function is documented with a description of its purpose, a list of
-its parameters, and examples of how to use it.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
diff --git a/docs/src/html.rs b/docs/src/html.rs
index a2ddb0e392..f2ab68e793 100644
--- a/docs/src/html.rs
+++ b/docs/src/html.rs
@@ -4,10 +4,7 @@ use std::ops::Range;
 use ecow::EcoString;
 use heck::{ToKebabCase, ToTitleCase};
 use pulldown_cmark as md;
-<<<<<<< HEAD
 use pulldown_cmark_escape::escape_html;
-=======
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 use serde::{Deserialize, Serialize};
 use typed_arena::Arena;
 use typst::diag::{FileError, FileResult, StrResult};
@@ -65,12 +62,8 @@ impl Html {
         let options = md::Options::ENABLE_TABLES
             | md::Options::ENABLE_FOOTNOTES
             | md::Options::ENABLE_STRIKETHROUGH
-<<<<<<< HEAD
             | md::Options::ENABLE_HEADING_ATTRIBUTES
             | md::Options::ENABLE_CJK_FRIENDLY_EMPHASIS;
-=======
-            | md::Options::ENABLE_HEADING_ATTRIBUTES;
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 
         // Convert `[foo]` to `[foo]($foo)`.
         let mut link = |broken: md::BrokenLink| {
@@ -200,11 +193,7 @@ impl<'a> Handler<'a> {
     fn handle(&mut self, event: &mut md::Event<'a>) -> bool {
         match event {
             // Rewrite Markdown images.
-<<<<<<< HEAD
             md::Event::Start(md::Tag::Image { dest_url: path, .. }) => {
-=======
-            md::Event::Start(md::Tag::Image(_, path, _)) => {
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
                 *path = self.handle_image(path).into();
             }
 
@@ -218,20 +207,12 @@ impl<'a> Handler<'a> {
             }
 
             // Register HTML headings for the outline.
-<<<<<<< HEAD
             md::Event::Start(md::Tag::Heading { level, id, .. }) => {
-=======
-            md::Event::Start(md::Tag::Heading(level, id, _)) => {
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
                 self.handle_heading(id, level);
             }
 
             // Also handle heading closings.
-<<<<<<< HEAD
             md::Event::End(md::TagEnd::Heading(level)) => {
-=======
-            md::Event::End(md::Tag::Heading(level, _, _)) => {
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
                 nest_heading(level, self.nesting());
             }
 
@@ -246,20 +227,13 @@ impl<'a> Handler<'a> {
             }
 
             // Rewrite links.
-<<<<<<< HEAD
             md::Event::Start(md::Tag::Link { link_type: ty, dest_url: dest, .. }) => {
-=======
-            md::Event::Start(md::Tag::Link(ty, dest, _)) => {
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
                 assert!(
                     matches!(
                         ty,
                         md::LinkType::Inline
                             | md::LinkType::Reference
-<<<<<<< HEAD
                             | md::LinkType::Shortcut
-=======
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
                             | md::LinkType::ShortcutUnknown
                             | md::LinkType::Autolink
                     ),
@@ -292,11 +266,7 @@ impl<'a> Handler<'a> {
                 self.code = EcoString::new();
                 return false;
             }
-<<<<<<< HEAD
             md::Event::End(md::TagEnd::CodeBlock) => {
-=======
-            md::Event::End(md::Tag::CodeBlock(md::CodeBlockKind::Fenced(_))) => {
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
                 let Some(lang) = self.lang.take() else { return false };
                 let html = code_block(self.resolver, &lang, &self.code);
                 *event = md::Event::Html(html.raw.into());
@@ -328,11 +298,7 @@ impl<'a> Handler<'a> {
 
     fn handle_heading(
         &mut self,
-<<<<<<< HEAD
         id_slot: &mut Option<md::CowStr<'a>>,
-=======
-        id_slot: &mut Option<&'a str>,
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
         level: &mut md::HeadingLevel,
     ) {
         nest_heading(level, self.nesting());
@@ -344,20 +310,13 @@ impl<'a> Handler<'a> {
         let default = body.map(|text| text.to_kebab_case());
         let has_id = id_slot.is_some();
 
-<<<<<<< HEAD
         let id = match id_slot.take() {
             Some(id) => {
                 if Some(id.as_ref()) == default.as_deref() {
-=======
-        let id: &'a str = match (&id_slot, default) {
-            (Some(id), default) => {
-                if Some(*id) == default.as_deref() {
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
                     eprintln!("heading id #{id} was specified unnecessarily");
                 }
                 id
             }
-<<<<<<< HEAD
             None => match default {
                 Some(default) => md::CowStr::Borrowed(self.ids.alloc(default).as_str()),
                 None => panic!("missing heading id {}", self.text),
@@ -369,19 +328,6 @@ impl<'a> Handler<'a> {
             _ if id.starts_with('v') && id.contains('.') => id.as_ref().into(),
             Some(body) if !has_id => body.as_ref().into(),
             _ => id.as_ref().to_title_case().into(),
-=======
-            (None, Some(default)) => self.ids.alloc(default).as_str(),
-            (None, None) => panic!("missing heading id {}", self.text),
-        };
-
-        *id_slot = (!id.is_empty()).then_some(id);
-
-        // Special case for things like "v0.3.0".
-        let name = match &body {
-            _ if id.starts_with('v') && id.contains('.') => id.into(),
-            Some(body) if !has_id => body.as_ref().into(),
-            _ => id.to_title_case().into(),
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
         };
 
         let mut children = &mut self.outline;
@@ -393,12 +339,8 @@ impl<'a> Handler<'a> {
             depth -= 1;
         }
 
-<<<<<<< HEAD
         children.push(OutlineItem { id: id.as_ref().into(), name, children: vec![] });
         *id_slot = (!id.is_empty()).then_some(id);
-=======
-        children.push(OutlineItem { id: id.into(), name, children: vec![] });
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     }
 
     fn handle_link(&self, link: &str) -> StrResult<String> {
@@ -496,11 +438,7 @@ fn code_block(resolver: &dyn Resolver, tag: &str, text: &str) -> Html {
 
     if lang.is_empty() {
         let mut buf = String::from("<pre>");
-<<<<<<< HEAD
         escape_html(&mut buf, &display).unwrap();
-=======
-        md::escape::escape_html(&mut buf, &display).unwrap();
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
         buf.push_str("</pre>");
         return Html::new(buf);
     } else if !matches!(lang, "example" | "typ" | "preview") {
diff --git a/docs/src/lib.rs b/docs/src/lib.rs
index 9f27696c8e..0f8c97bc33 100644
--- a/docs/src/lib.rs
+++ b/docs/src/lib.rs
@@ -95,12 +95,9 @@ pub fn provide(resolver: &dyn Resolver) -> Vec<PageModel> {
         reference_pages(resolver),
         guide_pages(resolver),
         changelog_pages(resolver),
-<<<<<<< HEAD
         japanese_pages(resolver),
         about_pages(resolver),
         md_page(resolver, base, load!("glossary.md")),
-=======
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     ]
 }
 
@@ -196,10 +193,7 @@ fn reference_pages(resolver: &dyn Resolver) -> PageModel {
 fn guide_pages(resolver: &dyn Resolver) -> PageModel {
     let mut page = md_page(resolver, resolver.base(), load!("guides/welcome.md"));
     let base = format!("{}guides/", resolver.base());
-<<<<<<< HEAD
     page.title = "ガイド".into();
-=======
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     page.children = vec![
         md_page_with_title(
             resolver,
@@ -228,13 +222,9 @@ fn guide_pages(resolver: &dyn Resolver) -> PageModel {
 fn changelog_pages(resolver: &dyn Resolver) -> PageModel {
     let mut page = md_page(resolver, resolver.base(), load!("changelog/welcome.md"));
     let base = format!("{}changelog/", resolver.base());
-<<<<<<< HEAD
     page.title = "変更履歴".into();
-    page.children = vec![
-=======
     page.children = vec![
         md_page(resolver, &base, load!("changelog/0.14.1.md")),
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
         md_page(resolver, &base, load!("changelog/0.14.0.md")),
         md_page(resolver, &base, load!("changelog/0.13.1.md")),
         md_page(resolver, &base, load!("changelog/0.13.0.md")),
@@ -252,15 +242,7 @@ fn changelog_pages(resolver: &dyn Resolver) -> PageModel {
         md_page(resolver, &base, load!("changelog/0.2.0.md")),
         md_page(resolver, &base, load!("changelog/0.1.0.md")),
         md_page(resolver, &base, load!("changelog/earlier.md")),
-<<<<<<< HEAD
-    ]
-    .into_iter()
-    .map(|child| {
-        let route = eco_format!("{base}{}/", urlify(child.title.as_str()));
-        PageModel { route, ..child }
-    })
-    .collect();
-
+    ];
     page
 }
 
@@ -283,8 +265,6 @@ fn about_pages(resolver: &dyn Resolver) -> PageModel {
     page.children = vec![
         md_page(resolver, &base, load!("../CONTRIBUTING.md")),
         md_page(resolver, &base, load!("../TRANSLATING_GUIDELINES.md")),
-=======
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     ];
     page
 }
@@ -407,17 +387,12 @@ fn category_page(resolver: &dyn Resolver, category: Category) -> PageModel {
         items.sort_by_cached_key(|item| item.name.clone());
     }
 
-<<<<<<< HEAD
     let _title = EcoString::from(match category {
-=======
-    let title = EcoString::from(match category {
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
         Category::Pdf | Category::Html | Category::Png | Category::Svg => {
             category.name().to_uppercase()
         }
         _ => category.name().to_title_case(),
     });
-<<<<<<< HEAD
     let translated_title = EcoString::from(match category {
         Category::Foundations => "基礎",
         Category::Model => "モデル",
@@ -446,14 +421,6 @@ fn category_page(resolver: &dyn Resolver, category: Category) -> PageModel {
             name: "定義".into(),
             children: vec![],
         });
-=======
-
-    let details = Html::markdown(resolver, docs, Some(1));
-    let mut outline = vec![OutlineItem::from_name("Summary")];
-    outline.extend(details.outline());
-    if !items.is_empty() {
-        outline.push(OutlineItem::from_name("Definitions"));
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     }
     if shorthands.is_some() {
         outline.push(OutlineItem::from_name("Shorthands"));
@@ -461,25 +428,15 @@ fn category_page(resolver: &dyn Resolver, category: Category) -> PageModel {
 
     PageModel {
         route,
-<<<<<<< HEAD
         title: translated_title.clone().into(),
         description: eco_format!(
             "Typstにおける{translated_title}に関連する関数のドキュメント"
-=======
-        title: title.clone(),
-        description: eco_format!(
-            "Documentation for functions related to {title} in Typst."
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
         ),
         part: None,
         outline,
         body: BodyModel::Category(CategoryModel {
             name: category.name(),
-<<<<<<< HEAD
             title: translated_title,
-=======
-            title,
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
             details,
             items,
             shorthands,
@@ -665,18 +622,12 @@ fn details_blocks(docs: &str) -> Vec<RawDetailsBlock<'_>> {
                 let tag = &docs[fence_idx + fence_len..lang_tag_end].trim();
                 let title = ExampleArgs::from_tag(tag).title;
 
-<<<<<<< HEAD
-                // First, push non-fenced content.
-                if found > 0 {
-                    res.push(RawDetailsBlock::Markdown(&docs[i..fence_idx]));
-=======
                 // First, push non-fenced content. It might be all whitespaces
                 // if it's between two consecutive fences. Therefore, we have to
                 // trim it before checking.
                 let content_before_fence = &docs[i..fence_idx];
                 if !content_before_fence.trim().is_empty() {
                     res.push(RawDetailsBlock::Markdown(content_before_fence));
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
                 }
 
                 // Then, find the end of the fence.
@@ -699,15 +650,11 @@ fn details_blocks(docs: &str) -> Vec<RawDetailsBlock<'_>> {
                 i = fence_end;
             }
             None => {
-<<<<<<< HEAD
-                res.push(RawDetailsBlock::Markdown(&docs[i..]));
-=======
                 // Push the remaining content only if it's non-empty after trimming.
                 let slice = &docs[i..];
                 if !slice.trim().is_empty() {
                     res.push(RawDetailsBlock::Markdown(slice));
                 }
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
                 break;
             }
         }
@@ -765,15 +712,11 @@ fn func_outline(model: &FuncModel, id_base: &str) -> Vec<OutlineItem> {
     let mut outline = vec![];
 
     if id_base.is_empty() {
-<<<<<<< HEAD
         outline.push(OutlineItem {
             id: "summary".into(),
             name: "概要".into(),
             children: vec![],
         });
-=======
-        outline.push(OutlineItem::from_name("Summary"));
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
         for block in &model.details {
             if let DetailsBlock::Html(html) = block {
                 outline.extend(html.outline());
@@ -783,11 +726,7 @@ fn func_outline(model: &FuncModel, id_base: &str) -> Vec<OutlineItem> {
         if !model.params.is_empty() {
             outline.push(OutlineItem {
                 id: "parameters".into(),
-<<<<<<< HEAD
                 name: "引数".into(),
-=======
-                name: "Parameters".into(),
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
                 children: model
                     .params
                     .iter()
@@ -830,11 +769,7 @@ fn scope_outline(scope: &[FuncModel], id_base: &str) -> Option<OutlineItem> {
         })
         .collect();
 
-<<<<<<< HEAD
     Some(OutlineItem { id, name: "定義".into(), children })
-=======
-    Some(OutlineItem { id, name: "Definitions".into(), children })
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 }
 
 /// Create a page for a group of functions.
@@ -844,15 +779,11 @@ fn group_page(
     group: &GroupData,
 ) -> (PageModel, CategoryItem) {
     let mut functions = vec![];
-<<<<<<< HEAD
     let mut outline = vec![OutlineItem {
         id: "summary".into(),
         name: "概要".into(),
         children: vec![],
     }];
-=======
-    let mut outline = vec![OutlineItem::from_name("Summary")];
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 
     let path: Vec<_> = group.path.iter().map(|s| s.as_str()).collect();
     let details = Html::markdown(resolver, &group.details, Some(1));
@@ -877,11 +808,7 @@ fn group_page(
 
     outline.push(OutlineItem {
         id: "functions".into(),
-<<<<<<< HEAD
         name: "関数".into(),
-=======
-        name: "Functions".into(),
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
         children: outline_items,
     });
 
@@ -981,25 +908,17 @@ fn type_model(resolver: &dyn Resolver, ty: &Type) -> TypeModel {
 
 /// Produce an outline for a type page.
 fn type_outline(model: &TypeModel) -> Vec<OutlineItem> {
-<<<<<<< HEAD
     let mut outline = vec![OutlineItem {
         id: "summary".into(),
         name: "概要".into(),
         children: vec![],
     }];
-=======
-    let mut outline = vec![OutlineItem::from_name("Summary")];
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     outline.extend(model.details.outline());
 
     if let Some(func) = &model.constructor {
         outline.push(OutlineItem {
             id: "constructor".into(),
-<<<<<<< HEAD
             name: "コンストラクタ".into(),
-=======
-            name: "Constructor".into(),
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
             children: func_outline(func, "constructor"),
         });
     }
@@ -1037,10 +956,6 @@ fn symbols_model(resolver: &dyn Resolver, group: &GroupData) -> SymbolsModel {
 
         for (variant, value, deprecation_message) in symbol.variants() {
             let value_char = value.parse::<char>().ok();
-<<<<<<< HEAD
-
-=======
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
             let shorthand = |list: &[(&'static str, char)]| {
                 value_char.and_then(|c| {
                     list.iter().copied().find(|&(_, x)| x == c).map(|(s, _)| s)
@@ -1059,12 +974,7 @@ fn symbols_model(resolver: &dyn Resolver, group: &GroupData) -> SymbolsModel {
                 }),
                 value: value.into(),
                 // Matches casting `Symbol` to `Accent`
-<<<<<<< HEAD
-                accent: value_char
-                    .is_some_and(|c| typst::math::Accent::combine(c).is_some()),
-=======
                 accent: typst::math::Accent::combining(value).is_some(),
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
                 alternates: symbol
                     .variants()
                     .filter(|(other, _, _)| other != &variant)
@@ -1096,7 +1006,6 @@ fn get_module<'a>(parent: &'a Module, name: &str) -> StrResult<&'a Module> {
 
 /// Turn a title into an URL fragment.
 pub fn urlify(title: &str) -> EcoString {
-<<<<<<< HEAD
     match title {
         "チュートリアル" => "tutorial".into(),
         "Typstで執筆するには" => "writing-in-typst".into(),
@@ -1134,16 +1043,6 @@ pub fn urlify(title: &str) -> EcoString {
             })
             .collect(),
     }
-=======
-    title
-        .chars()
-        .map(|c| c.to_ascii_lowercase())
-        .map(|c| match c {
-            'a'..='z' | '0'..='9' | '.' => c,
-            _ => '-',
-        })
-        .collect()
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 }
 
 /// Extract the first line of documentation.
@@ -1280,8 +1179,6 @@ mod tests {
             "/"
         }
     }
-<<<<<<< HEAD
-=======
 
     #[test]
     fn test_parsing_details_blocks() {
@@ -1315,5 +1212,4 @@ Empty lines after the final example should also be dropped.
         matches!(blocks[3], RawDetailsBlock::Example { .. });
         matches!(blocks[4], RawDetailsBlock::Example { .. });
     }
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 }
diff --git a/docs/src/link.rs b/docs/src/link.rs
index 59de6f452b..61e6c911d5 100644
--- a/docs/src/link.rs
+++ b/docs/src/link.rs
@@ -59,11 +59,8 @@ fn resolve_known(head: &str, base: &str) -> Option<String> {
         "$pdf" => format!("{base}reference/pdf"),
         "$guides" => format!("{base}guides"),
         "$changelog" => format!("{base}changelog"),
-<<<<<<< HEAD
         "$japanese" => format!("{base}japanese"),
         "$about" => format!("{base}about"),
-=======
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
         "$universe" => "https://typst.app/universe".into(),
         _ => return None,
     })
diff --git a/docs/tutorial/1-writing.md b/docs/tutorial/1-writing.md
index 0f3f6556b6..b9da0ac30f 100644
--- a/docs/tutorial/1-writing.md
+++ b/docs/tutorial/1-writing.md
@@ -1,5 +1,4 @@
 ---
-<<<<<<< HEAD
 description: Typstチュートリアル
 ---
 # Typstで執筆するには
@@ -12,23 +11,6 @@ description: Typstチュートリアル
 
 レポートの良い切り口はすでに考えてあるので、まずは導入を書いてみましょう。
 エディターパネルにいくつかのテキストを入力してください。テキストがすぐにプレビューページに表示されるのがわかるでしょう。
-=======
-description: Typst's tutorial.
----
-
-# Writing in Typst
-Let's get started! Suppose you got assigned to write a technical report for
-university. It will contain prose, maths, headings, and figures. To get started,
-you create a new project on the Typst app. You'll be taken to the editor where
-you see two panels: A source panel where you compose your document and a
-preview panel where you see the rendered document.
-
-![Typst app screenshot](1-writing-app.png)
-
-You already have a good angle for your report in mind. So let's start by writing
-the introduction. Enter some text in the editor panel. You'll notice that the
-text immediately appears on the previewed page.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 
 ```example
 In this report, we will explore the
@@ -38,19 +20,10 @@ contribute to the formation and
 behaviour of these natural structures.
 ```
 
-<<<<<<< HEAD
 _このチュートリアル全体を通して、このようなコード例を紹介します。アプリと同様に、最初のパネルにはマークアップが含まれ、2番目のパネルにはプレビューが表示されます。何が起こっているかわかりやすいように例にあわせてページを縮小しています。_
 
 次のステップは、見出しを追加して、いくつかのテキストを強調することです。
 Typstでは、頻繁に使う書式をシンプルなマークアップで表現するようになっています。見出しを追加するには `=` の文字を入力します。テキストを斜体で強調するには、テキストを `[_アンダースコア_]` で囲みます。
-=======
-_Throughout this tutorial, we'll show code examples like this one. Just like in the app, the first panel contains markup and the second panel shows a preview. We shrunk the page to fit the examples so you can see what's going on._
-
-The next step is to add a heading and emphasize some text. Typst uses simple
-markup for the most common formatting tasks. To add a heading, enter the `=`
-character and to emphasize some text with italics, enclose it in
-`[_underscores_]`.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 
 ```example
 = Introduction
@@ -61,7 +34,6 @@ contribute to the formation and
 behaviour of these natural structures.
 ```
 
-<<<<<<< HEAD
 簡単でしたね！新しい段落を追加するには、2行のテキストの間に空行を追加するだけです。
 その段落に小見出しが必要な場合は、`=` の代わりに `==` を入力して作成します。
 `=` の数が見出しのネストレベルを決定します。
@@ -69,17 +41,6 @@ behaviour of these natural structures.
 次に、氷河の動態に影響を与える要因をいくつか列挙してみましょう。
 そのために、ここでは番号付きリストを使いましょう。リストの各項目について、行の先頭に `+` 文字を入力します。
 すると、Typstが自動的に項目を番号付けしてくれるのです。
-=======
-That was easy! To add a new paragraph, just add a blank line in between two
-lines of text. If that paragraph needs a subheading, produce it by typing `==`
-instead of `=`. The number of `=` characters determines the nesting level of the
-heading.
-
-Now we want to list a few of the circumstances that influence glacier dynamics.
-To do that, we use a numbered list. For each item of the list, we type a `+`
-character at the beginning of the line. Typst will automatically number the
-items.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 
 ```example
 + The climate
@@ -87,15 +48,9 @@ items.
 + The geology
 ```
 
-<<<<<<< HEAD
 箇条書きリストを追加したい場合は、`+` 文字の代わりに `-` 文字を使用します。
 また、リストはネストできます。
 例えば、上記のリストの最初の項目にサブリストを追加するには、それをインデントします。
-=======
-If we wanted to add a bulleted list, we would use the `-` character instead of
-the `+` character. We can also nest lists: For example, we can add a sub-list to
-the first item of the list above by indenting it.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 
 ```example
 + The climate
@@ -105,7 +60,6 @@ the first item of the list above by indenting it.
 + The geology
 ```
 
-<<<<<<< HEAD
 ## 図表を追加する {#figure}
 
 あなたは「レポートに図表を入れるともっとよくなる」と考えているとします。やりましょう。
@@ -125,33 +79,11 @@ Typstでは、PNG、JPEG、GIF、SVG、PDF、WebPの形式の画像をサポー
 そのため、Typstでは一般的な書式にのみマークアップ記号を用意し、それ以外は全て_関数_を使って挿入します。
 
 ページに画像を表示させるためには、Typstの[`image`]($image)関数を使用します。
-=======
-## Adding a figure { #figure }
-You think that your report would benefit from a figure. Let's add one. Typst
-supports images in the formats PNG, JPEG, GIF, SVG, PDF, and WebP. To add an
-image file to your project, first open the _file panel_ by clicking the box icon
-in the left sidebar. Here, you can see a list of all files in your project.
-Currently, there is only one: The main Typst file you are writing in. To upload
-another file, click the button with the arrow in the top-right corner. This
-opens the upload dialog, in which you can pick files to upload from your
-computer. Select an image file for your report.
-
-![Upload dialog](1-writing-upload.png)
-
-We have seen before that specific symbols (called _markup_) have specific
-meaning in Typst. We can use `=`, `-`, `+`, and `_` to create headings, lists
-and emphasized text, respectively. However, having a special symbol for
-everything we want to insert into our document would soon become cryptic and
-unwieldy. For this reason, Typst reserves markup symbols only for the most
-common things. Everything else is inserted with _functions._ For our image to
-show up on the page, we use Typst's [`image`] function.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 
 ```example
 #image("glacier.jpg")
 ```
 
-<<<<<<< HEAD
 一般的に、関数は一連の_引数_に対して何らかの出力を生成します。
 マークアップ内で関数を_呼び出す_時は、あなたが関数の引数を指定すると、Typstがその結果（関数の_戻り値_）を文書に挿入してくれます。
 今回の場合、`image` 関数は1つの引数として画像ファイルへのパスを受け取ります。
@@ -163,28 +95,11 @@ Typstは引数リスト内でさまざまなデータ型を認識します。
 挿入された画像はページ全体の幅を使います。これを変更するには、`image` 関数に `width `引数を渡します。
 これは_名前付き_引数であり、`引数の名前: 引数の値` という形式で指定されます。
 複数の引数がある場合はカンマで区切ります。そのため、ここでは先ほど指定したファイルパスの後ろにカンマを付ける必要があります。
-=======
-In general, a function produces some output for a set of _arguments_. When you
-_call_ a function within markup, you provide the arguments and Typst inserts the
-result (the function's _return value_) into the document. In our case, the
-`image` function takes one argument: The path to the image file. To call a
-function in markup, we first need to type the `#` character, immediately
-followed by the name of the function. Then, we enclose the arguments in
-parentheses. Typst recognizes many different data types within argument lists.
-Our file path is a short [string of text]($str), so we need to enclose it in
-double quotes.
-
-The inserted image uses the whole width of the page. To change that, pass the
-`width` argument to the `image` function. This is a _named_ argument and
-therefore specified as a `name: value` pair. If there are multiple arguments,
-they are separated by commas, so we first need to put a comma behind the path.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 
 ```example
 #image("glacier.jpg", width: 70%)
 ```
 
-<<<<<<< HEAD
 `width` 引数は [相対的な長さ]($relative) です。
 上の例では、画像がページの幅の `{70%}` を占めるようにパーセンテージを指定しています。
 また、`{1cm}` や `{0.7in}` のような絶対値も指定できます。
@@ -199,25 +114,6 @@ they are separated by commas, so we first need to put a comma behind the path.
 
 キャプションの中には、任意のマークアップを含めることが出来ます。
 ある関数の引数としてマークアップを指定するためには、それを角括弧 `[ ]` で囲みます。この「マークアップが角括弧で囲まれている構造」のことを、_コンテンツブロック_と呼びます。
-=======
-The `width` argument is a [relative length]($relative). In our case, we
-specified a percentage, determining that the image shall take up `{70%}` of the
-page's width. We also could have specified an absolute value like `{1cm}` or
-`{0.7in}`.
-
-Just like text, the image is now aligned at the left side of the page by
-default. It's also lacking a caption. Let's fix that by using the [figure]
-function. This function takes the figure's contents as a positional argument and
-an optional caption as a named argument.
-
-Within the argument list of the `figure` function, Typst is already in code
-mode. This means, you now have to remove the hash before the image function call.
-The hash is only needed directly in markup (to disambiguate text from function
-calls).
-
-The caption consists of arbitrary markup. To give markup to a function, we
-enclose it in square brackets. This construct is called a _content block._
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 
 ```example
 #figure(
@@ -229,20 +125,11 @@ enclose it in square brackets. This construct is called a _content block._
 )
 ```
 
-<<<<<<< HEAD
 あなたはレポートの執筆を続けるうちに、今度は先ほど挿入した図を文中から参照したくなったとします。
 その場合、まず図にラベルを付けます。
 ラベルとは、文書内の要素を一意に識別するための名前のことです。先ほど挿入した図の後ろに、その図のラベルを山括弧 `< >` で囲んで書き加えます。
 これで、テキスト内で `[@]` 記号を書いた後ろにラベル名を指定すると、その図を参照できるようになりました。
 見出しや方程式もラベルを付けて参照可能にできます。
-=======
-You continue to write your report and now want to reference the figure. To do
-that, first attach a label to figure. A label uniquely identifies an element in
-your document. Add one after the figure by enclosing some name in angle
-brackets. You can then reference the figure in your text by writing an `[@]`
-symbol followed by that name. Headings and equations can also be labelled to
-make them referenceable.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 
 ```example
 Glaciers as the one shown in
@@ -260,7 +147,6 @@ we don't take action soon!
 
 <div class="info-box">
 
-<<<<<<< HEAD
 これまでに、コンテンツブロック（角括弧 `[ ]` 内のマークアップ）と文字列（二重引用符 `" "` 内のテキスト）を関数に渡してきました。
 どちらもテキストを含んでいるように見えますが、違いは何でしょうか？
 
@@ -287,39 +173,6 @@ Typstでは、ネイティブな参考文献の形式として[Hayagriva](https:
 文書に参考文献が追加されている場合、参考文献欄にある文献を文中で引用できます。
 引用はラベルへの参照と同じ構文を使用します。デフォルトでは、文中で文献を引用した時点で初めて、その文献がTypstの参考文献セクションへ表示されるようになっています。
 Typstはさまざまな引用および参考文献のスタイルをサポートしています。詳細については [リファレンス]($bibliography.style)を参照してください。
-=======
-So far, we've passed content blocks (markup in square brackets) and strings
-(text in double quotes) to our functions. Both seem to contain text. What's the
-difference?
-
-A content block can contain text, but also any other kind of markup, function
-calls, and more, whereas a string is really just a _sequence of characters_ and
-nothing else.
-
-For example, the image function expects a path to an image file.
-It would not make sense to pass, e.g., a paragraph of text or another image as
-the image's path parameter. That's why only strings are allowed here.
-In contrast, strings work wherever content is expected because text is a
-valid kind of content.
-</div>
-
-## Adding a bibliography { #bibliography }
-As you write up your report, you need to back up some of your claims. You can
-add a bibliography to your document with the [`bibliography`] function. This
-function expects a path to a bibliography file.
-
-Typst's native bibliography format is
-[Hayagriva](https://github.com/typst/hayagriva/blob/main/docs/file-format.md),
-but for compatibility you can also use BibLaTeX files. As your classmate has
-already done a literature survey and sent you a `.bib` file, you'll use that
-one. Upload the file through the file panel to access it in Typst.
-
-Once the document contains a bibliography, you can start citing from it.
-Citations use the same syntax as references to a label. As soon as you cite a
-source for the first time, it will appear in the bibliography section of your
-document. Typst supports different citation and bibliography styles. Consult the
-[reference]($bibliography.style) for more details.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 
 ```example
 = Methods
@@ -329,33 +182,19 @@ established in @glacier-melt.
 #bibliography("works.bib")
 ```
 
-<<<<<<< HEAD
 ## 数式 {#maths}
 
 方法に関する節を肉付けした後、文書の主要な部分である方程式に進みます。
 Typstには組み込みの数学記法があり、独自の数学表記を使用します。
 簡単な方程式から始めましょう。Typstに数学的な表現を期待することを知らせるために、`[$]` 記号で囲みます。
-=======
-## Maths
-After fleshing out the methods section, you move on to the meat of the document:
-Your equations. Typst has built-in mathematical typesetting and uses its own
-math notation. Let's start with a simple equation. We wrap it in `[$]` signs
-to let Typst know it should expect a mathematical expression:
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 
 ```example
 The equation $Q = rho A v + C$
 defines the glacial flow rate.
 ```
 
-<<<<<<< HEAD
 方程式はインラインで表示され、周囲のテキストと同じ行に配置されます。
 それを独立した行にしたい場合は、方程式の最初と最後にそれぞれ1つずつスペースを挿入する必要があります。
-=======
-The equation is typeset inline, on the same line as the surrounding text. If you
-want to have it on its own line instead, you should insert a single space at its
-start and end:
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 
 ```example
 The flow rate of a glacier is
@@ -364,22 +203,11 @@ defined by the following equation:
 $ Q = rho A v + C $
 ```
 
-<<<<<<< HEAD
 Typstでは、単一の文字 `Q`, `A`, `v`, `C` はそのまま表示され、一方で `rho` はギリシャ文字に変換されているのがわかります。
 数式モードでは、単一の文字は常にそのまま表示されます。しかし、複数個が連なっている文字は記号、変数、または関数名として扱われます。
 異なる種類の文字どうしの乗算を（乗算記号を省略して）示すためには、文字と文字の間にスペースを挿入してください。
 
 複数の文字からなる変数を表したい場合は、変数の名前を引用符で囲みます。
-=======
-We can see that Typst displayed the single letters `Q`, `A`, `v`, and `C` as-is,
-while it translated `rho` into a Greek letter. Math mode will always show single
-letters verbatim. Multiple letters, however, are interpreted as symbols,
-variables, or function names. To imply a multiplication between single letters,
-put spaces between them.
-
-If you want to have a variable that consists of multiple letters, you can
-enclose it in quotes:
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 
 ```example
 The flow rate of a glacier is given
@@ -388,13 +216,8 @@ by the following equation:
 $ Q = rho A v + "time offset" $
 ```
 
-<<<<<<< HEAD
 レポートには総和の式も必要です。
 `sum` 記号を使用して、総和の範囲を下付き文字と上付き文字で指定できます。
-=======
-You'll also need a sum formula in your paper. We can use the `sum` symbol and
-then specify the range of the summation in sub- and superscripts:
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 
 ```example
 Total displaced soil by glacial flow:
@@ -403,7 +226,6 @@ $ 7.32 beta +
   sum_(i=0)^nabla Q_i / 2 $
 ```
 
-<<<<<<< HEAD
 シンボルや変数に下付き文字を追加するには、`_` の文字を入力してから下付き文字を入力します。
 同様に、上付き文字を追加するには `^` の文字を使用します。
 もし下付き文字や上付き文字が複数の要素からなる場合は、それらを丸括弧で囲む必要があります。
@@ -412,18 +234,6 @@ $ 7.32 beta +
 分子と分母の間に `/` の文字を置くだけで、Typstは自動的にそれを分数に変換します。
 Typstでは、丸括弧のネストをスマートに解決するようになっています。プログラミング言語や関数電卓のように、丸括弧を入れ子にした式を入力すると、
 Typstは丸括弧で囲まれた部分式を適切に解釈して自動的に置き換えます。
-=======
-To add a subscript to a symbol or variable, type a `_` character and then the
-subscript. Similarly, use the `^` character for a superscript. If your
-sub- or superscript consists of multiple things, you must enclose them
-in round parentheses.
-
-The above example also showed us how to insert fractions: Simply put a `/`
-character between the numerator and the denominator and Typst will automatically
-turn it into a fraction. Parentheses are smartly resolved, so you can enter your
-expression as you would into a calculator and Typst will replace parenthesized
-sub-expressions with the appropriate notation.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 
 ```example
 Total displaced soil by glacial flow:
@@ -433,45 +243,26 @@ $ 7.32 beta +
     (Q_i (a_i - epsilon)) / 2 $
 ```
 
-<<<<<<< HEAD
 数学の全ての概念に特別な構文があるわけではありません。
 代わりに、先程の `image` 関数のように関数を使用します。
 例えば、列ベクトルを挿入するには、`vec` 関数を使用できます。
 数式モード内では、関数呼び出しは `#` で始める必要はありません。
-=======
-Not all math constructs have special syntax. Instead, we use functions, just
-like the `image` function we have seen before. For example, to insert a column
-vector, we can use the [`vec`]($math.vec) function. Within math mode, function
-calls don't need to start with the `#` character.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 
 ```example
 $ v := vec(x_1, x_2, x_3) $
 ```
 
-<<<<<<< HEAD
 数式モード内でのみ使用可能な関数もあります。
 例えば、[`cal`]($math.cal) 関数は集合などに一般的に使用されるカリグラフィ文字を表示するために使われます。
 数式モードが提供する全ての関数の完全なリストについては、[リファレンスの数式セクション]($category/math)を参照してください。
 
 もう1つ、矢印などの多くの記号には多くのバリエーションがあります。
 こうしたさまざまなバリエーションの中から特定の記号を選択するには、その記号のカテゴリ名の後に、ドットと具体的な記号の種類を示す修飾子を追加します。
-=======
-Some functions are only available within math mode. For example, the
-[`cal`]($math.cal) function is used to typeset calligraphic letters commonly
-used for sets. The [math section of the reference]($category/math) provides a
-complete list of all functions that math mode makes available.
-
-One more thing: Many symbols, such as the arrow, have a lot of variants. You can
-select among these variants by appending a dot and a modifier name to a symbol's
-name:
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 
 ```example
 $ a arrow.squiggly b $
 ```
 
-<<<<<<< HEAD
 この表記法はマークアップモードでも利用可能ですが、そこでは記号名の前に `#sym.` を付ける必要があります。
 利用可能な全ての記号については[記号セクション]($category/symbols/sym)を参照してください。
 
@@ -484,21 +275,3 @@ Typstでは文書に挿入できるさまざまなコンテンツがあります
 あなたは右上のダウンロードボタンをクリックしてPDFを保存したはずです。
 しかし、あなたはレポートがあまりにも素朴に見えると感じるかもしれません。
 次のセクションでは、文書の外観をカスタマイズする方法を学びます。
-=======
-This notation is also available in markup mode, but the symbol name must be
-preceded with `#sym.` there. See the [symbols section]($category/symbols/sym)
-for a list of all available symbols.
-
-## Review
-You have now seen how to write a basic document in Typst. You learned how to
-emphasize text, write lists, insert images, align content, and typeset
-mathematical expressions. You also learned about Typst's functions. There are
-many more kinds of content that Typst lets you insert into your document, such
-as [tables]($table), [shapes]($category/visualize), and [code blocks]($raw). You
-can peruse the [reference] to learn more about these and other features.
-
-For the moment, you have completed writing your report. You have already saved a
-PDF by clicking on the download button in the top right corner. However, you
-think the report could look a bit less plain. In the next section, we'll learn
-how to customize the look of our document.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
diff --git a/docs/tutorial/2-formatting.md b/docs/tutorial/2-formatting.md
index d0bc0fa5eb..6887d91899 100644
--- a/docs/tutorial/2-formatting.md
+++ b/docs/tutorial/2-formatting.md
@@ -1,5 +1,4 @@
 ---
-<<<<<<< HEAD
 description: Typstチュートリアル
 ---
 
@@ -12,24 +11,6 @@ description: Typstチュートリアル
 ## setルール { #set-rule }
 前章で見たように、Typstにはコンテンツを_挿入する_関数（例：[`image`]関数）と、引数として受け取ったコンテンツを*操作する*関数（例：[`align`]関数）があります。
 例えば、フォントを変更したいとき、最初に思いつくことは、それを行う関数を探して、その関数で文書全体を囲むことでしょう。
-=======
-description: Typst's tutorial.
----
-
-# Formatting
-So far, you have written a report with some text, a few equations and images.
-However, it still looks very plain. Your teaching assistant does not yet know
-that you are using a new typesetting system, and you want your report to fit in
-with the other student's submissions. In this chapter, we will see how to format
-your report using Typst's styling system.
-
-## Set rules
-As we have seen in the previous chapter, Typst has functions that _insert_
-content (e.g. the [`image`] function) and others that _manipulate_ content that
-they received as arguments (e.g. the [`align`] function). The first impulse you
-might have when you want, for example, to change the font, could be to look
-for a function that does that and wrap the complete document in it.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 
 ```example
 #text(font: "New Computer Modern")[
@@ -45,7 +26,6 @@ for a function that does that and wrap the complete document in it.
 ]
 ```
 
-<<<<<<< HEAD
 ここで、関数の全ての引数は括弧の中で指定されるべきではないか？と思うでしょう。
 なぜ括弧の_後_にコンテンツを記述する2つ目の角括弧があるのでしょうか？
 答えは、関数にコンテンツを渡すことはTypstではよくあるため、特別な構文があるからです。
@@ -56,23 +36,6 @@ for a function that does that and wrap the complete document in it.
 幸いなことに、Typstにはもっと簡潔な記法があります。
 _setルール_を使えば、以後現れる全てのコンテンツに対してスタイル設定を適用可能です。
 `{set}`キーワードを入力し、その後に設定したい関数の名前と引数のリストを括弧で囲んでsetルールを記述します。
-=======
-Wait, shouldn't all arguments of a function be specified within parentheses? Why
-is there a second set of square brackets with content _after_ the parentheses?
-The answer is that, as passing content to a function is such a common thing to
-do in Typst, there is special syntax for it: Instead of putting the content
-inside of the argument list, you can write it in square brackets directly after
-the normal arguments, saving on punctuation.
-
-As seen above, that works. With the [`text`] function, we can adjust the font
-for all text within it. However, wrapping the document in countless functions
-and applying styles selectively and in-situ can quickly become cumbersome.
-
-Fortunately, Typst has a more elegant solution. With _set rules,_ you can apply
-style properties to all occurrences of some kind of content. You write a set
-rule by entering the `{set}` keyword, followed by the name of the function whose
-properties you want to set, and a list of arguments in parentheses.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 
 ```example
 #set text(
@@ -92,7 +55,6 @@ water).
 
 <div class="info-box">
 
-<<<<<<< HEAD
 ここで起こっていることをより専門的な用語で説明すると、
 setルールでは、ある関数のパラメーターに、それ以降にその関数を使うときのデフォルト値を設定しています。
 </div>
@@ -125,47 +87,6 @@ setルールを書くときは、スタイルを設定したい要素の種類
 文書にもう少しスタイルを追加してみましょう。
 余白を大きくし、セリフ体のフォントを使用します。
 この例では、ページサイズも設定します。
-=======
-Want to know in more technical terms what is happening here?
-
-Set rules can be conceptualized as setting default values
-for some of the parameters of a function for all future
-uses of that function.
-</div>
-
-## The autocomplete panel { #autocomplete }
-If you followed along and tried a few things in the app, you might have noticed
-that always after you enter a `#` character, a panel pops up to show you the
-available functions, and, within an argument list, the available parameters.
-That's the autocomplete panel. It can be very useful while you are writing your
-document: You can apply its suggestions by hitting the Return key or navigate to
-the desired completion with the arrow keys. The panel can be dismissed by
-hitting the Escape key and opened again by typing `#` or hitting
-<kbd>Ctrl</kbd> + <kbd>Space</kbd>. Use the autocomplete panel to discover the
-right arguments for functions. Most suggestions come with a small description of
-what they do.
-
-![Autocomplete panel](2-formatting-autocomplete.png)
-
-## Set up the page { #page-setup }
-Back to set rules: When writing a rule, you choose the function depending on
-what type of element you want to style. Here is a list of some functions that
-are commonly used in set rules:
-
-- [`text`] to set font family, size, color, and other properties of text
-- [`page`] to set the page size, margins, headers, enable columns, and footers
-- [`par`] to justify paragraphs, set line spacing, and more
-- [`heading`] to set the appearance of headings and enable numbering
-- [`document`] to set the metadata contained in the PDF output, such as title
-  and author
-
-Not all function parameters can be set. In general, only parameters that tell
-a function _how_ to do something can be set, not those that tell it _what_ to
-do it with. The function reference pages indicate which parameters are settable.
-
-Let's add a few more styles to our document. We want larger margins and a serif
-font. For the purposes of the example, we'll also set another page size.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 
 ```example
 #set page(
@@ -210,7 +131,6 @@ behaviour of these natural structures.
 ]
 ```
 
-<<<<<<< HEAD
 ここで注目していただきたい点を以下に記載します。
 
 まず、[`page`]($page) setルールです。
@@ -235,36 +155,6 @@ text関数の引数リストにいるとき、補完パネルで利用可能な
 ## 洗練のヒント { #sophistication }
 文書をより明確に構成するために、今度は見出しに番号を付けたいと思います。
 これを行うには、[`heading`]関数の`numbering`パラメーターを設定します。
-=======
-There are a few things of note here.
-
-First is the [`page`] set rule. It receives two arguments: the page size and
-margins for the page. The page size is a string. Typst accepts [many standard
-page sizes,]($page.paper) but you can also specify a custom page size. The
-margins are specified as a [dictionary.]($dictionary) Dictionaries are a
-collection of key-value pairs. In this case, the keys are `x` and `y`, and the
-values are the horizontal and vertical margins, respectively. We could also have
-specified separate margins for each side by passing a dictionary with the keys
-`{left}`, `{right}`, `{top}`, and `{bottom}`.
-
-Next is the set [`text`] set rule. Here, we set the font size to `{10pt}` and
-font family to `{"New Computer Modern"}`. The Typst app comes with many fonts
-that you can try for your document. When you are in the text function's argument
-list, you can discover the available fonts in the autocomplete panel.
-
-We have also set the spacing between lines (a.k.a. leading): It is specified as
-a [length] value, and we used the `em` unit to specify the leading relative to
-the size of the font: `{1em}` is equivalent to the current font size (which
-defaults to `{11pt}`).
-
-Finally, we have bottom aligned our image by adding a vertical alignment to our
-center alignment. Vertical and horizontal alignments can be combined with the
-`{+}` operator to yield a 2D alignment.
-
-## A hint of sophistication { #sophistication }
-To structure our document more clearly, we now want to number our headings. We
-can do this by setting the `numbering` parameter of the [`heading`] function.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 
 ```example
 >>> #set text(font: "New Computer Modern")
@@ -280,16 +170,9 @@ can do this by setting the `numbering` parameter of the [`heading`] function.
 #lorem(15)
 ```
 
-<<<<<<< HEAD
 番号付けのパラメーターとして文字列 `{「1.」}` を指定しました。
 これは、見出しにアラビア数字で番号を付け、各レベルの番号の間にドットを置くようにTypstに指示します。
 見出しに[文字、ローマ数字、記号]($numbering)も使用できます。
-=======
-We specified the string `{"1."}` as the numbering parameter. This tells Typst to
-number the headings with arabic numerals and to put a dot between the number of
-each level. We can also use [letters, roman numerals, and symbols]($numbering)
-for our headings:
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 
 ```example
 >>> #set text(font: "New Computer Modern")
@@ -305,7 +188,6 @@ for our headings:
 #lorem(15)
 ```
 
-<<<<<<< HEAD
 この例では、[`lorem`]関数を使って仮テキストを生成しています。
 この関数は引数に数値を取り、その単語数の_Lorem Ipsum_テキストを生成します。
 
@@ -330,38 +212,6 @@ Typstは内部的に`[= Conclusion]`と書くたびに`heading`関数を呼び
 showルールを使用すると、Typstが特定の要素をどのように表示するかを再定義できます。
 これにより、Typstがどの要素をどのように表示するかを指定します。
 Showルールはテキストのインスタンスや多くの関数、さらには文書全体にも適用可能です。
-=======
-This example also uses the [`lorem`] function to generate some placeholder text.
-This function takes a number as an argument and generates that many words of
-_Lorem Ipsum_ text.
-
-<div class="info-box">
-
-Did you wonder why the headings and text set rules apply to all text and headings,
-even if they are not produced with the respective functions?
-
-Typst internally calls the `heading` function every time you write
-`[= Conclusion]`. In fact, the function call `[#heading[Conclusion]]` is
-equivalent to the heading markup above. Other markup elements work similarly,
-they are only _syntax sugar_ for the corresponding function calls.
-</div>
-
-## Show rules
-You are already pretty happy with how this turned out. But one last thing needs
-to be fixed: The report you are writing is intended for a larger project and
-that project's name should always be accompanied by a logo, even in prose.
-
-You consider your options. You could add an `[#image("logo.svg")]` call before
-every instance of the logo using search and replace. That sounds very tedious.
-Instead, you could maybe
-[define a custom function]($function/#defining-functions) that always yields the
-logo with its image. However, there is an even easier way:
-
-With show rules, you can redefine how Typst displays certain elements. You
-specify which elements Typst should show differently and how they should look.
-Show rules can be applied to instances of text, many functions, and even the
-whole document.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 
 ```example
 #show "ArtosFlow": name => box[
@@ -377,7 +227,6 @@ ArtosFlow project. ArtosFlow is a
 project of the Artos Institute.
 ```
 
-<<<<<<< HEAD
 この例には新しい構文がたくさんあります。
 ここでは、`{show}`キーワードを記述し、その後に表示させたいテキストの文字列とコロンを記述しています。
 そして、表示したいコンテンツを引数として受け取る関数を書いています。
@@ -397,29 +246,3 @@ setルールを用いて、フォントを設定し、段落の両端を揃え
 
 ここで学んだ方法を使って作成したレポートを提出すると、あなたの指導教員はそれをとても気に入り、学会用の論文に仕立てたいと言うでしょう！
 次章では、より高度なshowルールと関数を使用して、文書を論文としてフォーマットする方法を学びます。
-=======
-There is a lot of new syntax in this example: We write the `{show}` keyword,
-followed by a string of text we want to show differently and a colon. Then, we
-write a function that takes the content that shall be shown as an argument.
-Here, we called that argument `name`. We can now use the `name` variable in the
-function's body to print the ArtosFlow name. Our show rule adds the logo image
-in front of the name and puts the result into a box to prevent linebreaks from
-occurring between logo and name. The image is also put inside of a box, so that
-it does not appear in its own paragraph.
-
-The calls to the first box function and the image function did not require a
-leading `#` because they were not embedded directly in markup. When Typst
-expects code instead of markup, the leading `#` is not needed to access
-functions, keywords, and variables. This can be observed in parameter lists,
-function definitions, and [code blocks]($scripting).
-
-## Review
-You now know how to apply basic formatting to your Typst documents. You learned
-how to set the font, justify your paragraphs, change the page dimensions, and
-add numbering to your headings with set rules. You also learned how to use a
-basic show rule to change how text appears throughout your document.
-
-You have handed in your report. Your supervisor was so happy with it that they
-want to adapt it into a conference paper! In the next section, we will learn how
-to format your document as a paper using more advanced show rules and functions.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
diff --git a/docs/tutorial/3-advanced.md b/docs/tutorial/3-advanced.md
index 20ae80e0b4..5010c94027 100644
--- a/docs/tutorial/3-advanced.md
+++ b/docs/tutorial/3-advanced.md
@@ -1,5 +1,4 @@
 ---
-<<<<<<< HEAD
 description: Typstチュートリアル
 ---
 
@@ -41,57 +40,6 @@ description: Typstチュートリアル
 
 ## setルール { #set-rules }
 まず、文書のsetルールを書くことから始めましょう。
-=======
-description: Typst's tutorial.
----
-
-# Advanced Styling
-In the previous two chapters of this tutorial, you have learned how to write a
-document in Typst and how to change its formatting. The report you wrote
-throughout the last two chapters got a straight A and your supervisor wants to
-base a conference paper on it! The report will of course have to comply with the
-conference's style guide. Let's see how we can achieve that.
-
-Before we start, let's create a team, invite your supervisor and add them to the
-team. You can do this by going back to the app dashboard with the back icon in
-the top left corner of the editor. Then, choose the plus icon in the left
-toolbar and create a team. Finally, click on the new team and go to its settings
-by clicking 'manage team' next to the team name. Now you can invite your
-supervisor by email.
-
-![The team settings](3-advanced-team-settings.png)
-
-Next, move your project into the team: Open it, going to its settings by
-choosing the gear icon in the left toolbar and selecting your new team from the
-owners dropdown. Don't forget to save your changes!
-
-Now, your supervisor can also edit the project and you can both see the changes
-in real time. You can join our [Discord server](https://discord.gg/2uDybryKPe)
-to find other users and try teams with them!
-
-## The conference guidelines { #guidelines }
-The layout guidelines are available on the conference website. Let's take a look
-at them:
-
-- The font should be an 11pt serif font
-- The title should be in 17pt and bold
-- The paper contains a single-column abstract and two-column main text
-- The abstract should be centered
-- The main text should be justified
-- First level section headings should be 13pt, centered, and rendered in small
-  capitals
-- Second level headings are run-ins, italicized and have the same size as the
-  body text
-- Finally, the pages should be US letter sized, numbered in the center of the
-  footer and the top right corner of each page should contain the title of the
-  paper
-
-We already know how to do many of these things, but for some of them, we'll need
-to learn some new tricks.
-
-## Writing the right set rules { #set-rules }
-Let's start by writing some set rules for the document.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 
 ```example
 #set page(
@@ -112,7 +60,6 @@ Let's start by writing some set rules for the document.
 #lorem(600)
 ```
 
-<<<<<<< HEAD
 ここで行われていることの大半は、すでに分かりでしょう。
 テキストサイズを`{11pt}`に、フォントをLibertinus Serifに設定しています。
 また、段落の両端揃えを有効にし、ページサイズをUSレターとしています。
@@ -130,27 +77,6 @@ Let's start by writing some set rules for the document.
 ## タイトルとアブストラクトの作成 { #title-and-abstract }
 それでは、タイトルとアブストラクトを追加しましょう。
 Typstには[`title`]($title)関数があります。この関数にタイトルを引数として渡してみましょう。
-=======
-You are already familiar with most of what is going on here. We set the text
-size to `{11pt}` and the font to Libertinus Serif. We also enable paragraph
-justification and set the page size to US letter.
-
-The `header` argument is new: With it, we can provide content to fill the top
-margin of every page. In the header, we specify our paper's title as requested
-by the conference style guide. We use the `align` function to align the text to
-the right.
-
-Last but not least is the `numbering` argument. Here, we can provide a
-[numbering pattern]($numbering) that defines how to number the pages. By
-setting it to `{"1"}`, Typst only displays the bare page number. Setting it to
-`{"(1/1)"}` would have displayed the current page and total number of pages
-surrounded by parentheses. And we could even have provided a completely custom
-function here to format things to our liking.
-
-## Creating a title and abstract { #title-and-abstract }
-Now, let's add a title and an abstract. We'll start with the title. Typst comes
-with a [`title`] function. Let's start by providing our title as an argument:
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 
 ```example
 >>> #set page(width: 300pt, margin: 30pt)
@@ -161,7 +87,6 @@ with a [`title`] function. Let's start by providing our title as an argument:
 ]
 ```
 
-<<<<<<< HEAD
 タイトルはすでに太字で、周囲には余白もあります。
 ただし、左揃えで、文字サイズも17ptではありません。
 そこで、見た目を調整しましょう。
@@ -182,36 +107,11 @@ with a [`title`] function. Let's start by providing our title as an argument:
 この指定を_セレクター_と呼びます。
 続いてコロンを入力し、セレクターにマッチする要素へ適用するsetルールを記述します。
 まとめると、構文は次のようになります。
-=======
-You can see that the title is already boldfaced and has some space around it.
-However, it is left-aligned and not exactly 17pt large. Hence, we need to adjust
-its appearance. The title function does not come with any arguments for
-font or text size we could set. Instead, these properties are defined on the
-`text` and `align` functions.
-
-<div class="info-box">
-
-What is the difference between what the `title` function inserted and the
-headings we produced with equals signs?
-
-Headings, even first-level headings, can appear multiple times in your document
-whereas a title only appears once, usually at the beginning. Differentiating
-between the two helps Typst make your document accessible for users of
-Assistive Technology such as screen readers.
-</div>
-
-When we want to customize the properties of some element inside of another kind
-of element, we can use show-set rules. First, we use `show` to select which
-element we want to customize. We call this a _selector._ Then, we type a colon.
-Next, we write the set rule that should apply to elements matching the selector.
-Summarized, the syntax looks like this:
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 
 ```typ
 #show your-selector: set some-element(/* ... */)
 ```
 
-<<<<<<< HEAD
 ここで確認しましょう。タイトルを中央揃えにし、文字サイズを17ptにしたいのでした。
 そのため、次の2つのshow-setルールが必要です。
 
@@ -219,15 +119,6 @@ Summarized, the syntax looks like this:
 - セレクターが`title`、ルールが`{set align(center)}`のshow-setルール
 
 例は次のようになります。
-=======
-Let's recall: We want to center-align the title and make it 17pt large. Hence,
-we need two show-set rules:
-
-- One with the selector `title` and the rule `{set text(size: 17pt)}`
-- One with the selector `title` and the rule `{set align(center)}`
-
-Our example now looks like this:
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 
 ```example
 >>> #set page(width: 300pt, margin: 30pt)
@@ -241,13 +132,8 @@ Our example now looks like this:
 ]
 ```
 
-<<<<<<< HEAD
 これでよさそうです。著者一覧も追加しましょう。
 この論文は指導教員と共同で執筆しているので、自分の名前と指導教員の名前を追加します。
-=======
-This looks right. Let's also add the author list: Since we are writing this
-paper together with our supervisor, we'll add our own and their name.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 
 ```example
 >>> #set page(width: 300pt, margin: 30pt)
@@ -276,7 +162,6 @@ paper together with our supervisor, we'll add our own and their name.
 )
 ```
 
-<<<<<<< HEAD
 著者情報が記載された2つのブロックが隣り合わせにレイアウトされています。
 このレイアウトを作るために[`grid`]($grid)関数を使っています。
 これにより、各列の大きさや、どのコンテンツをどのセルに入れるかを正確に制御できます。
@@ -294,27 +179,6 @@ grid関数はセルを指定するコンテンツ引数を任意の数で受け
 各ブロックは[`block`]($block)関数によって制御されます。
 この関数は、ブロック同士の間隔や、ブロック内で改ページできるかどうかなどを制御します。
 つまり、タイトルを選択してブロックの間隔を設定するshow-setルールをさらに記述できます。
-=======
-The two author blocks are laid out next to each other. We use the [`grid`]
-function to create this layout. With a grid, we can control exactly how large
-each column is and which content goes into which cell. The `columns` argument
-takes an array of [relative lengths]($relative) or [fractions]($fraction). In
-this case, we passed it two equal fractional sizes, telling it to split the
-available space into two equal columns. We then passed two content arguments to
-the grid function. The first with our own details, and the second with our
-supervisors'. We again use the `align` function to center the content within the
-column. The grid takes an arbitrary number of content arguments specifying the
-cells. Rows are added automatically, but they can also be manually sized with
-the `rows` argument.
-
-Looking at the authors and the title, they are a bit too close together. You can
-address this by using another show-set rule to configure the space below the
-title. The title, the grid, paragraphs, and all other elements that Typst
-arranges from the top to the bottom of the page are called _blocks._ Each block
-is controlled by the [`block`] function. It controls behaviors like their
-distance and whether a block can contain a page break. That means that we can
-write another show-set rule that selects the title to set the block spacing:
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 
 ```example
 >>> #set page(width: 300pt, margin: 30pt)
@@ -345,7 +209,6 @@ write another show-set rule that selects the title to set the block spacing:
 )
 ```
 
-<<<<<<< HEAD
 このshow-setルールで、タイトルの下の間隔を上書きしました。
 ここでは`em`単位を使用しています。
 `em`を使うと、フォントサイズの倍数で長さを表現できます。
@@ -353,13 +216,6 @@ write another show-set rule that selects the title to set the block spacing:
 
 それでは、アブストラクトを追加しましょう。
 学会では、アブストラクトを両端揃えにせず、中央に配置することが求められている点を思い出してください。
-=======
-With this show-set rule, we overrode the spacing below the title. We have used
-the `em` unit: It allows us to express lengths as multiples of the font size.
-Here, we used it to space the title and the author list exactly 1.2× the font
-size apart. Now, let's add the abstract. Remember that the conference wants the
-abstract to be set ragged and centered.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 
 ```example:0,0,612,317.5
 >>> #set page(
@@ -406,7 +262,6 @@ abstract to be set ragged and centered.
 ]
 >>> #lorem(600)
 ```
-<<<<<<< HEAD
 できました！特筆すべき点は、`align`のコンテンツ引数の中にあるsetルールを使って、アブストラクトの両端揃えをオフにしたことです。
 これは、最初のsetルールの後に指定されたにもかかわらず、文書の残りの部分には影響しません。
 コンテンツ・ブロック内で設定されたものは、そのブロック内のコンテンツにのみ影響します。
@@ -416,27 +271,11 @@ abstract to be set ragged and centered.
 その場合、両方の場所からタイトルを取得する方法も必要になります。
 タイトルの保存には`document`要素が役立ちます。
 `document`要素をsetルールで使用すると、タイトル、説明、キーワードなどの文書メタデータを保存できます。
-=======
-
-Well done! One notable thing is that we used a set rule within the content
-argument of `align` to turn off justification for the abstract. This does not
-affect the remainder of the document even though it was specified after the
-first set rule because content blocks _scope_ styling. Anything set within a
-content block will only affect the content within that block.
-
-Another tweak could be to remove the duplication between the header and the
-title element's argument. Since they share the title, it would be convenient to
-store it in a place designed to hold metadata about the document. We would then
-need a way to retrieve the title in both places. The `document` element can help
-us with the former: By using it in a set rule, we can store document metadata
-like title, description, and keywords.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 
 ```typ
 #set document(title: [A Fluid Dynamic Model for Glacier Flow])
 ```
 
-<<<<<<< HEAD
 ここで設定したタイトルは、PDFをエクスポートしたときにPDFリーダーのタイトルバーへ表示されます。
 また、オペレーティングシステムの検索でも、このタイトルを使ってファイルを見つけられます。
 さらに、タイトルの設定は文書のアクセシビリティ向上にも役立ち、アクセシビリティを重視したPDF規格であるPDF/UAに準拠する場合には必須です。
@@ -449,25 +288,6 @@ like title, description, and keywords.
 _コンテキスト_を使うと、これまでに要素へ設定した任意の値を取得できます。
 `{context}`キーワードを使用すれば、`document`要素の`title`プロパティを含め、どの要素のどのプロパティにもアクセスできます。
 次のように使用します。
-=======
-When exporting a PDF, the title set here will appear in the title bar of your
-PDF reader. Your operating system will also use this title to make the file
-retrievable with search. Last but not least, it contributes to making your
-document more accessible and is required if you choose to comply with PDF/UA, a
-PDF standard focused on accessibility.
-
-Now, we need a way to retrieve the value we set in the main title and the
-header. Because the `title` function is designed to work together with the
-`document` element, calling it with no arguments will just print the title. For
-the header, we will need to be more explicit: Because Typst has no way of
-knowing that we want to insert the title there, we will need to tell it to do so
-manually.
-
-Using _context,_ we can retrieve the contents of any values we have set on
-elements before. When we use the `{context}` keyword, we can access any property
-of any element, including the document element's title property. Its use looks
-like this:
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 
 ```example:single
 #set document(title: [
@@ -523,7 +343,6 @@ like this:
 >>> #lorem(600)
 ```
 
-<<<<<<< HEAD
 まず、空の丸括弧で`title`関数を呼び出している点に注目してください。
 引数を渡していないため、上で`document`要素に設定した値がデフォルトで使用されます。
 空の丸括弧と空の角括弧の違いは重要です。
@@ -536,27 +355,11 @@ like this:
 コンテキストの役割は、プロパティへのアクセスだけではありません。
 文書内に特定の要素が存在するかを調べたり、別の要素の物理的な寸法を測定したりできます。
 コンテキストを使えば、利用者の設定に応じて変化する強力なテンプレートを構築できます。
-=======
-First, notice how we called the title function with empty, round
-parentheses. Because no argument was passed, it defaulted to what we set for the
-document element above. The distinction between empty round and empty square
-brackets is important: While empty round brackets show that you are passing
-nothing, empty square brackets mean that you are passing one argument: an empty
-content block. If called that way, the title would have no visible content.
-
-Next, take a look at the header. Instead of the title in square parentheses, we
-used the context keyword to access the document title. This inserted exactly
-what we set above. The role of context is not limited to accessing properties:
-With it, you can check if some elements are present in the document, measure the
-physical dimensions of others, and more. Using context, you can build powerful
-templates that react to the preferences of the end-user.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 
 <div class="info-box">
 
 <details>
 <summary>
-<<<<<<< HEAD
 要素のプロパティにアクセスするには、なぜ`context`キーワードが必要なのでしょうか？
 </summary>
 
@@ -589,48 +392,6 @@ place関数は引数として配置とコンテンツを受け取ります。
 オプション引数である`{scope}`引数を使えば、現在の段組みとその親（ページ）のどちらに対して配置するかを決めることが可能です。
 これらに加えて、もうひとつ設定することがあります。
 オプション引数がない場合、`{place}`はそのコンテンツを文書の流れから外し、他のレイアウトに影響を与えることなく、他のコンテンツの上に配置します。
-=======
-Why is the context keyword required to access element properties?
-</summary>
-
-Normally, when we access a variable, we know exactly what its value is going to
-be:
-
-- The variable could be a constant built into Typst, like `[#sym.pi]`
-- The variable could be defined by an argument
-- The variable could be defined or overwritten in the current scope
-
-However, sometimes, that's not enough. In this chapter of the tutorial, we have
-inserted a page header with the title. Even though we pass only one piece of
-content for the header, we may want different pages to have different headers.
-For example, we may want to print the chapter name or use the page number. When
-we use context, we can write a single context block that tells Typst to take a
-look at where it's inserted, look for the last heading, the current page number,
-or anything else, and go from there. That means that the same context block,
-inserted on different pages, can produce different output.
-
-For more information, read up on context [in its docs]($context) after
-completing this tutorial.
-</details>
-</div>
-
-## Adding columns and headings { #columns-and-headings }
-The paper above unfortunately looks like a wall of lead. To fix that, let's add
-some headings and switch our paper to a two-column layout. Fortunately, that's
-easy to do: We just need to amend our `page` set rule with the `columns`
-argument.
-
-By adding `{columns: 2}` to the argument list, we have wrapped the whole
-document in two columns. However, that would also affect the title and authors
-overview. To keep them spanning the whole page, we can wrap them in a function
-call to [`{place}`]($place). Place expects an alignment and the content it
-should place as positional arguments. Using the named `{scope}` argument, we can
-decide if the items should be placed relative to the current column or its
-parent (the page). There is one more thing to configure: If no other arguments
-are provided, `{place}` takes its content out of the flow of the document and
-positions it over the other content without affecting the layout of other
-content in its container:
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 
 ```example
 #place(
@@ -640,19 +401,11 @@ content in its container:
 #lorem(30)
 ```
 
-<<<<<<< HEAD
 もしここで`{place}`を使わなければ、黒塗りの長方形は独立した行になるはずですが、
 `{place}`を使うと、それに続く数行のテキストの上に重なります。
 同様に、テキスト側もこの長方形がないかのように振る舞います。
 この動作を変更するには、引数`{float: true}`を渡してください。
 これにより`{place}`でページの上部または下部に配置されたアイテムが、他のコンテンツと重ならないように設定できます。
-=======
-If we hadn't used `{place}` here, the square would be in its own line, but here
-it overlaps the few lines of text following it. Likewise, that text acts as if
-there was no square. To change this behavior, we can pass the argument
-`{float: true}` to ensure that the space taken up by the placed item at the top
-or bottom of the page is not occupied by any other content.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 
 ```example:single
 >>> #set document(title: [
@@ -713,7 +466,6 @@ or bottom of the page is not occupied by any other content.
 #lorem(200)
 ```
 
-<<<<<<< HEAD
 この例では、`{place}` 関数の `clearance` 引数も使用しています。
 これにより、[`{v}`]($v)関数を使用する代わりに、本文との間にスペースを設けています。
 また、コンテンツはcenter引数を継承しているため、各パーツごとに行っていた明示的な `{align(center, ...)}` 呼び出しも削除できます。
@@ -725,21 +477,6 @@ or bottom of the page is not occupied by any other content.
 - 見出しを中央揃えにするshow-setルール
 - 見出しを13ptにし、太さを標準にするshow-setルール
 - 見出し全体を`smallcaps`関数で囲むshowルール
-=======
-In this example, we also used the `clearance` argument of the `{place}` function
-to provide the space between it and the body instead of using the [`{v}`]($v)
-function. We can also remove the explicit `{align(center, ..)}` calls around the
-various parts since they inherit the center alignment from the placement.
-
-Now there is only one thing left to do: Style our headings. We need to make them
-centered and use small capitals. These properties are not available on the
-`heading` function, so we will need to write a few show-set rules and a show
-rule:
-
-- A show-set rule to make headings center-aligned
-- A show-set rule to make headings 13pt large and use the regular weight
-- A show rule to wrap the headings in a call to the `smallcaps` function
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 
 ```example:50,250,265,270
 >>> #set document(title: [
@@ -808,7 +545,6 @@ rule:
 >>> #lorem(45)
 ```
 
-<<<<<<< HEAD
 これで見た目が整いました！
 ここでは、全ての見出しに適用されるshowルールを使用しました。
 最後のshowルールでは、見出し全体に`smallcaps`関数を適用しています。
@@ -819,20 +555,6 @@ rule:
 この問題は、`where`セレクターを使用すると解決できます。
 `where`は、見出しなどの要素に対して呼び出せる[メソッド]($scripting/#methods)で、プロパティに基づいて要素を絞り込めます。
 これにより、セクションとサブセクションの見出しを区別できます。
-=======
-This looks great! We used show rules that apply to all headings. In the final
-show rule, we applied the `smallcaps` function to the complete heading. As we
-will see in the next example, we can also provide a custom rule to completely
-override the default look of headings.
-
-The only remaining problem is that all headings look the same now. The
-"Motivation" and "Problem Statement" subsections ought to be italic run-in
-headers, but right now, they look indistinguishable from the section headings.
-We can fix that by using a `where` selector on our show rule: This is a
-[method]($scripting/#methods) we can call on headings (and other elements) that
-allows us to filter them by their properties. We can use it to differentiate
-between section and subsection headings:
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 
 ```example:50,250,265,245
 >>> #set document(title: [
@@ -905,7 +627,6 @@ between section and subsection headings:
 >>> #lorem(45)
 ```
 
-<<<<<<< HEAD
 この例では、まず`{.where(level: 1)}`でセレクターをより具体的にし、先ほどのルールの適用範囲を第1レベルの見出しに限定しています。
 次に、第2レベルの見出しに適用するshow-setルールを追加します。
 最後に、独自の関数を使ったshowルールが必要です。
@@ -955,68 +676,3 @@ showルールで`it.numbering`を明示的に使用していないため、こ
 
 次のセクションでは、複数の文書で再利用できるテンプレートの作成方法を学びます。
 これはより高度なトピックですので、今すぐには手が出せないという方は、後ほどお気軽にお越しください。
-=======
-In this example, we first scope our previous rules to first-level headings by
-using `{.where(level: 1)}` to make the selector more specific. Then, we add a
-show-set rule for the second heading level. Finally, we need a show rule with a
-custom function: Headings enclose their contents with a block by default. This
-has the effect that the heading gets its own line. However, we want it to run
-into the text, so we need to provide our own show rule to get rid of this block.
-
-We provide the rule with a function that takes the heading as a parameter.
-This parameter is conventionally called `it`, but can have another name. The
-parameter can be used as content and will just display the whole default
-heading. Alternatively, when we want to build our own heading instead, we can
-use its fields like `body`, `numbering`, and `level` to compose a custom look.
-Here, we are just printing the body of the heading with a trailing dot and leave
-out the block that the built-in show rule produces. Note that this heading will
-no longer react to set rules for heading numbering and similar because we did
-not explicitly use `it.numbering` in the show rule. If you are writing show
-rules like this and want the document to remain customizable, you will need to
-take these fields into account.
-
-This looks great! We wrote show rules that selectively apply to the first and
-second level headings. We used a `where` selector to filter the headings by
-their level. We then rendered the subsection headings as run-ins. We
-also automatically add a period to the end of the subsection headings.
-
-Let's review the conference's style guide:
-- The font should be an 11pt serif font ✓
-- The title should be in 17pt and bold ✓
-- The paper contains a single-column abstract and two-column main text ✓
-- The abstract should be centered ✓
-- The main text should be justified ✓
-- First level section headings should be centered, rendered in small caps and in
-  13pt ✓
-- Second level headings are run-ins, italicized and have the same size as the
-  body text ✓
-- Finally, the pages should be US letter sized, numbered in the center and the
-  top right corner of each page should contain the title of the paper ✓
-
-We are now in compliance with all of these styles and can submit the paper to
-the conference! The finished paper looks like this:
-
-<img
-  src="3-advanced-paper.png"
-  alt="The finished paper"
-  style="box-shadow: 0 4px 12px rgb(89 85 101 / 20%); width: 500px; max-width: 100%; display: block; margin: 24px auto;"
->
-
-## Review
-You have now learned how to create titles, headers, and footers, how to use
-functions, show-set rules, and scopes to locally override styles, how to create
-more complex layouts with the [`grid`] function, how to access element
-properties with context, and how to write show rules for individual functions,
-and the whole document. You also learned how to use the [`where`
-selector]($styling/#show-rules) to filter the headings by their level.
-
-The paper was a great success! You've met a lot of like-minded researchers at
-the conference and are planning a project which you hope to publish at the same
-venue next year. You'll need to write a new paper using the same style guide
-though, so maybe now you want to create a time-saving template for you and your
-team?
-
-In the next section, we will learn how to create templates that can be reused in
-multiple documents. This is a more advanced topic, so feel free to come back
-to it later if you don't feel up to it right now.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
diff --git a/docs/tutorial/4-template.md b/docs/tutorial/4-template.md
index 8df83ec531..af11d9ae8e 100644
--- a/docs/tutorial/4-template.md
+++ b/docs/tutorial/4-template.md
@@ -1,5 +1,4 @@
 ---
-<<<<<<< HEAD
 description: Typstチュートリアル
 ---
 
@@ -27,55 +26,11 @@ Typstの組み込み要素は、文書のタイトルや説明のような意味
 発音を表記する最良の方法の1つは国際音声記号（IPA）です。
 しかしIPAには一般的なキーボードに存在しない文字が含まれているため、繰り返し入力するのは煩雑になります。
 そこで、複数回参照できる変数を定義してみましょう。
-=======
-description: Typst's tutorial.
----
-
-# Making a Template
-In the previous three chapters of this tutorial, you have learned how to write a
-document in Typst, apply basic styles, and customize its appearance in-depth to
-comply with a publisher's style guide. Because the paper you wrote in the
-previous chapter was a tremendous success, you have been asked to write a
-follow-up article for the same conference. This time, you want to take the style
-you created in the previous chapter and turn it into a reusable template. In
-this chapter you will learn how to create a template that you and your team can
-use with just one show rule. Let's get started!
-
-## Reusing data with variables { #variables }
-In the past chapters, most of the content of the document was entered by hand.
-In the third chapter, we used the `document` element and context to cut down on
-repetition and only enter the title once. But in practice, there may be many
-more things that occur multiple times in your document. There are multiple good
-reasons to just define these repeated values once:
-
-1. It makes changing them later easier
-2. It allows you to quickly find all instances where you used something
-3. It makes it easy to be consistent throughout
-4. For long or hard-to-enter repeated segments, a shorter variable name is often
-   more convenient to type
-
-If you were using a conventional word processor, you might resort to using a
-placeholder value that you can later search for. In Typst, however, you can
-instead use variables to safely store content and reuse it across your whole
-document through a variable name.
-
-The technique of using context to reproduce an element's property we have
-learned earlier is not always the most appropriate for this: Typst's built-in
-elements focus on semantic properties like the title and description of a
-document, or things that directly relate to typesetting, like the text size.
-
-For our example, we want to take a look at Typst's pronunciation. One of the
-best ways to transcribe pronunciation is the International Phonetic Alphabet
-(IPA). But because it uses characters not found on common keyboards, typing IPA
-repeatedly can become cumbersome. So let's instead define a variable that we can
-reference multiple times.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 
 ```typ
 #let ipa = [taɪpst]
 ```
 
-<<<<<<< HEAD
 ここで新しいキーワード`{let}`を使って、変数定義であることを示しています。
 続けて変数名（この場合は`ipa`）を書きます。
 最後に、等号と変数の値を書きます。
@@ -83,16 +38,6 @@ reference multiple times.
 言い換えると、この構文は_「変数`ipa`に値`{[taɪpst]}`を持たせる」_というフレーズを表現しています。
 
 これで変数を文書内で使用できます。
-=======
-Here, we use a new keyword, `{let}`, to indicate a variable definition. Then,
-we put the name of our variable, in this case, `ipa`. Finally, we type an equals
-sign and the value of our variable. It is enclosed in square brackets because
-it is content, mirroring how you would call a function accepting content. In
-other words, this syntax mirrors the phrase _"Let the variable `ipa` have the
-value `{[taɪpst]}`."_
-
-Now, we can use the variable in our document:
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 
 ```example
 #let ipa = [taɪpst]
@@ -107,19 +52,10 @@ pronounce Typst is #ipa.
 )
 ```
 
-<<<<<<< HEAD
 この例では、変数がマークアップ中（`#`を前に付ける）と関数呼び出し中（変数名をそのまま記述する）の両方で使用できることがわかります。
 もちろん、変数の値を変更すれば、全ての出現箇所も自動的に変わります。
 IPAと通常の散文をより明確に区別するため、IPAを斜体で表示してみましょう。
 慣習的にIPAを囲むのに使われるスラッシュも追加します。
-=======
-In the example, you can see that the variable can be used both in markup
-(prefixed with a `#`) and in a function call (by just typing its name). Of
-course, we can change the value of the variable and all its occurrences will
-automatically change with it. Let's make it a bit clearer what is IPA and what
-is normal prose by rendering IPA in italics. We are also using slashes which, by
-convention, often enclose IPA.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 
 ```example
 #let ipa = text(
@@ -137,7 +73,6 @@ pronounce Typst is #ipa.
 )
 ```
 
-<<<<<<< HEAD
 ここでは、text関数を呼び出してその_戻り値_を変数に代入しています。
 関数を呼び出すと、引数を処理して別の値（多くの場合コンテンツ）を返します。
 このチュートリアルではこれまで、`[#text(fill: red)[CRIMSON!]]`のように、ほとんどの関数をマークアップ中で直接呼び出してきました。
@@ -148,21 +83,6 @@ pronounce Typst is #ipa.
 変数はコンテンツの保存に限られません。Typstで扱えるあらゆるデータ型を保存できます。
 このチュートリアル全体を通して、Typstの組み込み関数へ渡す際にさまざまなデータ型を利用してきました。
 以下は、それぞれの型を変数に代入する例です。
-=======
-Here, we called the text function and assigned its _return value_ to the
-variable. When you call a function, it processes its arguments and then yields
-another value (often content). So far in this tutorial, we called most
-functions directly in markup, like this: `[#text(fill: red)[CRIMSON!]]`. This
-call to the text function returns the red text as a return value. Because we
-placed it in markup, its return value just immediately got inserted into the
-content we wrote. With variables, we can instead store it to use it later or
-compose it with other values.
-
-Variables are not limited to storing content: they can store any data type Typst
-knows about. Throughout this tutorial, you made use of many data types when you
-passed them to Typst's built-in functions. Here is an example assigning each of
-them to a variable:
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 
 ```typ
 // Content with markup inside
@@ -190,20 +110,10 @@ them to a variable:
 #let focus = center
 ```
 
-<<<<<<< HEAD
 このチュートリアルの本章では、変数と独自の関数を活用して、複数の文書で再利用できるテンプレートを構築します。
 
 ## 簡易テンプレート { #toy-template }
 Typstでは、テンプレートは文書全体をラップできる関数です。その方法を学ぶために、まずは独自の関数の書き方を復習しましょう。関数は何でもできるので、少し奇抜なものを作ってみませんか？
-=======
-In this chapter of the tutorial, you will leverage variables and your own
-functions to build templates that can be reused across multiple documents.
-
-## A toy template { #toy-template }
-In Typst, templates are functions in which you can wrap your whole document. To
-learn how to do that, let's first review how to write your very own functions.
-They can do anything you want them to, so why not go a bit crazy?
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 
 ```example
 #let amazed(term) = box[✨ #term ✨]
@@ -211,7 +121,6 @@ They can do anything you want them to, so why not go a bit crazy?
 You are #amazed[beautiful]!
 ```
 
-<<<<<<< HEAD
 前のセクションと比較すると、これが`{let}`を使った変数定義によく似ていることに気付くかもしれません。
 この直感は正しく、関数もデータ型の1つです。
 ここでは変数`amazed`を定義し、`term`という単一の引数を取り、`term`の両側にきらめきを付けたコンテンツを返す関数を割り当てています。
@@ -223,24 +132,6 @@ Typstの組み込み関数の多くにはオプションの名前付き引数が
 私たちの関数にもそれを持たせられます。
 テキストの色を選べるパラメーターを関数に追加してみましょう。
 パラメーターが与えられなかった場合に備えて、デフォルトの色を指定する必要があります。
-=======
-Comparing this against the previous section, you may have noticed that this
-looks a lot like a variable definition using `{let}`. This instinct is correct:
-Functions are just another data type. Here, we are defining the variable
-`amazed`, assigning it a function that takes a single argument, `term`, and
-returns content with the `term` surrounded by sparkles. We also put the whole
-thing in a [`box`] so that the term we are amazed by cannot be separated from
-its sparkles by a line break. The special function definition syntax makes the
-definition shorter and more readable, but you can also use the regular variable
-definition syntax (see [the scripting reference]($scripting/#bindings) for
-details). After its definition, we are able to call the function just like all
-built-in functions.
-
-Many functions that come with Typst have optional named parameters. Our
-functions can also have them. Let's add a parameter to our function that lets us
-choose the color of the text. We need to provide a default color in case the
-parameter isn't given.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 
 ```example
 #let amazed(term, color: blue) = {
@@ -251,18 +142,7 @@ You are #amazed[beautiful]!
 I am #amazed(color: purple)[amazed]!
 ```
 
-<<<<<<< HEAD
 テンプレートは`amazed`のようなカスタム関数で文書全体をラップすることで機能します。しかし、文書全体を巨大な関数呼び出しでラップするのは面倒でしょう！代わりに、"everything" showルールを使用して、より洗練されたコードで同じことが実現できます。そのようなshowルールを書くには、showキーワードの直後にコロンを置き、関数を提供します。この関数には文書の残りの部分がパラメーターとして渡されます。関数はこのコンテンツに対して任意の処理が可能です。`amazed`関数は単一のコンテンツ引数で呼び出せるので、showルールに名前で渡すだけで良いのです。試してみましょう。
-=======
-Templates now work by wrapping our whole document in a custom function like
-`amazed`. But wrapping a whole document in a giant function call would be
-cumbersome! Instead, we can use an "everything" show rule to achieve the same
-with cleaner code. To write such a show rule, put a colon directly after the
-show keyword and then provide a function. This function is given the rest of the
-document as a parameter. The function can then do anything with this content.
-Since the `amazed` function can be called with a single content argument, we can
-just pass it by name to the show rule. Let's try it:
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 
 ```example
 >>> #let amazed(term, color: blue) = {
@@ -275,22 +155,10 @@ negative thoughts or beliefs.
 In fact, I am amazing!
 ```
 
-<<<<<<< HEAD
 これで文書全体が`amazed`関数に渡され、文書をその関数でラップしたかのように機能します。もちろん、この特定の関数ではあまり有用ではありませんが、setルールと名前付き引数と組み合わせると、非常に強力になります。
 
 ## setルールとshowルールの埋め込み { #set-and-show-rules }
 テンプレートにいくつかのsetルールとshowルールを適用するには、関数内のコンテンツブロックで`set`と`show`を使用し、そのコンテンツブロックに文書を挿入します。
-=======
-Our whole document will now be passed to the `amazed` function, as if we wrapped
-it around it. Of course, this is not especially useful with this particular
-function, but when combined with set rules and named arguments, it can be very
-powerful.
-
-## Embedding set and show rules { #set-and-show-rules }
-To apply some set and show rules to our template, we can use `set` and `show`
-within a content block in our function and then insert the document into
-that content block.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 
 ```example
 #let template(doc) = [
@@ -304,16 +172,7 @@ I am learning something cool today.
 It's going great so far!
 ```
 
-<<<<<<< HEAD
 前章で発見したように、setルールはそのコンテンツブロック内の全てに適用されます。everything showルールが文書全体を`template`関数に渡すため、テンプレート内のテキストのsetルールと文字列のshowルールが文書全体に適用されます。この知識を使って、前章で作成した論文の本文スタイルを再現するテンプレートを作成しましょう。
-=======
-Just like we already discovered in the previous chapter, set rules will apply to
-everything within their content block. Since the everything show rule passes our
-whole document to the `template` function, the text set rule and string show
-rule in our template will apply to the whole document. Let's use this knowledge
-to create a template that reproduces the body style of the paper we wrote in the
-previous chapter.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 
 ```example
 #let conf(title, doc) = {
@@ -373,7 +232,6 @@ previous chapter.
 >>> #lorem(200)
 ```
 
-<<<<<<< HEAD
 コードの大部分は前章からコピーペーストしました。2つの違いがあります。
 
 1. everything showルールを使用して、全てを`conf`関数でラップしました。この関数はいくつかのsetルールとshowルールを適用し、最後に渡されたコンテンツをそのまま出力します。
@@ -384,33 +242,6 @@ previous chapter.
 
 ## 名前付き引数を持つテンプレート { #named-arguments }
 前章の論文にはタイトルと著者リストがありました。これらの要素をテンプレートに追加しましょう。タイトルだけでなく、所属機関を含む著者リストと論文の要約もテンプレートで受け付けるようにします。可読性を保つために、これらを名前付き引数として追加します。最終的には、次のように機能させたいと思います。
-=======
-We copy-pasted most of that code from the previous chapter. The two differences
-are this:
-
-1. We wrapped everything in the function `conf` using an everything show rule.
-   The function applies a few set and show rules and echoes the content it has
-   been passed at the end.
-
-2. Moreover, we used a curly-braced code block instead of a content block. This
-   way, we don't need to prefix all set rules and function calls with a `#`. In
-   exchange, we cannot write markup directly in the code block anymore.
-
-Also note where the title comes from: We previously had it inside of a variable.
-Now, we are receiving it as the first parameter of the template function. To do
-so, we passed a closure (that's a function without a name that is used right
-away) to the everything show rule. We did that because the `conf` function
-expects two positional arguments, the title and the body, but the show rule will
-only pass the body. Therefore, we add a new function definition that allows us
-to set a paper title and use the single parameter from the show rule.
-
-## Templates with named arguments { #named-arguments }
-Our paper in the previous chapter had a title and an author list. Let's add
-these things to our template. In addition to the title, we want our template to
-accept a list of authors with their affiliations and the paper's abstract. To
-keep things readable, we'll add those as named arguments. In the end, we want it
-to work like this:
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 
 ```typ
 #show: doc => conf(
@@ -437,7 +268,6 @@ to work like this:
 ...
 ```
 
-<<<<<<< HEAD
 この新しいテンプレート関数を構築しましょう。まず、`title`引数にデフォルト値を追加します。これにより、タイトルを指定せずにテンプレートを呼び出せます。また、空のデフォルト値を持つ名前付き引数として`authors`および`abstract`パラメーターを追加します。次に、前章からタイトル、要約、著者を生成するコードをテンプレートにコピーし、固定の詳細をパラメーターに置き換えます。
 
 新しい`authors`パラメーターは、`name`、`affiliation`、`email`というキーを持つ[辞書]($dictionary)の[配列]($array)を想定しています。任意の数の著者を持てるため、著者リストに1列、2列、または3列が必要かどうかを動的に決定します。まず、`authors`配列の[`.len()`]($array.len)メソッドを使用して著者の数を決定します。次に、列数を著者数と3の最小値に設定し、3列以上作成しないようにします。4人以上の著者がいる場合は、代わりに新しい行が挿入されます。この目的のために、`grid`関数に`row-gutter`パラメーターも追加しました。そうしないと、行同士が近すぎてしまいます。辞書から著者の詳細を抽出するには、[フィールドアクセス構文]($scripting/#fields)を使用します。
@@ -449,40 +279,6 @@ to work like this:
 ```typ
 #let conf(
   title: none,
-=======
-Let's build this new template function. First, we add a default value to the
-`title` argument. This way, we can call the template without specifying a title.
-We also add the named `authors` and `abstract` parameters with empty defaults.
-Next, we copy the code that generates title, abstract and authors from the
-previous chapter into the template, replacing the fixed details with the
-parameters.
-
-The new `authors` parameter expects an [array] of [dictionaries]($dictionary)
-with the keys `name`, `affiliation` and `email`. Because we can have an
-arbitrary number of authors, we dynamically determine if we need one, two or
-three columns for the author list. First, we determine the number of authors
-using the [`.len()`]($array.len) method on the `authors` array. Then, we set the
-number of columns as the minimum of this count and three, so that we never
-create more than three columns. If there are more than three authors, a new row
-will be inserted instead. For this purpose, we have also added a `row-gutter`
-parameter to the `grid` function. Otherwise, the rows would be too close
-together. To extract the details about the authors from the dictionary, we use
-the [field access syntax]($scripting/#fields).
-
-We still have to provide an argument to the grid for each author: Here is where
-the array's [`map` method]($array.map) comes in handy. It takes a function as an
-argument that gets called with each item of the array. We pass it a function
-that formats the details for each author and returns a new array containing
-content values. We've now got one array of values that we'd like to use as
-multiple arguments for the grid. We can do that by using the
-[`spread` operator]($arguments). It takes an array and applies each of its items
-as a separate argument to the function.
-
-The resulting template function looks like this:
-
-```typ
-#let conf(
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
   authors: (),
   abstract: [],
   doc,
@@ -523,28 +319,10 @@ The resulting template function looks like this:
 }
 ```
 
-<<<<<<< HEAD
 ## 別ファイル { #separate-file }
 多くの場合、テンプレートは別のファイルで指定され、それから文書にインポートされます。この方法では、メインファイルはすっきりとし、テンプレートを簡単に再利用できます。ファイルパネルでプラスボタンをクリックして新しいテキストファイルを作成し、`conf.typ`という名前を付けます。`conf`関数定義をその新しいファイルに移動します。これで、showルールの前にインポートを追加することで、メインファイルからアクセスできます。`{import}`キーワードとコロンの間にファイルのパスを指定し、インポートしたい関数に名前を付けます。
 
 テンプレートの適用をより洗練させるためにできるもう1つのことは、関数の[`.with`]($function.with)メソッドを使用して、全ての名前付き引数を事前に設定することです。これにより、クロージャーを記述してテンプレートリストの最後にコンテンツ引数を追加する必要がなくなります。[Typst Universe]($universe)のテンプレートは、この関数呼び出しのスタイルで動作するように設計されています。
-=======
-## A separate file { #separate-file }
-Most of the time, a template is specified in a different file and then imported
-into the document. This way, the main file you write in is kept clutter free and
-your template is easily reused. Create a new text file in the file panel by
-clicking the plus button and name it `conf.typ`. Move the `conf` function
-definition inside of that new file. Now you can access it from your main file by
-adding an import before the show rule. Specify the path of the file between the
-`{import}` keyword and a colon, then name the function that you want to import.
-
-Another thing that you can do to make applying templates just a bit more elegant
-is to use the [`.with`]($function.with) method on functions to pre-populate all
-the named arguments. This way, you can avoid spelling out a closure and
-appending the content argument at the bottom of your template list. Templates on
-[Typst Universe]($universe) are designed to work with this style of function
-call.
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 
 ```example:single
 >>> #let conf(
@@ -657,7 +435,6 @@ call.
 #lorem(200)
 ```
 
-<<<<<<< HEAD
 これで会議論文を、その会議用の再利用可能なテンプレートに変換しました！[フォーラム](https://forum.typst.app/)や[TypstのDiscordサーバー](https://discord.gg/2uDybryKPe)で共有して、他の人も使えるようにしてみてはいかがでしょうか？
 
 ## まとめ { #review }
@@ -666,24 +443,3 @@ call.
 私たちはまだ非常に若いプロジェクトであり、フィードバックを求めています。質問、提案、またはバグを発見した場合は、[フォーラム](https://forum.typst.app/)、[Discordサーバー](https://discord.gg/2uDybryKPe)、[GitHub](https://github.com/typst/typst/)、またはウェブアプリのフィードバックフォーム（ヘルプメニューからいつでも利用可能）でお知らせください。
 
 さっそく[サインアップ](https://typst.app)して何か書いてみましょう！
-=======
-We have now converted the conference paper into a reusable template for that
-conference! Why not share it in the [Forum](https://forum.typst.app/) or on
-[Typst's Discord server](https://discord.gg/2uDybryKPe) so that others can use
-it too?
-
-## Review
-Congratulations, you have completed Typst's Tutorial! In this section, you have
-learned how to define your own functions and how to create and apply templates
-that define reusable document styles. You've made it far and learned a lot. You
-can now use Typst to write your own documents and share them with others.
-
-We are still a super young project and are looking for feedback. If you have any
-questions, suggestions or you found a bug, please let us know
-in the [Forum](https://forum.typst.app/),
-on our [Discord server](https://discord.gg/2uDybryKPe),
-on [GitHub](https://github.com/typst/typst/),
-or via the web app's feedback form (always available in the Help menu).
-
-So what are you waiting for? [Sign up](https://typst.app) and write something!
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
diff --git a/docs/tutorial/welcome.md b/docs/tutorial/welcome.md
index 35d0833f9d..c45bf69123 100644
--- a/docs/tutorial/welcome.md
+++ b/docs/tutorial/welcome.md
@@ -1,5 +1,4 @@
 ---
-<<<<<<< HEAD
 description: Typst チュートリアル
 ---
 
@@ -25,48 +24,3 @@ Typstは、エッセイ・記事・学術論文・本・レポート・宿題な
 4. [テンプレートを作成する]($tutorial/making-a-template)： 前章で作成した論文をもとに、再利用可能なテンプレートを作成します。
 
 Typstをお楽しみ頂けることを願っています！
-=======
-description: Typst's tutorial.
----
-
-# Tutorial
-Welcome to Typst's tutorial! In this tutorial, you will learn how to write and
-format documents in Typst. We will start with everyday tasks and gradually
-introduce more advanced features. This tutorial does not assume prior knowledge
-of Typst, other markup languages, or programming. We do assume that you know how
-to edit a text file.
-
-The best way to start is to sign up to the Typst app for free and follow along
-with the steps below. The app gives you instant preview, syntax highlighting and
-helpful autocompletions. Alternatively, you can follow along in your local text
-editor with the [open-source CLI](https://github.com/typst/typst).
-
-## When to use Typst { #when-typst }
-Before we get started, let's check what Typst is and when to use it. Typst is a
-markup language for typesetting documents. It is designed to be easy to learn,
-fast, and versatile. Typst takes text files with markup in them and outputs
-PDFs.
-
-Typst is a good choice for writing any long form text such as essays, articles,
-scientific papers, books, reports, and homework assignments. Moreover, Typst is
-a great fit for any documents containing mathematical notation, such as papers
-in the math, physics, and engineering fields. Finally, due to its strong styling
-and automation features, it is an excellent choice for any set of documents that
-share a common style, such as a book series.
-
-## What you will learn { #learnings }
-This tutorial has four chapters. Each chapter builds on the previous one. Here
-is what you will learn in each of them:
-
-1. [Writing in Typst:]($tutorial/writing-in-typst) Learn how to write text and
-   insert images, equations, and other elements.
-2. [Formatting:]($tutorial/formatting) Learn how to adjust the formatting
-   of your document, including font size, heading styles, and more.
-3. [Advanced Styling:]($tutorial/advanced-styling) Create a complex page
-   layout for a scientific paper with typographic features such as an author
-   list and run-in headings.
-4. [Making a Template:]($tutorial/making-a-template) Build a reusable template
-   from the paper you created in the previous chapter.
-
-We hope you'll enjoy Typst!
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
diff --git a/tests/ref/html/col-gutter-table.html b/tests/ref/html/col-gutter-table.html
index 16cac036b1..8894df9b17 100644
--- a/tests/ref/html/col-gutter-table.html
+++ b/tests/ref/html/col-gutter-table.html
@@ -6,23 +6,6 @@
   </head>
   <body>
     <table>
-<<<<<<< HEAD
-      <tr>
-        <td>a</td>
-        <td>b</td>
-        <td>c</td>
-      </tr>
-      <tr>
-        <td>d</td>
-        <td>e</td>
-        <td>f</td>
-      </tr>
-      <tr>
-        <td>g</td>
-        <td>h</td>
-        <td>i</td>
-      </tr>
-=======
       <thead>
         <tr>
           <th>a</th>
@@ -42,7 +25,6 @@
           <td>i</td>
         </tr>
       </tbody>
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     </table>
   </body>
 </html>
diff --git a/tests/ref/html/col-row-gutter-table.html b/tests/ref/html/col-row-gutter-table.html
index 16cac036b1..8894df9b17 100644
--- a/tests/ref/html/col-row-gutter-table.html
+++ b/tests/ref/html/col-row-gutter-table.html
@@ -6,23 +6,6 @@
   </head>
   <body>
     <table>
-<<<<<<< HEAD
-      <tr>
-        <td>a</td>
-        <td>b</td>
-        <td>c</td>
-      </tr>
-      <tr>
-        <td>d</td>
-        <td>e</td>
-        <td>f</td>
-      </tr>
-      <tr>
-        <td>g</td>
-        <td>h</td>
-        <td>i</td>
-      </tr>
-=======
       <thead>
         <tr>
           <th>a</th>
@@ -42,7 +25,6 @@
           <td>i</td>
         </tr>
       </tbody>
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     </table>
   </body>
 </html>
diff --git a/tests/ref/html/row-gutter-table.html b/tests/ref/html/row-gutter-table.html
index 16cac036b1..8894df9b17 100644
--- a/tests/ref/html/row-gutter-table.html
+++ b/tests/ref/html/row-gutter-table.html
@@ -6,23 +6,6 @@
   </head>
   <body>
     <table>
-<<<<<<< HEAD
-      <tr>
-        <td>a</td>
-        <td>b</td>
-        <td>c</td>
-      </tr>
-      <tr>
-        <td>d</td>
-        <td>e</td>
-        <td>f</td>
-      </tr>
-      <tr>
-        <td>g</td>
-        <td>h</td>
-        <td>i</td>
-      </tr>
-=======
       <thead>
         <tr>
           <th>a</th>
@@ -42,7 +25,6 @@
           <td>i</td>
         </tr>
       </tbody>
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
     </table>
   </body>
 </html>
diff --git a/tests/src/run.rs b/tests/src/run.rs
index 47d7fc3e61..70ee5bab9e 100644
--- a/tests/src/run.rs
+++ b/tests/src/run.rs
@@ -1,15 +1,10 @@
 use std::fmt::Write;
 use std::ops::Range;
 use std::path::PathBuf;
-<<<<<<< HEAD
-
-use ecow::eco_vec;
-=======
 use std::sync::LazyLock;
 
 use ecow::eco_vec;
 use regex::{Captures, Regex};
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 use tiny_skia as sk;
 use typst::diag::{SourceDiagnostic, SourceResult, Warned};
 use typst::layout::{Abs, Frame, FrameItem, PagedDocument, Transform};
@@ -245,18 +240,8 @@ impl<'a> Runner<'a> {
             return;
         }
 
-<<<<<<< HEAD
-        let message = if diag.message.contains("\\u{") {
-            &diag.message
-        } else {
-            &diag.message.replace("\\", "/")
-        };
-        let range = self.world.range(diag.span);
-        self.validate_note(kind, diag.span.id(), range.clone(), message);
-=======
         let range = self.world.range(diag.span);
         self.validate_note(kind, diag.span.id(), range.clone(), &diag.message);
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 
         // Check hints.
         for hint in &diag.hints {
@@ -276,8 +261,6 @@ impl<'a> Runner<'a> {
         range: Option<Range<usize>>,
         message: &str,
     ) {
-<<<<<<< HEAD
-=======
         // HACK: Replace backslashes path sepators with slashes for cross
         // platform reproducible error messages.
         static RE: LazyLock<Regex> =
@@ -287,7 +270,6 @@ impl<'a> Runner<'a> {
             format!("({} {} {})", &caps[1], &caps[2], path)
         });
 
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
         // Try to find perfect match.
         let file = file.unwrap_or(self.test.source.id());
         if let Some((i, _)) = self.test.notes.iter().enumerate().find(|&(i, note)| {
diff --git a/tests/suite/foundations/array.typ b/tests/suite/foundations/array.typ
index fa1aa8be27..6558d687f4 100644
--- a/tests/suite/foundations/array.typ
+++ b/tests/suite/foundations/array.typ
@@ -552,10 +552,7 @@
 --- array-reduce-unexpected-argument ---
 // Error: 19-21 unexpected argument
 #(1, 2, 3).reduce(() => none)
-<<<<<<< HEAD
-=======
 
 --- issue-6285-crashed-with-sorting-non-total-order ---
 // Error: 2-66 cannot compare none and string
 #(("a", "b", "c", "d", "e", "z") * 3 + ("c", none, "a")).sorted()
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
diff --git a/tests/suite/foundations/calc.typ b/tests/suite/foundations/calc.typ
index 4d41291909..9e7d9a3b0a 100644
--- a/tests/suite/foundations/calc.typ
+++ b/tests/suite/foundations/calc.typ
@@ -60,13 +60,10 @@
 #test(calc.rem(decimal("-7"), decimal("3")), decimal("-1"))
 #test(calc.rem(decimal("-7"), decimal("-3")), decimal("-1"))
 
-<<<<<<< HEAD
-=======
 // Ensure `i64::MIN % -1` will not overflow and panic.
 #test(calc.rem(int("-9223372036854775808"), -1), 0)
 #test(calc.rem(float("-9223372036854775808"), -1.0), 0.0)
 
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 --- calc-rem-divisor-zero-1 ---
 // Error: 14-15 divisor must not be zero
 #calc.rem(5, 0)
@@ -104,13 +101,10 @@
 // Error: 35-50 divisor must not be zero
 #calc.div-euclid(decimal("3.00"), decimal("0.00"))
 
-<<<<<<< HEAD
-=======
 --- calc-div-euclid-too-large ---
 // Error: 2-50 the result is too large
 #calc.div-euclid(int("-9223372036854775808"), -1)
 
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 --- calc-rem-euclid ---
 // Test the `rem-euclid` function.
 #test(calc.rem-euclid(7, 3), 1)
@@ -124,13 +118,10 @@
 #test(calc.rem-euclid(decimal("-7"), decimal("-3")), decimal("2"))
 #test(calc.rem-euclid(decimal("2.5"), decimal("2")), decimal("0.5"))
 
-<<<<<<< HEAD
-=======
 // Ensure `i64::MIN % -1` will not overflow and panic.
 #test(calc.rem-euclid(int("-9223372036854775808"), -1), 0)
 #test(calc.rem-euclid(float("-9223372036854775808"), -1.0), 0.0)
 
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 --- calc-rem-euclid-divisor-zero-1 ---
 // Error: 21-22 divisor must not be zero
 #calc.rem-euclid(5, 0)
@@ -165,13 +156,10 @@
 // Error: 27-41 divisor must not be zero
 #calc.quo(decimal("4.0"), decimal("0.0"))
 
-<<<<<<< HEAD
-=======
 --- calc-quo-too-large ---
 // Error: 2-43 the result is too large
 #calc.quo(int("-9223372036854775808"), -1)
 
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 --- calc-min-and-max ---
 // Test the `min` and `max` functions.
 #test(calc.min(2, -4), -4)
@@ -326,13 +314,10 @@
 #test(calc.gcd(0, 0), 0)
 #test(calc.gcd(7, 0), 7)
 
-<<<<<<< HEAD
-=======
 --- calc-gcd-too-large ---
 // Error: 2-43 the result is too large
 #calc.gcd(int("-9223372036854775808"), -1)
 
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 --- calc-lcm ---
 // Test the `lcm` function.
 #test(calc.lcm(112, 77), 1232)
diff --git a/tests/suite/foundations/int.typ b/tests/suite/foundations/int.typ
index e6e9ddd6f9..7a8bd3f680 100644
--- a/tests/suite/foundations/int.typ
+++ b/tests/suite/foundations/int.typ
@@ -87,8 +87,6 @@
 #test(repr(-0987654321), "-987654321")
 #test(repr(4 - 8), "-4")
 
-<<<<<<< HEAD
-=======
 --- int-parse-large-literals ---
 #import "../loading/edge-case.typ": large-integer, representable-integer
 
@@ -123,7 +121,6 @@
   )
 }
 
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 --- int-display ---
 // Test integers.
 #12 \
diff --git a/tests/suite/layout/grid/html.typ b/tests/suite/layout/grid/html.typ
index 09737270f0..1fb0cc79b8 100644
--- a/tests/suite/layout/grid/html.typ
+++ b/tests/suite/layout/grid/html.typ
@@ -35,11 +35,7 @@
 #table(
   columns: 3,
   column-gutter: 3pt,
-<<<<<<< HEAD
-  [a], [b], [c],
-=======
   table.header([a], [b], [c]),
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
   [d], [e], [f],
   [g], [h], [i]
 )
@@ -48,11 +44,7 @@
 #table(
   columns: 3,
   row-gutter: 3pt,
-<<<<<<< HEAD
-  [a], [b], [c],
-=======
   table.header([a], [b], [c]),
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
   [d], [e], [f],
   [g], [h], [i]
 )
@@ -61,17 +53,11 @@
 #table(
   columns: 3,
   gutter: 3pt,
-<<<<<<< HEAD
-  [a], [b], [c],
-=======
   table.header([a], [b], [c]),
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
   [d], [e], [f],
   [g], [h], [i]
 )
 
-<<<<<<< HEAD
-=======
 --- table-wide-header-table html ---
 #table(
   columns: 3,
@@ -93,7 +79,6 @@
   )
 )
 
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 --- multi-header-table html ---
 #table(
   columns: 2,
@@ -122,8 +107,6 @@
   ),
 )
 
-<<<<<<< HEAD
-=======
 --- multi-header-table-gutter html ---
 #table(
   columns: 2,
@@ -152,7 +135,6 @@
   ),
 )
 
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 --- multi-header-inside-table html ---
 #table(
   columns: 2,
diff --git a/tests/suite/layout/grid/stroke.typ b/tests/suite/layout/grid/stroke.typ
index 81ffc9768d..1e6e7e71e8 100644
--- a/tests/suite/layout/grid/stroke.typ
+++ b/tests/suite/layout/grid/stroke.typ
@@ -437,8 +437,6 @@
 --- grid-vline-position-top ---
 // Error: 24-27 expected `start`, `left`, `right`, or `end`, found top
 #table.vline(position: top)
-<<<<<<< HEAD
-=======
 
 --- issue-7398-grid-line-end-oob ---
 #set page(width: auto)
@@ -449,4 +447,3 @@
   table.vline(end: 3),
   table.hline(end: 3),
 )
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
diff --git a/tests/suite/layout/page.typ b/tests/suite/layout/page.typ
index 5a7ea6189d..6927591697 100644
--- a/tests/suite/layout/page.typ
+++ b/tests/suite/layout/page.typ
@@ -348,14 +348,11 @@ A
   A
 ]
 
-<<<<<<< HEAD
-=======
 --- page-set-html html ---
 // Warning: 2-16 page set rule was ignored during HTML export
 #set page("a4")
 Hi
 
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 --- issue-2631-page-header-ordering ---
 #set text(6pt)
 #show heading: set text(6pt, weight: "regular")
@@ -402,8 +399,6 @@ text
 #metadata(none)
 #set page(fill: red)
 2
-<<<<<<< HEAD
-=======
 
 --- issue-7292-page-width-auto-margin-zero ---
 #set page(width: auto, height: 100pt, margin: 0pt)
@@ -413,4 +408,3 @@ text
 
 --- issue-7292-page-size-auto-margin-zero ---
 #set page(width: auto, height: auto, margin: 0pt)
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
diff --git a/tests/suite/math/accent.typ b/tests/suite/math/accent.typ
index c9944fdd4d..b93ead285e 100644
--- a/tests/suite/math/accent.typ
+++ b/tests/suite/math/accent.typ
@@ -2,15 +2,10 @@
 
 --- math-accent-sym-call ---
 // Test function call.
-<<<<<<< HEAD
-$grave(a), acute(b), hat(f), tilde(§), macron(ä), diaer(a), ä \
- breve(\&), dot(!), circle(a), caron(@), arrow(Z), arrow.l(Z)$
-=======
 $ grave(a), acute(b), hat(f), tilde(§), macron(ä), dash(ä), breve(ä), \
   dot(!), dot.double(a), diaer(a), dot.triple(a), dot.quad(a), circle(a), \
   acute.double(a), caron(@), arrow(Z), arrow.l(Z), arrow.l.r(Z), \
   harpoon(a), harpoon.lt(a) $
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 
 --- math-accent-align ---
 $ x &= p \ dot(x) &= v \ dot.double(x) &= a \ dot.triple(x) &= j \ dot.quad(x) &= s $
@@ -99,8 +94,6 @@ $accent(sum, \u{0330}), accent(sum, \u{0330}, size: #50%), accent(H, \u{032D}, s
 $hat(accent(L, \u{0330})), accent(circle(p), \u{0323}),
   macron(accent(caron(accent(A, \u{20ED})), \u{0333})) \
   breve(accent(eta, \u{032E})) = accent(breve(eta), \u{032E})$
-<<<<<<< HEAD
-=======
 
 --- math-accent-string-too-long ---
 // Error: 17-21 expected exactly one character
@@ -142,4 +135,3 @@ $accent(A, std.emoji.arrow.l.r)$
 
 // Error: 13-47 expected exactly one character
 $accent(A, #symbol("\u{2194}\u{fe0e}\u{fe0f}"))$
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
diff --git a/tests/suite/math/cases.typ b/tests/suite/math/cases.typ
index 7da6c440d5..832bae3c94 100644
--- a/tests/suite/math/cases.typ
+++ b/tests/suite/math/cases.typ
@@ -20,11 +20,8 @@ $ cases(a, b, c) $
 // Warning: 40-49 linebreaks are ignored in branches
 // Hint: 40-49 use commas instead to separate each line
 $ cases(a, b, c) cases(reverse: #true, a \ b \ c) $
-<<<<<<< HEAD
-=======
 
 --- math-cases-delim-class ---
 // Test that delimiters have opening and closing math class.
 $ 2cases(a, reverse: #true, delim: bar.v) 2 $
 $ 2 cases(a, delim: bar.v)2 $
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
diff --git a/tests/suite/math/mat.typ b/tests/suite/math/mat.typ
index 2cce362b97..464deba003 100644
--- a/tests/suite/math/mat.typ
+++ b/tests/suite/math/mat.typ
@@ -284,11 +284,8 @@ $ mat(
     dots.v, dots.v, dots.v, dots.v, dots.down;
   )
   mat(p_0; p_1; p_2; dots.v) $
-<<<<<<< HEAD
-=======
 
 --- math-mat-delim-class ---
 // Test that delimiters have opening and closing math class.
 $ 2mat(a, delim: bar.v) 2 $
 $ 2 mat(a, delim: bar.v)2 $
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
diff --git a/tests/suite/math/spacing.typ b/tests/suite/math/spacing.typ
index 8a7c94ace3..481c421f26 100644
--- a/tests/suite/math/spacing.typ
+++ b/tests/suite/math/spacing.typ
@@ -19,12 +19,8 @@ $f(x) sin(y)$
 // Test ignored vs non-ignored spaces.
 $f (x), f(x)$ \
 $[a|b], [a | b]$ \
-<<<<<<< HEAD
-$a"is"b, a "is" b$
-=======
 $a"is"b, a "is" b$ \
 $A"B"C, A "B" C$
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 
 --- math-spacing-predefined ---
 // Test predefined spacings.
diff --git a/tests/suite/math/vec.typ b/tests/suite/math/vec.typ
index b506fb202c..682897277f 100644
--- a/tests/suite/math/vec.typ
+++ b/tests/suite/math/vec.typ
@@ -54,11 +54,8 @@ $ vec(1, 2) $
 // Warning: 20-29 linebreaks are ignored in elements
 // Hint: 20-29 use commas instead to separate each line
 $ vec(a, b, c) vec(a \ b \ c) $
-<<<<<<< HEAD
-=======
 
 --- math-vec-delim-class ---
 // Test that delimiters have opening and closing math class.
 $ 2vec(a, delim: bar.v) 2 $
 $ 2 vec(a, delim: bar.v)2 $
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
diff --git a/tests/suite/model/heading.typ b/tests/suite/model/heading.typ
index 4b8b5bee4c..e14c1138d6 100644
--- a/tests/suite/model/heading.typ
+++ b/tests/suite/model/heading.typ
@@ -162,8 +162,6 @@ Cannot be used as @intro
 --- issue-5719-heading-nested ---
 // Headings may not be nested like this.
 = = A
-<<<<<<< HEAD
-=======
 
 --- issue-7428-heading-numbering-errors ---
 // Ensure that the error from the first layout iteration is silenced.
@@ -173,4 +171,3 @@ Cannot be used as @intro
 })
 
 = A
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
diff --git a/tests/suite/pdftags/break.typ b/tests/suite/pdftags/break.typ
index 32d8e3d4bd..57eeb063bb 100644
--- a/tests/suite/pdftags/break.typ
+++ b/tests/suite/pdftags/break.typ
@@ -24,8 +24,6 @@ Start of the first paragraph #link(target)[
 
 --- break-tags-issue-7020 pdftags nopdfua ---
 Foo #quote($$ + parbreak())
-<<<<<<< HEAD
-=======
 
 --- issue-7257-break-tags-show-par-none pdftags ---
 #show par: none
@@ -34,4 +32,3 @@ Foo #quote($$ + parbreak())
 // Hint: 3-6 please report this as a bug
 // Hint: 3-6 set `RUST_BACKTRACE` to `1` or `full` to capture a backtrace
 #[= A]B
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
diff --git a/tests/suite/pdftags/link.typ b/tests/suite/pdftags/link.typ
index daf35357e5..7d9ccbfe5f 100644
--- a/tests/suite/pdftags/link.typ
+++ b/tests/suite/pdftags/link.typ
@@ -55,8 +55,6 @@ Look #link("https://github.com/typst/typst")[this #parbreak() thing].
 
 --- link-tags-with-parbreak pdftags nopdfua ---
 Look #link("https://github.com/typst/typst")[this #parbreak() thing].
-<<<<<<< HEAD
-=======
 
 --- issue-7301-link-tags-empty-link-body pdftags ---
 #link("asf")[#none\ #none]
@@ -69,4 +67,3 @@ Look #link("https://github.com/typst/typst")[this #parbreak() thing].
 
 --- issue-7301-link-tags-empty-link-body-mutliple pdftags ---
 #link("asf")[#none\ #none] #link("asf")[#none\ #none]
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
diff --git a/tests/suite/pdftags/query.typ b/tests/suite/pdftags/query.typ
index 3ccd7c7c4e..5e9cdd6d3c 100644
--- a/tests/suite/pdftags/query.typ
+++ b/tests/suite/pdftags/query.typ
@@ -10,37 +10,26 @@
 
 #context query(<figure>).at(0)
 
-<<<<<<< HEAD
---- query-tags-ambiguous-parent-place pdftags ---
-=======
 --- query-tags-ambiguous-parent-place-error pdftags ---
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 // Error: 2-43 PDF/UA-1 error: ambiguous logical parent
 // Hint: 2-43 please report this as a bug
 #place(float: true, top + left)[something] <placed>
 
 #context query(<placed>).join()
 
-<<<<<<< HEAD
---- query-tags-ambiguous-parent-footnote pdftags ---
-=======
 --- query-tags-ambiguous-parent-place pdftags nopdfua ---
 #place(float: true, top + left)[something] <placed>
 
 #context query(<placed>).join()
 
 --- query-tags-ambiguous-parent-footnote-error pdftags ---
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 // Error: 1:2-1:21 PDF/UA-1 error: ambiguous logical parent
 // Hint: 1:2-1:21 please report this as a bug
 #footnote[something] <note>
 
 #context query(<note>).join()
-<<<<<<< HEAD
-=======
 
 --- query-tags-ambiguous-parent-footnote pdftags nopdfua ---
 #footnote[something] <note>
 
 #context query(<note>).join()
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
diff --git a/tests/suite/text/raw.typ b/tests/suite/text/raw.typ
index 1765afd2e5..046692aea6 100644
--- a/tests/suite/text/raw.typ
+++ b/tests/suite/text/raw.typ
@@ -105,11 +105,7 @@ contexts:
     - match: '\'
 ```.text
 
-<<<<<<< HEAD
-// Error: 35-56 failed to parse syntax (Error while compiling regex '/': Parsing error at position 0: Backslash without following character)
-=======
 // Error: 35-56 failed to parse syntax (Error while compiling regex '\': Parsing error at position 0: Backslash without following character)
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363
 #raw("text", lang: "a", syntaxes: bytes(sublime-syntax))
 
 --- raw-theme ---
diff --git a/tests/suite/text/shift.typ b/tests/suite/text/shift.typ
index 9d65d51f5c..7fb7054786 100644
--- a/tests/suite/text/shift.typ
+++ b/tests/suite/text/shift.typ
@@ -89,8 +89,6 @@ A#super(highlight[4])
 1#super[st], 2#super[nd], 3#super[rd].
 
 log#sub[2], log#sub[3], log#sub[variable].
-<<<<<<< HEAD
-=======
 
 --- issue-7249-multiple-lookup-tables ---
 // We increase the font size to make sure the difference is visible in the
@@ -104,4 +102,3 @@ A#super[(test)] \
 // Source Serif 4 does not support `sups` for backticks, so this should be
 // synthesized.
 A#super[test\`]
->>>>>>> eb2027e55f17a91cc2025c7a71674a2c5ea3a363

From 2a21ce12b20ed50d58dcf76c15db417601559028 Mon Sep 17 00:00:00 2001
From: 3w36zj6 <52315048+3w36zj6@users.noreply.github.com>
Date: Sat, 29 Aug 2026 21:40:48 +0900
Subject: [PATCH 50/54] =?UTF-8?q?chore:=20Rust=E3=82=921.89.0=E3=81=AB?=
 =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 mise.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mise.toml b/mise.toml
index 59ec9702d8..845c0961d8 100644
--- a/mise.toml
+++ b/mise.toml
@@ -1,6 +1,6 @@
 
 [tools]
-rust = "1.88.0"
+rust = "1.89.0"
 node = "22.11.0"
 bun = "1.2.21"
 pinact = "3.1.1"

From 1160b614d5ec159ebc5e6d623603cac7bfce7a2a Mon Sep 17 00:00:00 2001
From: 3w36zj6 <52315048+3w36zj6@users.noreply.github.com>
Date: Sat, 29 Aug 2026 21:54:04 +0900
Subject: [PATCH 51/54] =?UTF-8?q?chore:=20=E3=83=AA=E3=83=B3=E3=82=AF?=
 =?UTF-8?q?=E3=82=92=E8=A7=A3=E6=B1=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docs/changelog/0.14.1.md | 58 ++++++++++++++++++++--------------------
 docs/guides/tables.md    | 34 +++++++++++------------
 2 files changed, 46 insertions(+), 46 deletions(-)

diff --git a/docs/changelog/0.14.1.md b/docs/changelog/0.14.1.md
index 552d142ff9..f914f120d1 100644
--- a/docs/changelog/0.14.1.md
+++ b/docs/changelog/0.14.1.md
@@ -6,49 +6,49 @@ description: Changes in Typst 0.14.1
 # Version 0.14.1 (December 3, 2025) { #v0.14.1 }
 
 ## PDF export
-- Fixed regression where links to labelled elements would sometimes not work correctly [LaurenzV/krilla#304]
-- Fixed bug where PDF text attributes could be written incorrectly [#7478]
-- Fixed crash in link handling [#7471]
-- Fixed crash for zero-sized pages [#7454]
-- Fixed crash when a table [`vline`]($table.vline) or [`hline`]($table.hline) has an out-of-bounds index [#7448]
-- Fixed crash in formatting of font-related PDF export errors [#7460]
-- Fixed crash when a [`footnote`] or [`place`] element was queried and reinserted into the document [#7216]
-- Fixed crash for PNGs with invalid metadata [LaurenzV/krilla#286], [LaurenzV/krilla#287]
-- Fixed bug where text in SVGs with `fill-and-stroke` paint order could be exported incorrectly [LaurenzV/krilla#292]
-- Fixed bug with layer isolation in SVGs where blending/masking is used [LaurenzV/krilla#295]
-- Fixed that table headers could be tagged incorrectly in some scenarios [LaurenzV/krilla#289]
-- Fixed issues where generated PDFs could differ between 32-bit and 64-bit systems [LaurenzV/krilla#317], [LaurenzV/krilla#316], [LaurenzV/krilla#312]
-- Upgraded JPEG decoder used during PDF export for improved compatibility, fixing a case where a valid JPEG was rejected [LaurenzV/krilla#288]
-- A PDF document information dictionary that would be empty is now fully omitted instead [LaurenzV/krilla#280]
-- A rare crash in PDF tagging was turned into a compiler error [#7450]
+- Fixed regression where links to labelled elements would sometimes not work correctly [LaurenzV/krilla#304](https://github.com/LaurenzV/krilla/issues/304)
+- Fixed bug where PDF text attributes could be written incorrectly [#7478](https://github.com/typst/typst/issues/7478)
+- Fixed crash in link handling [#7471](https://github.com/typst/typst/issues/7471)
+- Fixed crash for zero-sized pages [#7454](https://github.com/typst/typst/issues/7454)
+- Fixed crash when a table [`vline`]($table.vline) or [`hline`]($table.hline) has an out-of-bounds index [#7448](https://github.com/typst/typst/issues/7448)
+- Fixed crash in formatting of font-related PDF export errors [#7460](https://github.com/typst/typst/issues/7460)
+- Fixed crash when a [`footnote`]($footnote) or [`place`]($place) element was queried and reinserted into the document [#7216](https://github.com/typst/typst/issues/7216)
+- Fixed crash for PNGs with invalid metadata [LaurenzV/krilla#286](https://github.com/LaurenzV/krilla/issues/286), [LaurenzV/krilla#287](https://github.com/LaurenzV/krilla/issues/287)
+- Fixed bug where text in SVGs with `fill-and-stroke` paint order could be exported incorrectly [LaurenzV/krilla#292](https://github.com/LaurenzV/krilla/issues/292)
+- Fixed bug with layer isolation in SVGs where blending/masking is used [LaurenzV/krilla#295](https://github.com/LaurenzV/krilla/issues/295)
+- Fixed that table headers could be tagged incorrectly in some scenarios [LaurenzV/krilla#289](https://github.com/LaurenzV/krilla/issues/289)
+- Fixed issues where generated PDFs could differ between 32-bit and 64-bit systems [LaurenzV/krilla#317](https://github.com/LaurenzV/krilla/issues/317), [LaurenzV/krilla#316](https://github.com/LaurenzV/krilla/issues/316), [LaurenzV/krilla#312](https://github.com/LaurenzV/krilla/issues/312)
+- Upgraded JPEG decoder used during PDF export for improved compatibility, fixing a case where a valid JPEG was rejected [LaurenzV/krilla#288](https://github.com/LaurenzV/krilla/issues/288)
+- A PDF document information dictionary that would be empty is now fully omitted instead [LaurenzV/krilla#280](https://github.com/LaurenzV/krilla/issues/280)
+- A rare crash in PDF tagging was turned into a compiler error [#7450](https://github.com/typst/typst/issues/7450)
 
 ## HTML export
-- Fixed export of table [headers]($table.header) and [footers]($table.footer) with gutter [#7332]
-- A [`page`] set rule in HTML export is now a warning instead of a hard error, in line with how unsupported elements are generally treated [#7513]
+- Fixed export of table [headers]($table.header) and [footers]($table.footer) with gutter [#7332](https://github.com/typst/typst/issues/7332)
+- A [`page`]($page) set rule in HTML export is now a warning instead of a hard error, in line with how unsupported elements are generally treated [#7513](https://github.com/typst/typst/issues/7513)
 
 ## Math
-- Fixed regression where `arrow.l.r` could not be used as an [accent]($math.accent) anymore [#7481]
-- Fixed that single-letter strings did not react to spaces around them like multi-letter strings do [#7276]
-- Fixed that spacing around [`mat`]($math.mat) and [`vec`]($math.vec) with a fence delimiter was whitespace-dependent [#7309]
-- Fixed height calculation for horizontally stretched glyphs [#7327]
+- Fixed regression where `arrow.l.r` could not be used as an [accent]($math.accent) anymore [#7481](https://github.com/typst/typst/issues/7481)
+- Fixed that single-letter strings did not react to spaces around them like multi-letter strings do [#7276](https://github.com/typst/typst/issues/7276)
+- Fixed that spacing around [`mat`]($math.mat) and [`vec`]($math.vec) with a fence delimiter was whitespace-dependent [#7309](https://github.com/typst/typst/issues/7309)
+- Fixed height calculation for horizontally stretched glyphs [#7327](https://github.com/typst/typst/issues/7327)
 
 ## Model
-- Fixed regression where Typst would error in heading numbering functions that don't handle the counter state `{(0,)}`. This can occur in the first layout iteration. Such errors are usually automatically caught by Typst, which was not the case here. [#7459]
+- Fixed regression where Typst would error in heading numbering functions that don't handle the counter state `{(0,)}`. This can occur in the first layout iteration. Such errors are usually automatically caught by Typst, which was not the case here. [#7459](https://github.com/typst/typst/issues/7459)
 
 ## Text
-- Fixed regression where Typst would synthesize superscripts for some fonts even when [typographic]($super.typographic) glyphs were available [#7462]
-- Fixed regression where some oblique fonts would be classified as italic [#7483]
+- Fixed regression where Typst would synthesize superscripts for some fonts even when [typographic]($super.typographic) glyphs were available [#7462](https://github.com/typst/typst/issues/7462)
+- Fixed regression where some oblique fonts would be classified as italic [#7483](https://github.com/typst/typst/issues/7483)
 
 ## Scripting
-- Fixed crash due to violated invariants in [`array.sorted`] [#7520]
-- Fixed crashes due to overflow in [`calc.rem`], [`calc.rem-euclid`], [`calc.div-euclid`], [`calc.quo`], and [`calc.gcd`] [#7419]
-- Upgraded WebAssembly runtime, fixing a bug that [plugins]($plugin) could run into [#7438]
+- Fixed crash due to violated invariants in [`array.sorted`]($array.sorted) [#7520](https://github.com/typst/typst/issues/7520)
+- Fixed crashes due to overflow in [`calc.rem`]($calc.rem), [`calc.rem-euclid`]($calc.rem-euclid), [`calc.div-euclid`]($calc.div-euclid), [`calc.quo`]($calc.quo), and [`calc.gcd`]($calc.gcd) [#7419](https://github.com/typst/typst/issues/7419)
+- Upgraded WebAssembly runtime, fixing a bug that [plugins]($plugin) could run into [#7438](https://github.com/typst/typst/issues/7438)
 
 ## Command Line Interface
-- Compiling to standard output in combination with `--deps --deps-format=make` (which results in an error) will not produce an empty Make dependency file as a side effect anymore [#7246]
+- Compiling to standard output in combination with `--deps --deps-format=make` (which results in an error) will not produce an empty Make dependency file as a side effect anymore [#7246](https://github.com/typst/typst/issues/7246)
 
 ## Development
-- Increased minimum supported Rust version to 1.89 [#7363]
+- Increased minimum supported Rust version to 1.89 [#7363](https://github.com/typst/typst/issues/7363)
 
 ## Contributors
 <contributors from="v0.14.0" to="v0.14.1" />
diff --git a/docs/guides/tables.md b/docs/guides/tables.md
index 50b2542cbb..466e43e378 100644
--- a/docs/guides/tables.md
+++ b/docs/guides/tables.md
@@ -162,7 +162,7 @@ the last column is `1fr` wide as to fill the whole page.
 )
 ```
 
-Here, we have passed our list of column lengths as an [array], enclosed in round
+Here, we have passed our list of column lengths as an [array]($array), enclosed in round
 parentheses, with its elements separated by commas. The first two columns are
 automatically sized, so that they take on the size of their content and the
 third column is sized as `{1fr}` so that it fills up the remainder of the space
@@ -482,7 +482,7 @@ depends on the modification you want to make and your intent:
 - Do you want to change, add, or remove the stroke around a single cell? Use the
   `table.cell` element in the argument list of your table call.
 - Do you want to change, add, or remove a single horizontal or vertical stroke
-  in a single table? Use the [`table.hline`] and [`table.vline`] elements in the
+  in a single table? Use the [`table.hline`]($table.hline) and [`table.vline`]($table.vline) elements in the
   argument list of your table call.
 
 We will go over all of these options with examples next! First, we will tackle
@@ -568,8 +568,8 @@ achieve more complex stroking patterns.
 
 ### Adding individual lines in the table { #individual-lines }
 If you want to add a single horizontal or vertical line in your table, for
-example to separate a group of rows, you can use the [`table.hline`] and
-[`table.vline`] elements for horizontal and vertical lines, respectively. Add
+example to separate a group of rows, you can use the [`table.hline`]($table.hline) and
+[`table.vline`]($table.vline) elements for horizontal and vertical lines, respectively. Add
 them to the argument list of the `table` function just like you would add
 individual cells and a header.
 
@@ -857,11 +857,11 @@ rows, since it is the last entry in the array.
 You can use multiple mechanisms to align the content in your table. You can
 either use the `table` function's `align` argument to set the alignment for your
 whole table (or use it in a set rule to set the alignment for tables throughout
-your document) or the [`align`] function (or `table.cell`'s `align` argument) to
+your document) or the [`align`]($align) function (or `table.cell`'s `align` argument) to
 override the alignment of a single cell.
 
 When using the `table` function's align argument, you can choose between three
-methods to specify an [alignment]:
+methods to specify an [alignment]($alignment):
 
 - Just specify a single alignment like `right` (aligns in the top-right corner)
   or `center + horizon` (centers all cell content). This changes the alignment
@@ -935,7 +935,7 @@ you can group for example a sales data table by quarter in the first row and by
 months in the second row.
 
 A merged cell spans multiple rows and/or columns. You can achieve it with the
-[`table.cell`] function's `rowspan` and `colspan` arguments: Just specify how
+[`table.cell`]($table.cell) function's `rowspan` and `colspan` arguments: Just specify how
 many rows or columns you want your cell to span.
 
 The example below contains an attendance calendar for an office with in-person
@@ -1116,22 +1116,22 @@ upright:
 ```
 
 Here, we take the same table and the other content we want to set with it and
-put it into a call to the [`page`] function while supplying `{true}` to the
+put it into a call to the [`page`]($page) function while supplying `{true}` to the
 `flipped` argument. This will instruct Typst to create new pages with width and
 height swapped and place the contents of the function call onto a new page.
 Notice how the page number is also on the long edge of the paper now. At the
-bottom of the page, we use the [`pad`] function to constrain the width of the
+bottom of the page, we use the [`pad`]($pad) function to constrain the width of the
 paragraph to achieve a nice and legible line length.
 
 ## How to break a table across pages? { #table-across-pages }
 It is best to contain a table on a single page. However, some tables just have
 many rows, so breaking them across pages becomes unavoidable. Fortunately, Typst
 supports breaking tables across pages out of the box. If you are using the
-[`table.header`] and [`table.footer`] functions, their contents will be repeated
+[`table.header`]($table.header) and [`table.footer`]($table.footer) functions, their contents will be repeated
 on each page as the first and last rows, respectively. If you want to disable
 this behavior, you can set `repeat` to `{false}` on either of them.
 
-If you have placed your table inside of a [figure], it becomes unable to break
+If you have placed your table inside of a [figure]($figure), it becomes unable to break
 across pages by default. However, you can change this behavior. Let's take a
 look:
 
@@ -1161,7 +1161,7 @@ look:
 )
 ```
 
-A figure automatically produces a [block] which cannot break by default.
+A figure automatically produces a [block]($block) which cannot break by default.
 However, we can reconfigure the block of the figure using a show rule to make it
 `breakable`. Now, the figure spans multiple pages with the headers and footers
 repeating.
@@ -1200,7 +1200,7 @@ whom the metric applies), Code, the year, and the number of transistors per
 microprocessor. Only the last two columns change between each row, so we can
 disregard "Entity" and "Code".
 
-First, let's start by loading this file with the [`csv`] function. It accepts
+First, let's start by loading this file with the [`csv`]($csv) function. It accepts
 the file name of the file we want to load as a string argument:
 
 ```typ
@@ -1326,17 +1326,17 @@ cells itself conveys information.
 To make this difference clear to other software and allow templates to heavily
 style tables, Typst has two functions for grid and table layout:
 
-- The [`table`] function explained throughout this guide which is intended for
+- The [`table`]($table) function explained throughout this guide which is intended for
   tabular data.
-- The [`grid`] function which is intended for presentational purposes and page
+- The [`grid`]($grid) function which is intended for presentational purposes and page
   layout.
 
 Both elements work the same way and have the same arguments. You can apply
 everything you have learned about tables in this guide to grids. There are only
 three differences:
 
-- You'll need to use the [`grid.cell`], [`grid.vline`], and [`grid.hline`]
-  elements instead of [`table.cell`], [`table.vline`], and [`table.hline`].
+- You'll need to use the [`grid.cell`]($grid.cell), [`grid.vline`]($grid.vline), and [`grid.hline`]($grid.hline)
+  elements instead of [`table.cell`]($table.cell), [`table.vline`]($table.vline), and [`table.hline`]($table.hline).
 - The grid has different defaults: It draws no strokes by default and has no
   spacing (`inset`) inside of its cells.
 - Elements like `figure` do not react to grids since they are supposed to have

From dd31ed7e2d077a105d9a350176244b31f3639da8 Mon Sep 17 00:00:00 2001
From: 3w36zj6 <52315048+3w36zj6@users.noreply.github.com>
Date: Sun, 30 Aug 2026 22:24:52 +0900
Subject: [PATCH 52/54] =?UTF-8?q?chore:=20=E3=83=90=E3=83=BC=E3=82=B8?=
 =?UTF-8?q?=E3=83=A7=E3=83=B3=E3=82=92v0.14.1=E3=81=AB=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 website/metadata.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/website/metadata.json b/website/metadata.json
index 1c901e52d8..f0b784e316 100644
--- a/website/metadata.json
+++ b/website/metadata.json
@@ -1,7 +1,7 @@
 {
 	"$schema": "./typst-docs-web/metadata.schema.json",
 	"language": "ja-JP",
-	"version": "0.14.0",
+	"version": "0.14.1",
 	"typstOfficialUrl": "https://typst.app",
 	"typstOfficialDocsUrl": "https://typst.app/docs/",
 	"githubOrganizationUrl": "https://github.com/typst-jp",

From 5ea9f71262e2c660438cbcb268143bce8726f858 Mon Sep 17 00:00:00 2001
From: 3w36zj6 <52315048+3w36zj6@users.noreply.github.com>
Date: Sun, 30 Aug 2026 22:38:28 +0900
Subject: [PATCH 53/54] =?UTF-8?q?chore:=20=E7=BF=BB=E8=A8=B3=E3=82=B9?=
 =?UTF-8?q?=E3=83=86=E3=83=BC=E3=82=BF=E3=82=B9=E3=82=92=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 website/translation-status.json | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/website/translation-status.json b/website/translation-status.json
index 0a83053d74..fcdfd8a84d 100644
--- a/website/translation-status.json
+++ b/website/translation-status.json
@@ -18,9 +18,9 @@
 	"/docs/reference/foundations/auto/": "untranslated",
 	"/docs/reference/foundations/bool/": "untranslated",
 	"/docs/reference/foundations/bytes/": "untranslated",
-	"/docs/reference/foundations/calc/": "translated",
+	"/docs/reference/foundations/calc/": "partially_translated",
 	"/docs/reference/foundations/content/": "translated",
-	"/docs/reference/foundations/datetime/": "translated",
+	"/docs/reference/foundations/datetime/": "partially_translated",
 	"/docs/reference/foundations/decimal/": "untranslated",
 	"/docs/reference/foundations/dictionary/": "untranslated",
 	"/docs/reference/foundations/duration/": "untranslated",
@@ -109,17 +109,17 @@
 	"/docs/reference/layout/block/": "translated",
 	"/docs/reference/layout/box/": "translated",
 	"/docs/reference/layout/colbreak/": "translated",
-	"/docs/reference/layout/columns/": "translated",
+	"/docs/reference/layout/columns/": "partially_translated",
 	"/docs/reference/layout/direction/": "translated",
 	"/docs/reference/layout/fraction/": "translated",
 	"/docs/reference/layout/grid/": "translated",
-	"/docs/reference/layout/hide/": "translated",
-	"/docs/reference/layout/layout/": "translated",
+	"/docs/reference/layout/hide/": "partially_translated",
+	"/docs/reference/layout/layout/": "partially_translated",
 	"/docs/reference/layout/length/": "translated",
 	"/docs/reference/layout/measure/": "translated",
 	"/docs/reference/layout/move/": "translated",
 	"/docs/reference/layout/pad/": "translated",
-	"/docs/reference/layout/page/": "translated",
+	"/docs/reference/layout/page/": "partially_translated",
 	"/docs/reference/layout/pagebreak/": "translated",
 	"/docs/reference/layout/place/": "translated",
 	"/docs/reference/layout/ratio/": "translated",
@@ -152,7 +152,7 @@
 	"/docs/reference/introspection/location/": "translated",
 	"/docs/reference/introspection/metadata/": "translated",
 	"/docs/reference/introspection/query/": "translated",
-	"/docs/reference/introspection/state/": "translated",
+	"/docs/reference/introspection/state/": "partially_translated",
 	"/docs/reference/data-loading/": "translated",
 	"/docs/reference/data-loading/cbor/": "translated",
 	"/docs/reference/data-loading/csv/": "translated",
@@ -179,7 +179,8 @@
 	"/docs/guides/tables/": "untranslated",
 	"/docs/guides/accessibility/": "translated",
 	"/docs/changelog/": "translated",
-	"/docs/changelog/0.14.0/": "translated",
+	"/docs/changelog/0.14.1/": "untranslated",
+	"/docs/changelog/0.14.0/": "partially_translated",
 	"/docs/changelog/0.13.1/": "translated",
 	"/docs/changelog/0.13.0/": "untranslated",
 	"/docs/changelog/0.12.0/": "untranslated",

From 1181ece32b98fdb719d4f67f1846c76ddd6a67a6 Mon Sep 17 00:00:00 2001
From: 3w36zj6 <52315048+3w36zj6@users.noreply.github.com>
Date: Sun, 30 Aug 2026 22:45:04 +0900
Subject: [PATCH 54/54] =?UTF-8?q?chore:=20ref=E7=94=BB=E5=83=8F=E3=82=92v0?=
 =?UTF-8?q?.14.1=E3=81=AB=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 tests/ref/math-accent-sym-call.png            | Bin 926 -> 1274 bytes
 tests/ref/math-delim-show-rule-3.png          | Bin 858 -> 868 bytes
 tests/ref/math-mat-spread-2d.png              | Bin 3391 -> 3387 bytes
 tests/ref/math-spacing-kept-spaces.png        | Bin 884 -> 1176 bytes
 tests/ref/math-stretch-horizontal-attach.png  | Bin 2245 -> 2251 bytes
 tests/ref/math-stretch-horizontal.png         | Bin 591 -> 580 bytes
 .../math-stretch-min-overlap-exceeds-max.png  | Bin 585 -> 586 bytes
 tests/ref/math-underover-brace.png            | Bin 751 -> 735 bytes
 tests/ref/math-underover-parens.png           | Bin 726 -> 736 bytes
 tests/ref/math-underover-shells.png           | Bin 551 -> 547 bytes
 10 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/tests/ref/math-accent-sym-call.png b/tests/ref/math-accent-sym-call.png
index 0837a86c9e861a960cbca4d157ea7e719b54cd0f..26ca5998242fa368de24c3c7d35254f66d4a655a 100644
GIT binary patch
delta 1267
zcmV<P1PuG02l@$+7k^U-00000ab%qP000ERNkl<Zc-rmN=}+5r0LStDA3pGj4~?4n
z#JMAJZjKS1SyXU}#LZ$9qhh$n#)ca>=nw}(pk>^pQc8hwRK_?4qfI%=xK~O!%2kfS
z20i%E<74=Kdtk_n+TY59{XQXlU&)vBoi^mx1K6h>;KE#(3x9Lr=N%58^ss7_9E-CX
zW;|oP<cE!L=R*&>s&n-K?4>zEkTuuVDhVb80>LzqCLylhr|{U23mXgYOt(tU$Cl^!
zQLpoi6w+Y0r;Z9EXZm2alc4dz%_RcFE%GUPr1=`3!f+VqS$!MsMX6~o4D%pcGfvy6
zv`!s`d11lgQ-4@q+DI!Ac~T1jx?eA$7`$esXsfKCFjeGCQ>m)%z?X2vZ#YQx&T5UT
zhZCSnocM_$_y9Z&fvj--3<1vClUjTUzxi}6h`{s_e$64mG!JxN*phVwqTho$35?02
zBLry7_@>;K@ClS>b~&bi<rth?vCacPO%?zxfa%O6?0?+#pT@UR?JNU?-rGFXwR5-p
zhBHN^Sl;;GVQF1{^7wopfTBDF`o9E#D?PyW+x8tsGK&Gg=2eLx)_SV|kmr=fwC>zF
zu2hypE&g%C#|KF7E|?mAbW%ZvlsWI6eZc!y9{Cn_s$DQ?0Apl_`z19^V!(Ze0o$IO
z?g{tp#D9gk@ZYzPu}@)Z_dbQqU3k_^FvA4E>VyR*LZG#WrLf{CJx5D~I;uO`cyd}w
zA%M^cv}$$t&1J{~0AvbT3Xh+~f7;wSOX0OJdK!wQ15_$;<qB1GNj(KqRIZ@Xmq<t0
z3F9(->C=`x0nsoIK{_Hq0S*%2bDf$;U<%yki+@=PH;~`r%LpGQ;<e*l0=&AVKTj|b
zfI<<GfRB(xcEVe|Fs=ZCO2=WPW5NamuW3U%F$Um0<Q8^r>wrfw_@rBFSO?OZm}3ty
z?qDITzYh5&U{xr&B*(RCpj%RPu^WK~pz>~hntt+Q0J&Ay3!TywV4<Kgp&1vOd<^gT
za(_2z-0F9FFZXD5hMn;Il3Qx*k!{GW$tRvm?%RnAbK!rUF?UKh5AP<eZVkgT`zTfx
zSq@`8$>8ylNR;-2%Oj^nqE44@#EFVevJ$rG^)|QdfdAgHM8aFAQpuWR58zsOwBYCC
z+te50goy!8>dz8{@n={G_d-oErfjTH4S)6!WAi4S9&uf)+=lVc2=#0}3~y;!32)Tu
ztOSz2DBR7G5W`?*PTix#9Ai1&>GF(y^Jov)2%A1Nh2AHs$`nHtDFvPLTp8SRoRxXJ
z9ViDYVZHz#nu(;USky%}fG#2pYOBj%XG3LoIiv^*R>BuXnNyG91Tfqut8PkF5`Tjq
z0YriNY61}La&!tDvBbWH<z<DzH8?y2pi9;vFIM8aTA=QwEdKkqfb-2j#mm`gr}BZ|
zE}-z0?9}7sz?nXu!(d<ordEhI$UEtQXO3L~X29#sF_xZOZM&>syzX##-M;(pxo;;f
z%!U8`+UW6U&97mFSe!LXlpz+2t!yvAM{Q0m;8STba>RZNhYnc+2$*Br4Qc)hZ@q?=
zUx@zv9`W7&3){}&D|z#53!qH59&BIr<9~InqKKJF1W;dJ*W&jFh;pBvTpLF2S<QvH
dFc;pJ{RPMe+$h_O^AZ36002ovPDHLkV1g%PZdU*R

delta 917
zcmV;G18V&G37!X#7k@4Y00000#@K@7000AJNkl<Zc-rmN-A_|z0LO8&zhucScC#!o
zaW6MqOqOMtAttgIXEx_TwmCBh(^;HC9N-K~*rtOKmdr^yjsXPMx&{PB5tMCUDGVw_
z$7nrPO5ZHBg@Ux_yX1Lt!eZ2zJQ^<S=jQx!a+2@!T%Ap9kbh@3ZIE1egTu+*^}X<f
z%G^)sIHtyZ0f4S!H6s87-EQ|9>h2p}jbMuV83V{5Ya{}JfbqD)g^LLK`*BRxL#qI*
zKX%3te8~txb}}49m}OQi9R3CAbxhHBf6W54J7a?YELXUj5mxLoE`+K`nOgXE8X>al
zHj<%zu?oO+9e+quI!MVdQfS;z3YYbkwgS+xXR;h&anH#p0EvSQ@>F$>6E=hkwbo*J
zr~@OPsDv+mMzI%wl55#5NIPQ)%}#G6024jme=P6&GQD2|5bf-ENhNIQB0mhkcCLJY
zl#k>;Za)t|=}+FG5WtoF9Qor8fMf4cUPvK)uCx0sjek#X!k3{BZ?QWGBzFLnE+AYM
zqr?Y!`k4azjn5%|@Sj&(?r5!0{j>YUGYVlQ=Di87T?K{`&>e*Ar3OHELOL3##5)X`
z%b^>0*EC>$A~r+J0eCzSl^aXHgVYPWeK-vaCm_(S_0eY_Wt|}D*O8RNYyTg?h`ET)
zi6I%r`hQmnVI{e6F8oO0IK+7n1B@pXZmzC!B9*7OM_<j!R#?|=AWcpyhe@u1^q0ZC
zLf666uW8%-NR|_t7E=p*{>IduMVPmNlo=gLV+sd@vq_}TY%rKo3eSAohUwV=Ler%w
z1b<5~ZZi+ozpd5rd>eveN85$x97<t(V>6~LX@7*&2$I!P+cA1>385iF$u~&#21Si1
zh5dOtUmdyyKp}!*we|p@U(H{kV7eb+iJAjo?urW3!h@T2&V~`n5iA3VtpK=vuRvk=
zJd$-cm>P>v3y+<070&e_bpf#Q0t3|mEdO@Io!UHg8KL{lyR;zLwr4VJO5uuHj_yZK
zB!7LtfWagz?8MUZ=b{eS=Q=O?&aN09z?GNa^dK28F!b6or$&{+zI~^gj(^w0*hhdR
zwX_w`Y(LZ`hKm854o63Odf^RV@3H!$y9`1Fz&lm-hu=dbyv}7lBy&A{qaIHFi!cUK
r{3eq5)-;~`E#|_xa4!5*h5rLzRFDK3ISy4~00000NkvXXu0mjfBTlEH

diff --git a/tests/ref/math-delim-show-rule-3.png b/tests/ref/math-delim-show-rule-3.png
index c875f3b277bb95a67625150f1b46f4ebe5da5ace..70851bc52472c125bf5da83010e5ee60e6305fa9 100644
GIT binary patch
delta 858
zcmV-g1Eu`h2IK~i7k?@U0{{R3PyBBj0004@P)t-s|NsB-A;R)3#rcxqyu7^mnB)4a
z==!tj_>AE4Da7?%()WDZ`Jd(f=lS+`+WDL0{owcT@bIFdqUY!5y1Kggk>R$sw#muK
zY;0_*s;Zx#pM`~m>+9?H_xJhv`SbJh`uh6a-QD%|^}fEo=6~kq-rnAvoSeeK!j_hn
zh=_>2y}iT3!_Lmm#KgpNb8~lhcYl9>rlzL$cG>ur;`*!T`m*Zyi{J7n#A|D7WMpK3
zfPiUfY1r7<^z`)d^75ddpuxexc6N4<kdU69o}HbY^GD3{Ld)|%%JN3bf`Wp9fq{{c
zky=_>SXfv{NPkE)G&C|YGGSq1nwpyS_V)Yx`|j@UnVFf4jEr1dT$`Jl?Ck9C@9*j9
z>8-7;%F4?A{{D`Rj^E$ktgNie%*^fW?Ww7$)6>(}*VnhVw{C83w6wIfwY8|IsIs!M
z(b3WP`1s@F<Bg4t{r&w<Pfu!UYNe&6mzS5u#>S72kAK_S+nAV`<mBX0QBhr8U0+{c
zV`F1pUS8bX+~DBg`JCkb>-zbf<o)6I_H)_(?E3t^?f8S;1<!?i0004gNkl<Zc-rmM
zS5HDQ90l;>-g_^&hzrHN^(yYY74@QsDB>2b2!eYc!%r<GM8=a36cW?l!#}5eIZ4wN
z48t)0mw)47IFKapD=1t+1l8h_3{m&^6bRdUfv}2jvS(Dh&@5Jm7wZTTI6019X%%xC
z&5lE32q{iJBnm;?TJ*Gvc|q8<3j!A`R_lo(5F%fTs54t4k9rNn@exr>qHuj<L$rN}
zch<1t&5iYKDMG22mY1!dhu>nK3r)^15B|XO>3>9&x!kiea|u3)Wb|idW#<4n*;$zx
zznjxDvu+nC@OZy{O33Kz?dk5y%gaqkO-m>1Br?1n#72HTyMk0*UBmAZL4y*|Rs`dT
z0S4*l2oKajv$rqhWVMQ#YKegZMLV)dW5;ntrAoyQL#%ITY|?6Nb#jIDO+T*&J!TQ-
z##2s|>&C}0R9%I0bJKzLzP(u?c^8$SX-a-}+E7}C2|YJxu9RPx6pIUXWy`<~+7K5e
kWh>(2K*!!Y!!WV(12|??y44ae=l}o!07*qoM6N<$g46lzEC2ui

delta 848
zcmV-W1F!t#2HFOY7k?=T0{{R3$!Hz20004%P)t-s|NsB_qUP`zzxnz3o12^d{{HOj
z?CtICzP`S!tgPSP-;R!syu7@!va*GRh4=UO%F4>PxVYx#=8TMt+uPf%t*yt$$6Q=o
zn3$Nly1M7*=cA*eqN1X7baeRm_~PQ?mX?-#dwYn8h)76Czkk2KnwpyS_V)U!=>6LD
z!NI}I%*@Tr&1q?A^78W1($eto@Q;s=)z#JM>FHfvU7(<#@gTzbt?6N5VKOo@@gBir
zV`J;<>vwl|fPjE?b#?MK$kx`@)YR1SFUImX$oG5O{^<Gml;Zy4_x|Jf@;AuwF2(XS
z$M7D(o}Ql9*MHZFii+Xk;a^{0s;a8`uIce0!KbIEhlhvg=;&%{YQ@FH@9*!Xrl!-=
z)A8}~&d$#IsOS5??)Gli`IqDU-}d)_-2eFf{KfC{LCgI7{ELf=udlDs(a~5~SeKWV
zrKP3N(9n^Qky=_><KyE`Pft-%QRL+0`}_NFaB%bU^M8$vjrfw`{_Ohx>-zou{q^<r
z&(F`@-QD2e;MmyMnVFgH?(Q@+H2V7bM|hKt0004iNkl<Zc-rmOMN>ji90l;BJSi1X
z#16#n?(XhZYz66(?vT$dmtlr*<KjJ-k@s7iIses}xvL8ni^clCs_O=lje~^YrgmhR
zFqwm(oqz2sSt57I@{LTvah#npIULO#E+I&X@gbOFYB<K_N~*cMwBfQ+q6vi0Dr9On
zOi{HX6ctMiM}<TK2v^t-+F7jGPdx*oPe9a@N|kH%pj*gwW5^ip>YR=^kuGZ1=?q{_
z*p5Qr_25rDUeL__{`9OYikl+Q-SdHjkDhLFpMR53K0m#?LA$rt7gcfGB#DFlz1@w?
z&5iZ7<ymrHkWjt6z99#;x3+dr2z;OTg@YWp7a*Y=DYc9*`;AZ>9w8tMhRRS8z)Gv}
znim+84~nCK2QbHX<#Z{IPxSST()k65{OVO%htw1j%UhaT>ngyUDhV8l`w|D5d$Gt9
z!AW70)kyo*8abz`Z4^wB@@s;Zm0>hC#Fi`?{;gd`Nje|3Z9@<tFIp<a$d3^F9cHmu
aIr9UZO-Sa^E?i^)0000<MNUMnLSTZabM==1

diff --git a/tests/ref/math-mat-spread-2d.png b/tests/ref/math-mat-spread-2d.png
index 85cb4a6ad060498c9549f1c72957a8df96c90ca4..aac0cbcc9b74db394171b2a8b1b78ced402f3bf4 100644
GIT binary patch
delta 3384
zcmV-84af4o8oL^hB!2=)L_t(|+U=e9Q&d?N$NdN9=lyM}<_BvW$5?BXq1Ih<SaV);
z&Uwu_>zK2SIp>_$P@tj$0)l{|Ac!I=h)5D7=-bcCsk!y4!{c=~GB$I+MNzjem+t1<
z@11+@Ip1@rWN4HNDrpKd(VA!tO|&Lj6Rn|%)<kP)qALv1hkp(oGCaq_hYue;dZdZ=
z0PEJRGd#z=d-uY^!Zgv|5dHGy%k$^YpFMl_%a<?C%kuN{`B7qGq9)o`qK6J0%J=*C
z?{D3@)p=Q9U?2-FU%sq~_KE1^<m7(+`Z3^gZqlTQ%a!xy&C^8tO7!j9w}%ZICNov4
zRMA9#Euw>igMY<zfa=w&Yofmv(XU^>?%K60gY4|=_U+r-CptGbH!UsA@N+zS_N@Fi
z!_})-$Hc^}Sh0eu+j&_)KtS{6&4&*k9vvNRCi=;fCqY3$YT2hxpA4T-R8(ZW!1q^S
zD=IE7Ru6aV*io*2^otiSxT0MyD=8`Y{0H0-ot2d}YJb!y8K>+HjO@8ScJ!_<C9JnX
zPE>M4=he}Jf0c(kf8V}+E!OiUXU?1{<G4xtga0u%_fd*b8WQH8i0HEVVgJo}aj$ro
zmzT$$RPIE32zNv;UAi<RB!t1|{KAmN3m80Gd^+uXxM7Ks+ycHr{xx6CtX#R0&Dq`h
zF=NKSwSSBY-{m|Wzc(u^vGlv-eJ<ZK?>vEPnVB?cQha>8UlQHAb!#qs201Y=V@K@B
zxE`H$E)1?qzmbbe%tZ5q3l=PJx42oeX6A=Bi58?D3QAgiQO3uP9fM!LB)U<fMl#5b
ze2&pb-uS<_r$XcB9ru*z=g*%H95~S3VqV2NqJQ(Aq+&gIEqQqN?%i3lX89%2ty;B`
zE4nB%FRbly1}}cS{%Zd%2C~v7(Rc3LnLmHN7gsd)Js}~%aD{@G84;aU73buund8Tg
zZ{NQCParxoGxPA_!(z6a@!-LO4I4J#ncxz*BYN@T#i600GJZU9U+k!z_ggN({>m=@
z-G6uAxx3J!dTqGzw_(u(x5~__RjY2^ylJ?>=+UDI%g8u>&aqonCWf_MmT@D7hd7!)
z{P2U}3hWv8TP=<1voZ0PvobSz@?_q8c@r&X7JLTfDJ#exJ#E@F1{*hS<o&rL`oo70
zu%Ldc_(Pr=M@B}DA3xsWislRdL_U%}eSi8G?tx*MJ$tr{`4#zHevOBhE?ru_e7WHa
z^UBY^t^D}$<B%ak{xq*c9Z3`vgJZ{z6}#55WlMKN%O4;E=Z~tOpunbwYq8S$Rq!vZ
zeQ>k4T3A^4%@M6IWy+MJM~^C^<s|v$%^Snd!R7J|5slqsv5s|oU7{a9eth!eNq+{{
zu3gha`$Y8Bt5>nVL^Ig9%nKxP^y7~|R;^m~r=NbpSZktn&QKGriPl7y6Vdzj?K3<F
z2StL{nrID8v?f|Z6RnBXL~CfGHPITHXic;xT0;~4S0tL6A5Viy85tSt*RR(^+a+35
z5M8=-5y=b4$;q*)@FWF8`GqFhE`P{crKYAT&C0D?x5ycC!8)%zapDB}AalLjk|j&f
z1Zkp6M_gPS;!h>R9ye|r1E`!jb*jttg9i^5Wwg2*MvNGti7p+8l2k3*#fulwx(R)4
z+qShPTA^FFZiqTG(N;it)VOhD^>F|G{R<Z^WRRYo-k?DPn?xhj+q7wuCV$!rXU?2i
zv}lofc;(6!1gs*a@6n@&O`_kwe~*Gz6K#cM%a)l-z_9>Ql11h0&Ye3ASLolrKY2oj
z$;y>0J9s9iPMtFR8OZ)95H2&KVa=g-fvXiM=79qTT&{;cJ{#QUr%#{Cj4G5fo9SJ<
zcA1rf2M->UL2=ecRMI&QlYdKBI2M(B2ua8Yh*g3|43y2L0Vtp;<0#6=F-k*zQd-Kc
zfUNt^lw^`yT>Uicca#m$_3G85RMzkr?3|P|%NUBq94S4*nl)==j3_<*(u430EAyVd
zHY}0-ASq$dseAQishN=@N3wG;aCZe9IdVkC2@6h!Hd{oMicuO~Y=6F*emU~dxII)5
z$qeO5W(g~@;Ibk5`|rO;<z@Jc0Rsk{J9kdTH*VZuQ&m42G-!}G>4j-oNbMQCJsXy|
z;=C=<Nd4L7{lh|e(ym=Q^GWK-)Pq8_9Z;TyE?vgEckiYE!2ISp$9<zjBQZALaZ*q&
zg+npJwo?lC=443R<bMO65}lNkB#LpD5Z}o=q969#oE?#*iaF-YnWKKhtw~XVpAn7e
zjQr1fr1t4oA~6e|5{<L}HHdyX`{?VVcg=NRbLY-2C!#S@7AkyfI;A-FO$Y3}di6@i
z6aqna^q{S5bTUKngiC4u=Yk^c=%89t`7Sfah%I7RR8y<x$$w8yrz$k{U=XEBQeEq=
zFq8^7N^E$Ef*0>(249OXL)n{-x^?SP3E~jV;2MmLjdfm3DK8b4?8_}$v>@8&U?RDS
zU2cX{4e?tt{uuu{Zpy(oCxTV<s%Fiau4|7|GuhMROJ+FezkB!2;y{4cp=x#I7e55Y
z^N>(X)22-gSAW3ekd-NW0%fLm@7{bcWxpBHngjX1^^rt@VpzE}aQ>vMSD{v|TCnEM
zy>sW8;UjYS+pK4y?9zITlzKRWPdYq2+^~dl?>In|y?ZBhYJ{O}5{<>c2uM{vzi627
z^Upu)1B(?XlAs3ICeZ@!-_D&oiyc=16YfoY1h)b^A%9gA_KC)R5p|-3O<ZFYisDG3
ziME2AxKx-_osJ?RB3v3u7Gr<0(G+y5`R?7j>o95Qh>D6bTMumO+O=ypZ{F+>&5-6a
zOaA~Hqskmkm@q*H{%wKA7gz(sE5I^&8BMe;ynXvtjzeB_*`xqpCucnXyPuqh>;w0M
zkg1j%Xnz5XCR!7%p^4T+Yoav;-w@FpwI#gizaY$OC(4ST(C`G%BB~0XiB^52{2XNY
z_UzdsV~c)b5+?Hq#3A6?SEA`4Pgh;Oo7FSY4%HWk2Gs(YnVDQ)W&0{bxGZ=ixJYhW
z-NA(R5hl2N4<wt2^GF*`0nJ|sSo%aXflb0m4u4`AA(}RQ;q8|5mHYUWVF_BBp&+<j
z^}og0`7%RSR>_UI1GyrVa0>qCJUhAr<O$*JS3KypmM(=#m`M=aoRQ#Z-Kn`%N*Bry
zD9cT-ZQC}NYJ3(WL^02ldit$oZL<j8I~Z%#Gm*clFg^QY!kehRo9sx6!rJ_zI@@tM
zNPovWm$-1@g6f(0xv&@^5=m&o5|XHu0WAboXFhb<<~4NVbIx;$NQ&f!`Wp#>$-PUG
z({KfBsSvHeN<K(0i6&$1(0>nY3YuLR-)k@@D?E`F!3+!=P(%wXvMp$?%~sDQ(E<|H
z5gk{m{BN5!Z447)Vq%CvnrD>QK_!DoO@E2#n;DYAHi<@=&-LLY(In@U5=^y?B!j8c
z6vzS4yLd;mg|f6)uU-VTy&$?I?-N3@f|Lx4SE*mWJ|BQXq)d82s-|50nUYs(*s!5Z
zqS1A9?AXyuqDfji%xu}RMd|y({=E!E1nLM>MXD+QZLT%Z?s~HdRQ8^Xfjgoxh=0x^
z6EQN8J=SrDnbXxBI&^SY#@?>1hq4=7kLJA&{fQJdAeyyFwER;EZ-~azfN1B;Kg}6s
zoEa1ccQjO`DY49S>eT7__3MT!poY0wc|4uW(TK_|JY&WT!wqm|$)L;l?dj0a=8NzA
zefqN{r<KUW<$r@p-f-n^of&Y=7k{Kn%RO^0P4(M8efqS+=PE)v1xlOP37L1fW8;vJ
zLFIYW+fZ6ri^NDJi`<pVvI%x%cdb5Y>TlC0n>cYInonybiStv5-IRA_2V9TNaw<{~
z%0p1sxVnMNUaY77CHsMeLtV*2Vjy0QeTXmlRly%G7S?NE`jjW9EM!VbihtoVpvxjF
zQpqC!BpY-E16~uii+P5QlV#GE7P=r!6RnB<OB1bZS%m|8k3(r`ojP@tccEGZqZ*V+
zXW-0ma6^dhuqQzmhaHcJ#&<z?Yg9O_{T=3+o;`cwP&#<Ad>GE2GC;p6jwvea>C>mn
zr25|wd_o=*&E`&1Vxz(V&wtXP=QYtALU(qKB%+?+bR*t0Cs@OT8Z~MVobr%prLwJX
zz-y+?#XLhe6iK{Iq7^u`bEq-T)UI9I%Og0O2B&JHVgWiFP9nr}s8hF3v}op)Iac8+
zE^x1iR<%bJ2$ZEtakT@82W4et*(4fTq`cM4HBZZ=mqbed&!|9vK7V#ImjPi_Yc2Md
zgFeAh=b#FagKE{PNmqRdb}NhIQ-*~iwZOnY!~Y@aF>+20lNSH0&pvSY_U_&56VaG6
z{BWu5@^`R(SyTfC1O!+V8d-NhqQwJ5`9!pYw5gNeiTvGtmfVm9h>m*NA0Jvcr$ABJ
z=sGAxk<h6Bf-{JB%Q370Es&#?N?H=8iPq3WYoawY(VA#Yw1y_yukn9Y-3-S6`huDO
O0000<MNUMnLSTX(E1=c@

delta 3388
zcmV-C4a4%g8owHlB!31;L_t(|+U=d!b5utb#{Dns!@l~#Wy%;Q?8R$f%dCwF-X&wA
z4VVH9H~<EdgUQL{Y{2B4bH-#4LJ1H;fIujLkPt!=3MkS0E4ud7t<jx3cV;BnBllNR
zs-D)JaKGEP`}8^AIrEA#s203pC@@4Dq74kuhG;{yfg#!uZGT{ht^q{H#>QU1eqH&G
zO`A3uqWvH`JUsmJ<;%){%%4Bs5FH57rKP3&_wV1ibLXQ+k5mP`c<~}GE^gnxeTL{@
ziJmoUR(yOsg!bvvM^(VBTemiB*zon&UmK!>CAv|gM!KhS=gzi+`sU4>hUiKl`i(c<
z&^@q8ry;tkh<|?Tt+#Z~S6_XF9b$;CDxyF8?6abxA{s4Qw#>`R3xMdmckimu2WL^W
zL|?jeY3<szQBhGp|NOJ6fW*YaF=NJj@WBTd9^QyvxpJklproWk1qTcv7H8!h{Fh@?
za40S=_Be|wx1$RR3hv#zr|eK(US3vK#$Qg%4bj`SZGXd9RB%yR7Ta${OqT@@HlA0$
zkh1(_c;iXw+rwz<YrlB$V&xt4=FN+YjHFSRlo{P=USykDzAs*0VO0A$92`G%1K*9F
zUAuPe-o3lJi1r`OM7L?vMi0jH9bt*HU|fYY8ed-QWAv3|<vrMNE_ul@>1o@xEmzmu
zc>m&yFMo8qys)^e;Q6HnW0fzwC@Cw;e@-KA!0ODyF?tN~DIrPplP6EQbm^kocgAhw
ze6oIzz1DMS!JUW77Z~_fqJQ||2TXWx&VwOChA0b!Xg7%NFt;!<L$|qLxw*NaM>G@t
zPe1*n+qXt;&e#``yzKb(KFgooO!JrM88c=aJ%4&s+2O!}19Rrg35@8Z#YdAC9+9U5
z2M)y03O%B;va)1Er>y)vb<JrSSDH^Pdsal_*|TR49z1YK^nd{a*sm%(K#jwQe){xj
zMn;DHM{K^peWu$oqH}U`s)=Y8-z!(H?AWnG*@5q|eEIT;6DMN*xS69{w{EQ)r8xyx
zntx5b(SPNw5u0=m?vx%qdMG=jtvwU=uW=XuIhs{b=4cjSWe2PpnWKv{bFX$=bn@?g
z_^U7H!i5V*jvT2f;Q52><A3YLVLYCkiPLkmeB0_E8U~?2EM*T28#b)4u<+r-hp)Z%
znj4}wZ{B?H;6Zs>`ZQnKoImD-cYCdjhkq)6p}*UL1q+mS%$_|vIyzdnd6j<92EBUq
zvbTt>N4{LH_w3oj@Tw-FZMP&=U_>V;C)0TK)mO8#v)$OyTo`4C%*;&X4$q%I7n8%A
z(aAAEeu{k0Kb~koL_|dU_U*lmXfY2$8l1%+Of&}2_uqe?pPz4h9aTs)D-X=FV1F_v
zVkR4+11CBmAz{?0Q6GNzAxomFfPVe@)v8siPMtchzy7)z(I#eSh&DtUqN|DMYcHYv
z$GUav4ADlZWQaCI8yKPu(S~S4fg#!uZD5EtL>r<F4AFmGqH!wu>mfq9L44W}?FZ4Q
zOi)LNcEV1uYcCLuiHTXZY?&e2Eq{nnp&JsJ#M!fF$B!S+fK?TM_@POYCZr5W&(x_?
z34j@*eFL@Cv}w~sfQ<x=22>6oK3v(MckkW^v8;DP|Ni|A(Z2EBci)L18e!3d2@^DZ
zi2mIW4LWx0hz!9H?F3|ipMLtOJYBzj{iI2gw8p1l!-g)2M*4+T+z{;qG=FE4Cr_5A
zM~)mp_eBHg7a4FaiALk`$tRx}qMa~(`gChPH#5LD-+V)Zl!)Jc`%T#ad5wq)1?W9I
zEEAFyR49X_sl9vmRvOW;cJACc55@7JLx;$aRd#?rt_|k%?c2AN1@FA`j&+(|wQ7|$
z{bu9FjiTR8TYon1T9TXWhkvJ+6S7X-5QQldl*<YLMJZVs`y)xwP`-fNKXuiqoGW)F
ze}`M#sxkzXLv;Q6^^=m4RM24ML|82uPS)uNdG6e~b9FnS<;=`O(d6^w-+rhZksF<u
zFnQOd`eUT$+i$;hP=_)Cwrts=+X)kQhBuj<eZjX-5xF}#A8`ZMB!5iUp?kV_@6K43
z1ICUWTRB7{z(stof=17tJtZgZ<jIpPsx(BTtc~>IjGU-;vuQlq8*%TK{mK_azAx*C
zgN&qAt5(*X)UDwgg=nA1k55C9uG_0uuin0WyY<VnkNcAnjkwr)$2D%;SU2)wQ)2tB
zi0Qf@edlHJ&io~sEPqE`3cwa(I|V@WwH`}yqY`!d!i5Xt#*LGIaciceq=XpJOr4|}
zBC^js62r9MFVPtLRYCOav0EQ*y(mx5pFdABYc&zgB;}B%%AAhK-u=`8J85ZYx_$ZI
z6QKKguVpNBx~E&WZnoLA<wYgj(dX+9=dbQLeE6_~4~q;Gd4C@=JFoZtm5ig3?0lUw
zz|5=ckT~by&B5#Vh@#}jx(8beH$&x59Up!4(f#}PJ-iu=!5cSj*k(^s(1UfkS+iy$
zA(JVRQEa;yBJAT;x=oT{{IHGWcZ&Dwz4zXuVVlpxnx-GRhmHQ@$B!L01Y&ihu0E|_
z_%!T})*_SRu7B)+$)S%VX-ujOaA7KcF(ftW%$YOJTM_|6NIf(#{`&Uqt1PHnw=S%C
zGw-}vX4r@ff8_$)NhCZgM{M1?)tiJ<=P>&O<{cY|DlzY-Oqqfk+9lD<7<v*Qhmsd6
z3#dO~HY`p+*-ze}8=?i=za$IsJ**BB?oG1=cLFP6^MB^e-4o6Hh1ZE>AxvYdD~c_N
zA=(GnafzE$c1L7#+fI}m%>2t7y=c)Q>F?C3lW~*!#?`A=t+NMnD-|%7ELkGn3;{W_
z)BX<@Mu{B$_~Vbp@$U-MX^_-Ge*w$HWem}-K;<>ILxGjdB(dEDXZ--HpX`WS0`mix
zsgWBP0e_7l+7NAEh&DtUq74OqBBI%9i+eLfft%NjmlZ*w@(0j@sv=mTMGHD;&>$7!
zAj-F9%^Kwhs^$dnBL?^(;5t~MDc97YLkIp^)ic3YQ`H(&2T=8j@m0B>f``k2N1Thq
zw&f1SwU02t_B#-4!q0<B%UW^|hh<Pi<JiQV<bNTi(M0D&+>2~AlZVf$i!aK`Q4pM~
zGo&=PQ1^@;Jz8R8wjfp{0Vhh8y3rjVPl#;&OLWJ1$-kZuVJ1#+Yea&#^`_>QkS>%V
zP}VmA1^jH)_#BK7#oEK}H*li4o>J*cF16N?0?vwJeFX{WSGzBEBPoh#F+*zFF&wy0
zX@7XDaJgc|3f-m}EJ7rL(8?DG)au6B+Jki?EG!INwz6Qvh!M7NPDD}!H{={~f$4jf
zAg8hebEyz5;ZQDQfJ76qo;h=-M~M?D26(CAxSYs)&*D;PC>Ic-H5{TXXs)fZo)GN@
z1gfLj&XV|Vixw?Bs=?xeR050GL4rYqrhl~Pn;wF~E{R5&&-e(CXoB+|O0c0rhZ4aQ
zH3f12^e%xB?Vv3E^2;xAY6n0xRfrLi6{Ti5d`g1`4Y&Xvo-*VN^7PoTW1OarD}DU&
z$1aIR*FnwB0Es4O?a{Mz=~B`6Mf`U<iU`yZsEQ;j0Bx>IqRG8bUO@Doh=DhvnST&%
z)jUixF`egghgrkb6sPt$jI~{651BU@kJhyg{fSO&Ks4);Xi&R$?Ldge(tzlSk$*~$
z>UQ?|c({xB&-C1w`?{xHyLKl|oKSW^4RfZ}APS755!JUa1>KYvV9ZJt;zzr~!<$aI
z@Q;yqr|uS!iDbuELGj^>^+v%p4}VCf=lJpC5=#?MMOmtv%XQU4IsvIotc3L2uGknP
zL{NDj`5K~?B{1SQ(HI-HX%no-j1*;urcIl=w8;h!9*pMGSxI91R?M67t$c#<SW!+z
z2tq6b8RK#TS*=)q?Mv1JmKMK>W)+50<qyP`tU7S=GQ$Q2rarOcWQI&lO@CEE1G<Qc
z_)RqNCt09t60n*)YEn~lGCe(A1r6weG()r@`Y%ni%w;tWtUVs7rS<C76YD~138Na6
zP7h$ruyI3(?y)987n>cwiN<z8cdKd~=DmcnpljEz;vE$$mWyFq^&b7EHcU}rd;BuM
z=bwMh74n;C7WX&bd{fmpV1HR6R#z6_y}@<ob4w!X33fNynq~*9EO__bcX3YnNwlbJ
zYaFne$#YQ_;0{F+?~-T%yLL7;%7XXbe?P!2IEx0mYE`oU9UeOo{5j;Q`$aUGd6|yI
zUBv(oh-k?@szD$vRVP<_0DllaALEi}Xwm7dR<3zlIs+kE9C)e*0e|{f&1@aQl54H!
zUpD$UODj56@EpAT_S;y5EMPdhtus<k5f+lvPM<!lY6J+65p(kPD=m_e6#y{!_<_fu
zh-Ny&4wu}nkOs?_LpI>4Q>PpfjhrhWQQ`rj0w-Er+T=;_Mxky#>)4P3@QzA;l}qT~
z?1rMs(RGlDBCgR81vPt+N<2&eEs$fBN=6c9h&C`p8=?&i(S~S4w1FWyr13xJ(hQpS
Se;Z@~0000<MNUMnLSTZ;WRqV2

diff --git a/tests/ref/math-spacing-kept-spaces.png b/tests/ref/math-spacing-kept-spaces.png
index bb433d4fc5e46ac6ee1f17263cfb9870adaac05b..0f638c21092408099055358d002ae757d832c2a2 100644
GIT binary patch
delta 1169
zcmV;C1aABE2ABzu7k@(t00000a<ZOa000DENkl<Zc-rmOSxgjn9Kdnk`&?hDX&>6e
zO46iPqJ3ygMdJxQmDEbAU~3P-ltTq6wuq&%a<oN`<&;YnfdX=D5wXZ2$h9E1pu5~q
zC@dfgyF1_3nXqgc+86)CX!iT|-`^ykWHa-dS;J#$jUBebc7OP3gLP(TG$B`uHR;~+
z`OjX&!*L!l3>KnP)5=mFpLC(op>)Y89(FWZ_<^N@L1}K!0-OV-=}6&lo<ljNqhQV~
zD$NJq3FH>f?CPK{7KSg^WLJTkaJbzAdV}H0;=cM2NUTIDG8f{iA&rgt1aOx`!|4g2
zjRJ`+0Kb)>bbq7|!aG3fcLne?iiUj~V8j<%?z>P8;f;&{;0R<Cv(S|kJ>3Sbh=!dP
z0Z(vG3P>IT9}{jj0kab@@DqB^sB`fa@DvQ|?tBf9Folxo7Z~e@s<H%tP*7^q2!?NX
z-jls#l+*^e1w;f|0D8-jGbgRq%A7JGH;y&i^R&tSl7Dz)xTq7kF#!6nAUB+425cw5
zoO((i9B4pJ#jINc^Zv*cUBg<ea$OoyidG;T$`Z`JN$atw>)-H?rBEgqwrGtq?AUFx
zg(tdfVdt(X(eMMecIPHkv~AIUVFQ;2m%g_QTO8Uw9teg*64|wgil}T}Gh1Qvt0t}2
zGF*QW_kY`h;l29#JwvECet+a`tZ?7^gcl51;nXZ%pA`&WXpA|mMnz_YS2Llo-S`le
zj&|-=^;+T1*q_x1hUqZ&NT{IOARkK&4`JpzjXJC_gTsi1l~mTFX2r(|1j9jfw%@f~
z-XH-@-<tv331INk*<TV*ENlV5oY=O)?@HQ)ReymU^#J%(0Jiz$fzs?dqG8*18~Ly5
zPKkzdl0t6W-85cblA64@p)>-y`1HV5VCDnOWJ=+80OwC$suc=%xZq#Kr(<EkgRPZ*
zd^8SF_6@FjfXKp|huc~J-kt0@A`}kDWaq*^@I?Afbwmjc3jl|z*(xdUtmZ%fzz#A_
z3x9<ps=Bx5aB%p9!E`pcz9@)%J$UOY59Y|z{J44o0gmzEuuyoepyqOW_l2DD63wKs
zAQy^rVIsdNsSo%o;$l;YrVpSs^X@7ykOBQ;+FbqiUHw$TI*=p@B~zPmVZnBUGF@)8
z4}%c6WivB@&nHHG-T}tbVHIbcW<lw?6Mq27&&0%eUPZ3qm^$}cKOu1FdeFZGu^%IC
zyA38sP%`<yiQIZ<eF1=~y=M3|O9Y%Z^sEfe?awCiOMo&^N*i6b1Y3em0Z1FVftGOr
z@Jt#T$I!og_2OqeY|~)Va2{(V1ujTC^anumE5dHB=$Lqi7WuEP-NcInKm{nBkAI6_
zH>$ue|J)Ri>jF?A0B$aa0~#5=^%8Es!&EekT7c_X*s5KE4QmI1!OcL1?$P1OU6r)&
z_Z|=08W(n=gUPSLQ`JCl3KZ{XrQYd`1SGu?743Bmfc)bL$#+&`fk*(DoB#I;;jpy^
jvwc_FVLNPxSL|;R{Z)TCnv$Xb015yANkvXXu0mjf(^oPQ

delta 874
zcmV-w1C{)k3G@b#7k@Pf00000ugP${0009!Nkl<Zc-rmO=}!}B0LO9voXzrTci-%*
zjoBq;J$CVqiAq#3(L||H!IR*HVmzxslwv6!C{;lr)Hao1ltZzC6$=yv?I4tZAXJc{
zGo7!<z|eTS@*zgk@4MejlTXrQo|zeZr)I?97#xFtHaMU{y?+7#4>8hSPVF~sh==o1
z&e2(pUTq_jrL6Gd3ZQpE77xeE5e^wElZl4sjl#jnHJB|Nz7<!AvJTWDhr1Ng`T!uj
zXHGM9xe&Zsd!rhXgu_iK(3T0;!%IC`kY9yfb_wLwz-4}wtdOjUh6}CW%>j*>05_fJ
zt!;;s&7gH80)Lof(Qw*h=uU&Dua;3WX4TUTKs<2eHlu#q*+Cy9A{tHz113ner5AKT
zszTCzK>Z(heH6)*bMSlwOoHLSvkd^&0rZs9(9;3c6;^=bOyqM3hVPnQj(Y{@*+cLE
zFlR&n+A0A+wN2NNIiLVQFGkUOP>H=Hz8QA306-4_9e>yL6}+Yb(RYAh`+z_=BLn~z
zhLRpLvP)l%I~e8azq^cf(JK%>&Lqszeq%cPpTdXTP$3wOc;#_8zEz2a`~1;xf`33X
z{648Ep#clNnbP_w*q!NKFa<~Ano`~ihO_dS6UIW$4SrV*Sp7}$Zkd8T+ev;T82(Qh
znb(DdO@FVt|H6RV7jm+!%YZLk<BuW1@Ui-HYwTDky0_)Y*kqRc5!TkV%(b)`a7*qf
zJAz@F<>wj}Xbp`|cjzO`NQ)f6fawe(8rHKI)Ahy22?WFY>!QDF{aZl;8uqC`^c^6y
zGZ1@8{IGBY05#wD+4af1)@gy`B>+<IeR4hZ7Jm~B{XLz3^<0^+RkuSlTx`p_`{K`D
zkMmMN_!qYs0L~X?Gy?Ayx%w}b?*%xr{lY_`aPu;DRkNz+L}q7W)lQc50#s}!Q3A*=
zzrV)!6kvY;^R+_Z^de@Dj=_C}v+ZUlaiajMYxqag;UU-Zbbx=kvRf!@u5O)G%*x=l
zkYjS7z~k6YsRUc4s+Gk6=F&V582}qu925!<m(^ZvYCTq5>2&qWWhHRC1o}!FZ0*2X
z^O**xs~w=R=*2W2Ag`tGbaHjX&gvK(gMSG40~bgbur*__T>t<807*qoM6N<$g8I6p
AoB#j-

diff --git a/tests/ref/math-stretch-horizontal-attach.png b/tests/ref/math-stretch-horizontal-attach.png
index 179281a5afbdb2f3843c024fd101c1908c68003e..7d45f0167bca86f8260785e881b2f67a60ec645a 100644
GIT binary patch
delta 2239
zcmV;w2tfD65z7&fB!7}gL_t(|+U?irPaO9hfbsqXecKmNR4Izo7p+pYQlh>}6h*C?
zR&C;>j#D2>Bb>u^t|r(V=2*ZUz+f<7W6Z)DFo!W`Vlc~^%Yb148+MnQaNoBv#~$qQ
zbY`@uLV%s!Y>-{;=c^fJ=eM(Zv=XD)pYbgCnYYqg`Ak*b-GAE4%$wZBWzK8rLG}oH
zqlYUOumg)=11sN7v4F(R)(*QJ96Z+I)`vL2O0s+i*Z}Mf9AE*v`<1pM8*f)DEC)$w
zzN=~|_#%Jx!}$X%-{=Zc!SZh9$(nFSV$@PxYF0aYoBGetTb1eKpUtOctjA;-{@FI{
z|G-CgC0myR<9~0}o=|5PN+UMkc@SlGvl0b<1fY22)6sGQk|)*`T&o<6RF|2-k5dF}
zW<=eus$M@0Jn2L7)2pjf;mj%uPSxSlp#e@yA2ODIoB#@I+^n=78-1_u(1L=vuAX?^
z{hF-dqf15~dNQ?}Y#!=4*n6n?d~#@2;*DnZHg|OFy?^e*HpNoBeomnuzF0AN)KQa0
zUQ-*)z1MrN>&T^=f2&Wohnw82#AGvD%)0Yn0wZiV%yw*GwF4%LxMnlj?RPY09>XSm
zh^gy5SipqCY&C%mOn|r|uCa>4&-f$nL^?f>Rb9iARZsFbn|TBO$M?(4d>yW^0t}?!
zNjArmDu0tlaK*|6z!+i2lP0e2Uip2DYy;v<xFn$gmQwJn$OljOE|=p4K{z7_f%5*$
z*0H}JoDu}TvqDg)5EdW^zTyi(2oZ$vU(7+JculAvi031M1R+=u!o&qZPzZwbGF)B>
zmCuH4y)i6AUR20$43jSkIxCzDl-GlwTYc<z>3_1beRy8bsAvDjms9Y((OmYd>}+`k
z?nL&lVxNJ^Tm7Ft{goqerEfm<m6I2-y=r^fE4y2nsT=eDI`dX~E4`J^PNlh-Emn3K
zn8wM*4v#w6b=C8g_G37u)}*sTh6ZHqMR5zToyiAeo5>YLKWXKPf0Gu;bR@^w!FMXh
zf`8<5T9mMzKBZcZq%oi4KWSyz`-5GE;^N}+);Nx`!=E#|&BdaT_tC||b_t)24>pU7
zwKqyR^5ZHU%Ea`HQD8gu&BRFnzn17BxpFm-uaQ(HTvhdhY}xmV0h3%Av{HQ=C-dc$
zyN$q!+XX{%W#1+FT3c?0DBJEvCEtF;>VNCwY_s}_9^)Hpz%8<!YYpmNB$gL!^M^{1
z4R^OzAzP>{Vawq~PE`Z9teFeQ?v%~|<weG0#jBs=PUY!5_+tgz_*4NW3)xNmVfd(o
zy-oiWG)8tRgBKs6ajWu`?wPc&02(xsKA`Wn0B`5Rnx<G&peYomKvSYw1c(UKCVxi&
zCh=sh=7uJ>;$~r4t|m`>QKVS|9KU%jb`xaH8c8Qkqb~#QRIa{or)C<-fI%_?q<;qR
z{1{jaErw=!nhdRm4S+Wqx(>_$Ht}SGG`c2jyL@2K8ss`-@oOrO4H_g<IA!{}Sy}M`
zPB)a2CLkvW6E{x+OUgLqd1Z_;R)5^$m6O2ci*Qf_tcwe0m4fnIa%4=>S>-u#VwKCl
zcc2ahS+P=5htr3*+^jr#6{qzTi3M1AtGqhlQ!BvA^2(w(OX4iAH~{rQ_{04c<fR39
z7MC8%f5a0&-`^d^<5M8pSdo}PX8h%XdzJUHGEM9-9-n>EQVX&*Fk5jTn}5vA97dZr
z&6YKJbHEmT-^KU|oYrBDt=0aF>lrJay{kX}$_&VI;HH&(?9R}Ir4ao(yUKxV?Ao8~
zX`^cvr^eKq=`{DThsXlO`ob-CS91M&iKB9MKc3uj?@m6vp2r@_R&(h5h~1fri_OD{
zE&EYfcn!YnU=P;7UIrrv*?(P5E_~d#AC>E!P(H+7nqa=f!tN#}p?K2!tnRJ!R(dO4
zudISQ(1`1oH5#ekugctkf$OZ|s>0rZ4A$-YRXK6x+Q3L$IWAg@{jPpFC2hYd$;koV
zSzMKq3+H-0UD@9|z+CSrJ2X~<?>%6<`QC1r?OkLKJp~Y0%kCWAJ%39py<N7oo^jVI
z^MBRP@PTfAsHtCPK;?%sxWn#$U}^q$i7Xv9xK^2Q8qB%;a7W4@)q#78KEe8u8iO9!
zD*sguwIhJ#d~jqylz((!bWn6~bcj5`;_;bi|Hy!|!J%OxLIOZg63u#m@1w(`713eN
z34g*wL>qv*e^B~y4u9FWSoz{Aq$8P|nw{7-<NrIJnVO!Snq34)`+8G_#5y}E&eYca
ziDLmeUtg>WPtwf0SULN9a3ld(t|g_#r^l-<suEO*;v`9X@i<;3p1qoM`N}0_HbC_|
zSw<wIsw=9?&PjHTc(h~WbK-mZf$5iSaM`a27b{J#LS{b_Lw}o2tJmtA_1bOIES+g@
zz5k%CqX%I4xf*0^`Zj&*wrP{LJ@*d*%g?*Wd)ex0B_$V>9Z0O|lG_CpH`N8|LU}6^
zH)#r_DJw4huJm>lfb|=Y&8bV(CC(|8r)2LDS0?}>q4my>yQ@2Ji(@~ZHr9g6RLMaD
zY!iH8^v%(h7=K{7sWhKmSVPLPqA%66O@iOd-@5yP0m~h2f+s8e?_<r%)sDjm1G8%b
zGpoSFm;B}X2Sz4rvvY&l>>}Y7q}P=V!3ZO>YrTuh!1^(K>W8M8u`Et*#CWpuPevg3
zTKGozvMNHQJK7ll@a|AaR0C-viJez=ul!&LsEfQbCV#A4NsDj&<eneE(dqIp8z^l{
zSP1oOWq=Oqayu{1AL-~)jS)aV?^Oe_(HywPr|r%2dsHS?Ky95SU-v<Wu0l(QHDK&&
zGdW-JZau!u4JbTYxu#H8K8z|k)mVJ5GrZjBqdPtWj9esW9c{U`QK61v7uK-y+6h%^
zO!4iyjyRNS_7kngM}XB3E{xM#(Aa;n{cG><9&e?$(p%}R^j1E-{tIeIVikydn=JqU
N002ovPDHLkV1nfUZ3O@T

delta 2233
zcmV;q2uAnI5ycUZB!7%aL_t(|+U?i*Z<F^O!14YE`)xl=+E#5-wI8OfnkH@2e&{r5
z)vBs$3!}8qmUW?}bUl_*LISx74>2L(asuRlkk}z1V3I%%2b`nMVaR1dE*dAcli(a2
zNlfA^w%>dFEGP=tP`fTFtzREK*4NM1&!e{@<&pgiPlIP7m4A`Sr>e4<l~-`MXeKx-
zmwyS8c|0v)uDpc@xD9StqVguU0Pt}C1&;^3Jkss^H}S#}Inokv19-f6!3mzwE8QCx
zU(+Nz*Kw%5`GmIo(=zLOGq2BW)1S=+=UVlD8dAN7)9+;E7IhQY&FGO=)dgc8&*T;^
zWEAzj)iD~|6@R5as?aN8?A6Atb%nhZyIpI#(j6gIlFSa`NS=@Cxv~{<#ut(~sW$Ab
zyXb%&Y$wiDnBI9=vk(J3?j~gg8ci<jvXad9CZc-kff(OS%w?O2<7`8Sl}qoK-WXbc
zE19gmfdl%^hN988@7SUkIHhypT0gLEaDDr}oTST#OMlx5Z2E2U8~q#H$#)K1n@+wq
zda!olZEr(9r`tMU`i;SLeH-NsAJxTlr`kiT#O`)D9r}G>2OBJU9Uk1U<N@qXanEh@
zcrMjDATYP@CicF4-~>Bf$C4e~U<bq<aStor9ky@yB+_5wku(iFo@Rnaah?9^d;Glg
zRO$(a2Y+BJpK$U%w({5@!I(V+I1-(N)7T0BmBSg5MaWztDEm9$c0S>i+UK`&#Y~1E
z2)hJfr}Vn({yJ6=whO|JG$B4oNQo1KFT^*3kSGYde>@FU;x$Qv5GTHk7lZ^sND+io
zK}Z$^-`iAaCrLV+a{q%ViPC1W^uZMAqWCmn&woy7Kk+BlNB%8?mVS-!OS%!>|M9zW
z!q0q)fR#gCPr;MO`&s5wP+8r-^}Am=mT~^2?|kJ<Hr~H}=PUJJGEp-U`E?elj8sM{
zpPowBH6F!0LtqPoPpWe1EtVCki+D&uEl94H9lZNc<-b7U&b?6etyWrNI=cXv5_q47
z#D7edy8!r<D+N5DFIzhRKwByAf2)->?+$hMs#L1#t66O1AulU>>?)D*P4pQ&K)%f|
z&@OH^mR7Lwn^k&?@(N0)c~H}t>=}T##!RDBITuef0GIOe%f>)5``IU>|F4X*Hde80
zDgW429kBJ>d81U>pF=d@sVo<%JRww~dVi0Z7c8u@`0*9){e2NQ$4Mg+O<gYl&YwF?
zYcC=(Tx(S$nXD=2zD*XQ>w$C5f+-}`=f{A$;#(V(Q(Fk7GFAcqsAiR|HNZzI{Aqm?
zww@s{%PUZ`z{4uwxjAY>s{HfFykd(7=xp&B1%`hEu;w(_TGTBy;?#;qeajrco`0m?
z{GEVPJXzIpq2)qzbzMW1w5)5f0iNex%2@)5zQt#lW#hjGLaAJMw({Z#0D7H|894b7
zz|Tg(uG8r1b(f@R(9Hw9sJ{C84B!$^)%vEjUZa&3y30B{fK~CQB9L6y`HZlvI6A~i
z^*b!9RQhxR#R<5n*bK}nk14ao$$t@#T%`qA`X#Ja0}JA*1ImNSgQpH>pUCnp#81rv
zwV+M_NsZE{jb)oFLah96F3WCPd=`M|S1;A&ML7VE#cVNJOui9UOMqq_{84&_iW?)A
zQOoE}qiJH)w-7($h2b^0J}`mgj>X3c68A6egjU&dJkQQU4C#t3OIncF!GGmu*+ky)
zQJNKFu(FE{R&@7dWsI=0yRvyB_jvwXc%SOe{$&CrN+@@t#lN0GTxaN6z%L~z@U*ca
zyp<heENd<}Q$WWE0qiYLwa%*X@0?PpqTyB$l_4u>G0zq&2%vI7iT(rpTdb(C8RTtG
zqO!aYqV)veOuCM7&nW&Wm4C2h_(@b+yW#v-1kwnT<#zltnxNDi`K}(Rj8sM{gRg9a
z252Gp%XBuhPpVQmF;R@2V4WG8IE8~JRcShOY`~ORLy+c$a?RY)f+tmpQVBbz2$r%0
zWCP)@93LBJ*6gRINe!QU$%E$1M!0L9CxG75uw6p{MzeL%Z1mVo(|^HL7X3=k(92zX
zUB+J@gPJ$T2!%WPm1)awGd$C4JA$h$-Ud!3U*Cpm$afQ(vmfGlUd=!^!Bs|GfMx^W
z+?TL7E<IMZQx-2vkR?i!Ag*`GV)w?SB_yRJ3Wor8Wz*3GFf2=zCCgHlC-pJ2Th<FS
zuA?fdgkplMd~Oa30DrhQZ=DM`^Yhku>moqj7fbm7c*HZ}hBRMi<pz5HHmgoKqL~b`
za{77T2!JzNb~x=wnp}|Ym8Z*P(xi)PL7sMG&w=!e{re8)0bE|IxCg+9JX4+_-|stC
zO{R2+v+8V?ydSvvyE5cE%L%g5_5zgj0bm$3^c(sN*Tv~u8Gq?r|5pP;HwK4I0EVB|
zBe5F>4E+I*m66Vfvj8}Lr04V>oWWL7l9_iE0GCQ}_SCr(szTK%af-z8y%vgd@?2q=
zqNG$=UIpOV3X+>DrAi?l;;dfzJzJtO0wh3N_4ohVhAp+~WNz{>t0W&Xy=J<a3Eb6H
zoy8A#T4iz8(SH_JITAnl&w-&Nz^T#YgtIc?3eJL(t{IqOV%9M}>i|rj^U`R~0yEsb
zWl-Qp&UrZ6RA+%Hre^KtdkcVd6aQ{CjdR;QKe?C@&dL{UKuK<rO}JT{aJ=)a&NzTI
zrm_qzMMK%$NBviB8UdPi9~j?1nU|B%8r2j7uwlC5bAK&0ZAUCg;jP?$9keCA2WK|+
z=ueo5C2sI|FS7ltY30Kn?M#5mta{Kksmt`6dOB;{Np!`TkGE6w1#7fy(>0PD-pcu1
zn!4M2RMFbf*51U6ws-XJP6CGg#8}Z*w`=2T)9}L?U*BlVKbn5FvZ*_}z_a=4CL=Hx
zi_FONGcwv6A9Q~b&Ps6MhZk>%mqmW}L@Fbdk;+Kr54`e!7TjW(>#<@C00000NkvXX
Hu0mjfUUyfH

diff --git a/tests/ref/math-stretch-horizontal.png b/tests/ref/math-stretch-horizontal.png
index 9b30be594438dc609456decd6f4e2e24f0368015..03d8eb154569cd376c35c514c1d7883c7639846e 100644
GIT binary patch
delta 568
zcmV-80>}N&1jGc87k@+u00000Z?~@40006DNkl<Zc-mw5KR|$C)Z$T#M=c(;n64IY
zeTu@}cL+^>I;|}JQ1KUucfhPOr?WGvv#=0Ibmn$;c6w6D;;C(IZCOoi{%zUWK%yzD
ztu4|QA)7c4LqjLc;<)kxg8itpj7C1j1bg?OaBH8^%g3)!xqrXzqsiYJ&Bvn_4|R+G
z4UolGmko@??~8v8jKxj0ot^m&oxUB}S)D$e4f((#lUlXYbf8&zO`X1-**QR>5omNl
z#=s=5ABDe=orUh>lww+0y!|fTNG}_pe7yeEXvsBd@u<akz_T5_rD+KX2^r;+_P(K;
z#m~Dd+7|CT|9|xT`}dE}ZeQ3~HSr@|EIu+1z54kw?b2xC8nt-TV(MG`<0+O--4}ZJ
zxL^yq$f<;1bP4LxiWU@5pZuFnalB(a3fS~_G*ypUJj5-&dHM9^GndX@ICuX1xeI46
zodI%h5}}QWfiSpy=E#{Nr;eUDcH+dblSfY-0dg-RWPhJNdHDFjqlb@x;Nc@6^YOzc
zPl+&;7>mDs`|=eCzJ2=&24B8@`SuOT1SV!61S24X04iDh=Jm_hFJ8ZV^%96)L*N^P
ztca+%7zBz*h>3$Zq9RnX*wEP0#M0El%-r0}!qmbP$T2oV$X>s4;nIam7eNrnxD13>
zt`lJ><uQrt&GW}V_~hABAb9o!%y~1Kk4G&YwRqHGS^@x`ve?eVv+IWd0000<MNUMn
GLSTZ#Iv|Pw

delta 579
zcmV-J0=)gi1kVJJ7k@<v00000r0acs0006ONkl<Zc-rlh-%ry}6vz3i{2xqQeDueY
z#<vaKhS3ZX7hFR1I0-Ye?Qmi0fH2$w8e=NDjcwhJA`dLxGDy@BO>nXY1YrcWF}Uzj
zTF4$qcN@q#w>i1r^G);V?Y-xA?Hd$b2u3i15lj{QX+<UDDSwU6cM81j*gK{Ym!KQq
zCfMyH!Ce5jtP_}J7{=^kt}+%2NiH+P+%PHb?ZAl_pksU7n^)$)A3W4?#qA>&Rmn#y
zv{qbI%lfj$FJm7g7{O<Y<&ZJpot|xDz`geYto>kmYB9qV=(hp@uM?ODfO{@5fu)<I
z$5wzon=yObw159seU@g$c1Nec9}Df=T2I}WcAET!7YKq8+$Nf($jbqz)A@vZ|Gh;G
zTnjjC1O5-Wd_JF^^0{n%p#~Lj)>F|`em*bK0Jl!7;i*RO1qQe3Cu@y83gF#a-?XJ4
z*EVSU>c$-|sEWY#O*(tr9QLTfTf<Y0;ByY%+W1GtI)535=}2tp1YWEDsaC3$)xWFc
zArm6k6nE6;=G^R{cgXW%$UDfo`DeaSoxtHB_l67jMqc^-!z27__AMI>D{gs7UXm9J
zr9!b-D9MX5k!790^1L`N&ZTpiTrMM}=R_i9#TBN<rp6-U?<PW%6XEd)5z~TBU@0ji
zKF4QbUp%AHFR_`pkPwnmdzZ@LT99U?*=#bM62(*|ktIS}z&=JWf)RWn!3S-5rpT$-
R%6I?(002ovPDHLkV1kHQ7qI{U

diff --git a/tests/ref/math-stretch-min-overlap-exceeds-max.png b/tests/ref/math-stretch-min-overlap-exceeds-max.png
index a75437fd960a4dad089f5c72add051e356fc7cb1..1de22c62c61bcda5d1cd6fd9bddb4ef5f519888c 100644
GIT binary patch
delta 561
zcmV-10?z%(1j+=EB!3Y}L_t(|+U=9=OH*MO#{Jv+X5cCc{jg{?tu{K=mh?g;b@q}$
zoxQY|a(JH9a<%tf*ptkx2HSG&sC8^@n$uadjfkc*a@N}24TVtOP6dLT`+@7euItMW
z9-gNKHfdU9und;LGWb7(Q~v&2e|BDT<ClAE+bDDT2>Z4j?tlJF8yi;Zm5ILqf6@XB
zLHgNxxPAwwqmB3zEHf5(J^{gG<;?*1IgzVAOlGlF!s`{LcE1)Cgyc*$S{+SfK^zBN
zC^OqkOnnQ?#-)HqT`-?2ztnx#f(E*T7k%l*8cf>!sZdP+Xl^jeWtO{P&(eMX*nZCf
z40J;KVq5VLZhvf><F<mS5+8OfxWxnceN72qu?IeOtP$n<5nzDsEcG9raj#6;*`j#u
zOwAWt<O+T@Fn9p=LaB`Iw=;Nd%2de=Ghbq122Ru^fWb84b|x?Arms6Ya%V4wy}bbR
zl8|?L%Bpxt$scvyR239O#Rtf5i=2L{SlCf)n`_Ot7Jn2=*uK(Oy(668nC2bJyXKXm
z{GGNm_<cwkc#Pn5SqZVL(Xe`y<1C8WPKdP=&G{abV@5)FwSy4uAg11vDBWg4JZcvq
zmo=EKo+7)ot5U!M#WDFP4H(eyRumhLVhB*`Gol%=qgZZG8Z`tdy=}(iaiCloqV$0w
zLaDb8Q!3C!RqWSIx$1Xg@~f7?GFS%7;D4SUZn@Ap?LAGG00000NkvXXu0mjf0ZS5o

delta 560
zcmV-00?+-*1jz)DB!3V|L_t(|+U=9?Pf}4B$Nk%SXPfk6O<&M}%$e4WVa=_XIW0me
z!E5{qPn3|dM7)?A<Y8K|0ZAa%H3Cf(YXjC=D7C~%JUv^@t=`>ob93i8+xPi?zi&R<
z**SG^KvT!S49vg`ywBjM$3FUZ=e}9}?Vj;_WxB)H_n{G{et)IC4PPt8`F{X^X$NpZ
z?B$M7c?^sGYUnwZaU;B%2XCbK{=VT`I9+-gNntC8cUxR}y6jIRB1<KIX(pTkaSk+-
z@#R`LxjV5Ok^-Kwz-qMcM)RW`+Mp%zx<6Lkh6UaeoeXx&u8gD%@y&~HYC{D8N1qsh
zgR{`M-jHj>jel)zj?Zd~A(v^*DxS$GY7)TWW%%5*{Xo8R0XPU8&)d%}S+^F3`f{SJ
zt2`cDH)K7{z~KQn4fz7PKh8*ZQd^9>xbH!MgU*TsFlfiD=18w*@t(OUeN`v8uK@(~
ziHv!;pbX{Z4z=ZxGAql;K0)S)@5&3=+Ob^2N`0n2D}UR-_HEmsd(7au5p$R}PpryC
z_MHwjIPaAP4iX&I03k*NnjSTZx(7vRBxFE^rdxx;^%63y;0d|ijH&Aq%K7Vr*c5jO
z(YIh4>?9{!%TmBeilg^ZD(KKSO(<q3icX-^+mGg<1!c%Zv6`ZE;uac*4TT@2G@zTN
ybo>q`pDCTHw7Um#)gNcst7c#ZW?%;X@A(N?qtHom;FqKT0000<MNUMnLSTab5*1Sb

diff --git a/tests/ref/math-underover-brace.png b/tests/ref/math-underover-brace.png
index d4a3f4a1c0eeb0a40eb973baca9ce6f5f7fc38b3..cd70c48366adab6641082b47bc45f8857603508c 100644
GIT binary patch
delta 724
zcmV;_0xSLR1>Xgb7k@Jd00000d61K#0007}Nkl<Zc-rlj+e;Kt9LN0=CacFFdg=0{
z5cQY`^0}lQgrbz{p|qEvv_@Ss+%Qp-TrbROVb-d+=JAH@Dn){(f|qsGR>WOu({yLS
z9WSZd`pubL*d2&)-DU-w&pZrg&X@CHe!rPB6N5b>Mir}KRe!9C6&LsA>fmPs5|;9N
zMZpU}<f)4I#J0%9XnqPmfpdxtM;9QX=MjQDRWtDuVTh*;uj<|az?Otutc67X5{|hc
z!nqKFJXPKQ))R)f1MzMXfXQN!lFguajptdO_peo-2f)koB{tp-8G@8r1z=rWxEh8S
zGq)gV>>>^X#ecmVm&9?60AMZswE@^T?piU&$@|<QrFsD9eK@jnv0yIK&yNDIH;EXf
zJ2q<NMRev^Y8|1a_H|=%1mknERL0iI>79$+g{@@`kTaxt&@Ef?MRM{Lgo>9n7^_A7
zfGlM-=1u;q_jnwTW83^wO5M43DIPYgVRx)I^+h7az<=eqGv^42Wlj)sh+&vmLQXOa
zA?H({boqep{2Pgc9Au6Ya(H|803oLsCV?cJjl1wE;!=M#QJT%_DAlkmn@wp2%Th`k
zYBaYy(lj*<RGclNG?!(?iAt7jp<NDTdu&#}$59g-TB9aj|Ng_fGA}H8c&E<^OQRc@
z!-CthY=7TWRxBia(YWr;-FIH>Pcu<V?ogxdTY2lFkI#o^locZr54VpDWC~hGmBoPc
zn<JmcnnBZNl@+_LkERGk?=M+Xd+&5*P3k)b%;rI(7Wp4$_UBVA{B2H2@oeGa%GZ86
zrvcvt4UBX-rM$AGcC=OdseD%OF2ATMFfz>}icLLU`k%H;uYDRY1B;&3=!&Nb`qoT2
z?XI@^g6N7nvy48p1A{N~_Mpcupr_8E{s^dIRji8lx%fBiA0outCW)m00000<MNUMn
GLSTX#V_~ZR

delta 740
zcmV<A0vr9`1@8rr7k@Gc00000vdlmP0008ENkl<Zc-rlkTTjzq7{|FQ`UN~BCb~O%
zhw%$|!3QugkpyGB5xqn(BR~R51_THPIe19vL=YIl5E&T9VJ3p^HB8xw&Eb-5ij1)i
z=VT*0_0hH@Ta7Wy*)@><d+|Q)`_KE!^E~PMws|0u@+7bXmVdw!Sa9&$+r7Xk$_?gw
z<!z}4De+zR3yU;aW<1dZoc6}64mj;&qdtmf<hhiqyP0HcAL)NG!~`@eKDdz^^g)mX
z*og2$n)ohKKm0ud@C+0NW&yy~&Zr}n0!JvShN8H&RP_K5r>G7G6#$+>tSbxv*0Aq#
z24HYr0~X_A<bQ?~c#$A35X4g^wBAib0UQKzrJW%7eV$}p3rri5aBBbH&|FWS*9ZWv
zaYkx3V|63Hi0ifH0e5<-lk>2(0+tP)tCHS1w|{V;b*g6+_*$-$&-0e-E-o&CbnuTl
zFb#m}9nWP|*W3Qrdu)N<<cR&rb<j7EwFLaDXnQu`@PDm4qYHY3l;jjb{Uk{$5z>$(
zLd%=LY0H4nBl0;yk4ci5m?23$((A?)Wx?!9jhaf%;&?uG9LJAf7?zLYCol}haoL&k
zqcB+{lNB(t$8h{8hA|T-F{}VDELJQE*W-w;TpJPRbfQH&7Ly5)z(eCX18=|ou<bQ@
z>@FJ$qJM;0X$M%1m{vVs4Libu6PH3Y(VG!@_@d{ANo8*FJWzx?mKux=me0b1q3YLF
zP0OJw)aZU_9-+%hSInkopp#pK1^dg4<ss#4skP!w^?b8a_41=(&Zy~x&ez_<`IY&%
zv^IqV`&vpX>pAsmcOj_h+`Fr|-W3tH)N!khlU;VKYp{D_j=OpFiO%H)5*KUBOo{;h
zW>|{BG{D;WMsC4h+MMy(+G)RbqB*zV7p>|fld)w`AwrMC01LyE^nWaYC9niO<lvt>
Weytc?Nkc*a0000<MNUMnLSTaG8)JF^

diff --git a/tests/ref/math-underover-parens.png b/tests/ref/math-underover-parens.png
index a461ee078021748637971894249a2e8044df6146..9d7057d43889f3e15516cc44584874189c510492 100644
GIT binary patch
delta 725
zcmV;`0xJF11>gmc7k@Vh00000;sMdO0007~Nkl<Zc-rmQPe@a700(d{o~9=cUJ5)b
zbdjC96of$?iYQPrNa#`|NM@cgHQkz|rX!08XRap8bWU;q-kaONX{${$=lqi+^Z%B6
z>T^0bb>Eh62Mq)d@26nz`wqXy_ws??`~BYU@e*)MNf2NG7Jpy?J_^_;H3OIeplPlH
zLjHKqmCV_~03jG1Isi=oYr(}BW{uZe`CB^)g7C2JfzAT7b+S5zOy}czOROA@*o+#2
zaL`}xXVBZ<AN9LB{994{y_i@TqyuA>gy2A(oY|e#)x2COH`UfnI%<f|zfs8$UDZLv
zvlH4=p5T2PnSb@T>}IM;CTpaqMwzUNGTU9A*$6o}NXzrHGEx$gQ`6Ej#YrO3X|ec}
zNR%YbOixQqPE5(j%9qnYzTv1MCtIqrd6&aDAmL@NO(o6FQABx#P2D(Tx=q3%K>$`C
zDIC(yP+sm<!VLr8;NKt*D??}8m3!ei(=`;h$-^s4*ME1%8i^!JBIyHGUB$Qn@-W+0
z8~L$ss%2K@26=e$c3Jt$&_1~9ZGoITjE&e8&qr=(Tfez<9Q!zYS8WnLZ~2EmA8_z4
zP7sC{%b(fVf6MvqQu!A77f5Si&ZYBL^9mlulAn9|+?8A9=Ix_;#+$#~j=or&V{<zv
zb8#`AV}F7-i*dM2E%OVb6i$2OgPn%A#}ENLww0f~3ofnUyMDt+=|=RJADq?p=y9)g
zn`hXmU#WX%k+P3RR6zJiV7wA#!Ta8lukDUko$99XJA)O*7R5xp4?M#(%~mK!pEHg0
z8nE^V3neI8ub6HaQh(9tZ7O#W0+i*w=k??auTJn{4XdYCo2?B4Pphi|^gDdcp3$ND
z-ZxZ>LEYY^v`pBhHJwVU@6$G+?exM?EBt&BU;!53{}lcML;@T?9WH-$00000NkvXX
Hu0mjfcd}y(

delta 715
zcmV;+0yO>L1=a<S7k@Sg00000DO~~*0007=Nkl<Zc-rmQ-Ahwp90%}S)Yb6POK<%L
z@*=A{iy&|ECWS&sg1V4I#VEtFB2DoHol8N?<wTd$ZN4z~a%2kTmbmG(?aY}w;+(eS
z4mwxc+{?GMc{Au@7w2rC=X>Bh@VoiIkLP)Ko`;7lg~!1h%zwcgoC(<7JO^M0fPAP6
z2zZc8vPfUA^|Ay*p#&fTd^+5YWAjKRS^PEm11!QD${M8(n3(b@2V0bGB%+HKH%=GS
zau#8~r`tngQLm4Aj0#UUhJPO&FZv0u?LAAdw@W}Lx_bQZL36Uz^Fbn}I_tk$OtU(x
z{WwcBkWxI4%YSK?5Y|@|7v$&V=J0tu-eo@jQhea&<mTlU6j#&>iCq?8S9?iOX-$V{
zY<f<=W_P+wMkDERkw&A*<+QKq=cdO*9W|vzCG9R|VO7;i7-=NDQl&c2d$m7Xa8pL%
zwNatyQwlsHfX2Z-tihF|MF38Us-q|$K$3S+cE~;qOMhiz7?()OB$Dp{WPP{^)?x2V
z+vgo~N~@cUrb_l<TA=BZAqA$y_ogyCt2Yz>z?0DZ?3}qKCjHzglX+N9;C~4XSXhR!
z@S?hNc6sYCf<%G`)+O27>UWMzwAw0eEWcG)crBi*H|{)cmG5&`80O&pex#RZj9D0s
zNH01!(|>SKqO!jhw?xOKeW$>%+%&VOF;tEA4%&uVdZe8vidAiopyT9`G{P_}`x<#B
zHn-6Y8a3c;g#RU~f4|!8G><KRnbnL~%2#Dt^)T6ez$_ek>gfHZ5EvSE21Y#qYJHYB
z2Osw9)|(dkwIa#n$EDVvW~oAGkP%Ks;iL6G$3%OuQtQrE^K$@U8)78(%+$s<xoz9r
xvO2ICvu|0cD9P4xA`DvY4TOU^n1e4U{1=aWrau`1Bw_#n002ovPDHLkV1o6mS-SuL

diff --git a/tests/ref/math-underover-shells.png b/tests/ref/math-underover-shells.png
index fb327af69589a0082635205868c3ef5631a65ba6..42fa690e3c19966995c5d374e9f343154a25d434 100644
GIT binary patch
delta 535
zcmV+y0_gpx1fv9y7k@Pf00000ugP${0005%Nkl<Zc-mw5KR|$C)Z$T#M=c(;ct9;)
z^N;Qp@0z}P;s5`O|NZ~Brtj7&I$Hd_?#2I`3)1E-__<-jw9E9f`0u3XlNZ1~{=agQ
zKRtu`<NvQf@-z@1yx2J~srt;`Kco4WMiy_Dm%{{#`)F?Q+JDr)SVVuv?x3;7Z+fwp
zR)4xajwUY3EIv}R4$6WC@zcpweNX|KTKs#~Y$&T6LKR*7uXhWQyl>DnsNoj3L4)AY
zf6J?2*2Zh}u=wA<)_>5jJ(dU&Sbqg5LTigRbar}lb}j=kU)25n{r~^H&d&Iv&dv|?
z3+gXTkB^=}34iL7|G!=N|Ku5!Ek0aSd<4bf+3xP{ACWEolluQ==l`{vX_k*qqYK=5
zKia&dqQ&R!o)V|<soi<%`uL>j$~6d3UjhWRYu40)=z1iHm8K`D9n|OCTo6D;2neKH
zT%<s>43dP~xzWT$Rg1g6G(y@vzaadB3r|m{i^Y@QwSPhy(W@agcK{*HEq=MM7i#hL
zGaJKqyvcl4^dkOB{0*90{B=djABe>p3a&MN`&;?H@_z#m(%j-DyK}cU-YI_h|No?~
z%jWO;)c88|L-yzF&$N%@8{gjFe108h@rN7#{@nZj<=U0!H(uR%Gg?WET0Cm;sKs;x
Z0N>v>2N3M_Ne}=4002ovPDHLkV1gvvBlG|O

delta 539
zcmV+$0_6Rp1g8X$7k@Me00000WR;^C0005*Nkl<Zc-rmQ-77<J7zc1yZulEWsolBv
z7tEbY7t%?YJJQ@B39<ahE+}s+(Y$1au^Y*hyyTd-&1fWf8AdWkm~H3$9@{x5+t|g*
zerL6Q-(5V<o?U#}b6z@~EJ#zbC`@4rQ#h@#87mI249<=N7=JNfv;N$qAnb4P!r55$
z=vcsF88}uB7W&HBBk>=@%u=b6tLESX0PFy;?m+1|tM_a?y^aaN*8IG`DOe*8&uN4N
z(@@1SVfeWhC!F)$96h=I2X8jd%N>@=U4N5a9uS2?BL=zak&4y<MdxB?b(4hQ2iD0e
zxPjsmv0FS<0)NK16U)2Zu9OA~E{uu87KBO=nu@gEmQV=b5+O#5(5rH*es90s+KF2=
z3!g6V+@~1c(AICp!3MQj&BemJ2F?)7S&3c8_TPgGUnbr_oF+&zCTB`vf$4yx(!mHR
zg#l{{Rng>Thm)gH<wR<3%nyYcobqG5%SJOj8qOrkPJc$~G#kxshCce}-*tl6@Y44!
z<I%7paQ{oEL@ory(j{~W#NnrjJ{ex!vz9GC*WNdH85iRw4*N}2yab!I?lwPeghpr$
ze~80ITa8V3-QWWl3QQQ*xz@Kbe_f#Ni#UuO+~eW(z6apZ$p=rtcWA#l@EknQR}mDZ
dFohM%HxyWgzrh2izfAxD002ovPDHLkV1lG}0z3c!