merge

ci/release/changelogs/next.md

@@ -1,45 +1,17 @@
 #### Features 🚀
-- Connections now support `link` in SVGs [#1955](https://github.com/terrastruct/d2/pull/1955)
 
+- Connections now support `link` [#1955](https://github.com/terrastruct/d2/pull/1955)
 - Vars: vars in markdown blocks are substituted [#2218](https://github.com/terrastruct/d2/pull/2218)
 - Markdown: Github-flavored tables work in `md` blocks [#2221](https://github.com/terrastruct/d2/pull/2221)
 
 #### Improvements 🧹
 
-<<<<<<< HEAD
 - Composition: links pointing to own board are purged [#2203](https://github.com/terrastruct/d2/pull/2203)
 - Syntax: reserved keywords must be unquoted [#2231](https://github.com/terrastruct/d2/pull/2231)
 - Latex: Backslashes in Latex blocks do not escape [#2232](https://github.com/terrastruct/d2/pull/2232)
   - This is a breaking change. Previously Latex blocks required escaping the backslash. So
     for older D2 versions, you should remove the excess backslashes.
 - Links: non-http url scheme links are supported (e.g. `x.link: vscode://file/`) [#2237](https://github.com/terrastruct/d2/issues/2237)
-||||||| parent of 703bcd388 (update next.md)
-- Sequence diagram: edge groups account for edge label heights [#2038](https://github.com/terrastruct/d2/pull/2038)
-- Sequence diagram: self-referential edges account for edge label heights [#2040](https://github.com/terrastruct/d2/pull/2040)
-- Sequence diagram: The spacing between self-referential edges and regular edges is uniform [#2043](https://github.com/terrastruct/d2/pull/2043)
-- Compiler: Error on multi-line labels in `sql_table` shapes [#2057](https://github.com/terrastruct/d2/pull/2057)
-- Sequence diagram: Image shape actors can use spans and notes [#2056](https://github.com/terrastruct/d2/issues/2056)
-- Globs: Filters work with default values (e.g. `&opacity: 1` will capture everything without opacity explicitly set) [#2090](https://github.com/terrastruct/d2/pull/2090)
-- Render: connection label fills have a bit of padding and border-radius for better aesthetics [#2094](https://github.com/terrastruct/d2/pull/2094)
-- Sequence diagram: the padding between message labels and message endpoints are slightly increased [#2096](https://github.com/terrastruct/d2/pull/2096)
-=======
-- Sequence diagram: edge groups account for edge label heights [#2038](https://github.com/terrastruct/d2/pull/2038)
-- Sequence diagram: self-referential edges account for edge label heights [#2040](https://github.com/terrastruct/d2/pull/2040)
-- Sequence diagram: The spacing between self-referential edges and regular edges is uniform [#2043](https://github.com/terrastruct/d2/pull/2043)
-- Compiler: Error on multi-line labels in `sql_table` shapes [#2057](https://github.com/terrastruct/d2/pull/2057)
-- Sequence diagram: Image shape actors can use spans and notes [#2056](https://github.com/terrastruct/d2/issues/2056)
-- Globs: Filters work with default values (e.g. `&opacity: 1` will capture everything without opacity explicitly set) [#2090](https://github.com/terrastruct/d2/pull/2090)
-- Render: connection label fills have a bit of padding and border-radius for better aesthetics [#2094](https://github.com/terrastruct/d2/pull/2094)
-- Sequence diagram: the padding between message labels and message endpoints are slightly increased [#2096](https://github.com/terrastruct/d2/pull/2096)
-- Opacity 0 shapes no longer have a label mask which made any segment of connections going through them lower opacity [#1940](https://github.com/terrastruct/d2/pull/1940)
-- Bidirectional connections are now animated in opposite directions rather than one direction [#1939](https://github.com/terrastruct/d2/pull/1939)
-<<<<<<< HEAD
-- Connections now support `link` in SVGs [#1955](https://github.com/terrastruct/d2/pull/1955)
->>>>>>> 703bcd388 (update next.md)
-||||||| parent of ba86dc990 (link on connections are now labels)
-- Connections now support `link` in SVGs [#1955](https://github.com/terrastruct/d2/pull/1955)
-=======
->>>>>>> ba86dc990 (link on connections are now labels)
 
 #### Bugfixes ⛑️
 

d2renderers/d2svg/dark_theme/testdata/basic/dark_theme.exp.svg

@@ -1,26 +1,4 @@
-<<<<<<< HEAD
+<?xml version="1.0" encoding="utf-8"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" d2Version="v0.6.8-HEAD" preserveAspectRatio="xMinYMin meet" viewBox="0 0 257 434"><svg id="d2-svg" class="d2-3451263933" width="257" height="434" viewBox="-101 -101 257 434"><rect x="-101.000000" y="-101.000000" width="257.000000" height="434.000000" rx="0.000000" fill="#1E1E2E" class=" fill-N7" stroke-width="0" /><style type="text/css"><![CDATA[
-<<<<<<< HEAD
-<?xml version="1.0" encoding="utf-8"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" d2Version="v0.6.8-HEAD" preserveAspectRatio="xMinYMin meet" viewBox="0 0 257 434"><svg id="d2-svg" class="d2-327680947" width="257" height="434" viewBox="-101 -101 257 434"><rect x="-101.000000" y="-101.000000" width="257.000000" height="434.000000" rx="0.000000" fill="#1E1E2E" class=" fill-N7" stroke-width="0" /><style type="text/css"><![CDATA[
-||||||| parent of 33280fed5 (fixed e2e tests)
-<?xml version="1.0" encoding="utf-8"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" d2Version="v0.6.6-HEAD" preserveAspectRatio="xMinYMin meet" viewBox="0 0 257 434"><svg id="d2-svg" class="d2-327680947" width="257" height="434" viewBox="-101 -101 257 434"><rect x="-101.000000" y="-101.000000" width="257.000000" height="434.000000" rx="0.000000" class=" fill-N7" stroke-width="0" /><style type="text/css"><![CDATA[
-=======
-<<<<<<< HEAD
-<?xml version="1.0" encoding="utf-8"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" d2Version="v0.6.6-HEAD" preserveAspectRatio="xMinYMin meet" viewBox="0 0 257 434"><svg id="d2-svg" class="d2-327680947" width="257" height="434" viewBox="-101 -101 257 434"><rect x="-101.000000" y="-101.000000" width="257.000000" height="434.000000" rx="0.000000" class=" fill-N7" stroke-width="0" /><style type="text/css"><![CDATA[
->>>>>>> 33280fed5 (fixed e2e tests)
-.d2-327680947 .text-bold {
-	font-family: "d2-327680947-font-bold";
-=======
-<?xml version="1.0" encoding="utf-8"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" d2Version="v0.6.5-HEAD" preserveAspectRatio="xMinYMin meet" viewBox="0 0 257 434"><svg id="d2-svg" class="d2-3451263933" width="257" height="434" viewBox="-101 -101 257 434"><rect x="-101.000000" y="-101.000000" width="257.000000" height="434.000000" rx="0.000000" class=" fill-N7" stroke-width="0" /><style type="text/css"><![CDATA[
-||||||| parent of cb2f2823c (Fix changes)
-<<<<<<< HEAD
-<?xml version="1.0" encoding="utf-8"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" d2Version="v0.6.6-HEAD" preserveAspectRatio="xMinYMin meet" viewBox="0 0 257 434"><svg id="d2-svg" class="d2-327680947" width="257" height="434" viewBox="-101 -101 257 434"><rect x="-101.000000" y="-101.000000" width="257.000000" height="434.000000" rx="0.000000" class=" fill-N7" stroke-width="0" /><style type="text/css"><![CDATA[
-.d2-327680947 .text-bold {
-	font-family: "d2-327680947-font-bold";
-=======
-<?xml version="1.0" encoding="utf-8"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" d2Version="v0.6.5-HEAD" preserveAspectRatio="xMinYMin meet" viewBox="0 0 257 434"><svg id="d2-svg" class="d2-3451263933" width="257" height="434" viewBox="-101 -101 257 434"><rect x="-101.000000" y="-101.000000" width="257.000000" height="434.000000" rx="0.000000" class=" fill-N7" stroke-width="0" /><style type="text/css"><![CDATA[
-=======
-<?xml version="1.0" encoding="utf-8"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" d2Version="v0.6.6-HEAD" preserveAspectRatio="xMinYMin meet" viewBox="0 0 257 434"><svg id="d2-svg" class="d2-3451263933" width="257" height="434" viewBox="-101 -101 257 434"><rect x="-101.000000" y="-101.000000" width="257.000000" height="434.000000" rx="0.000000" class=" fill-N7" stroke-width="0" /><style type="text/css"><![CDATA[
->>>>>>> cb2f2823c (Fix changes)
 .d2-3451263933 .text-bold {
 	font-family: "d2-3451263933-font-bold";
 }
@@ -40,153 +18,6 @@
   opacity: 0.5;
 }
 
-<<<<<<< HEAD
-		.d2-327680947 .fill-N1{fill:#CDD6F4;}
-		.d2-327680947 .fill-N2{fill:#BAC2DE;}
-		.d2-327680947 .fill-N3{fill:#A6ADC8;}
-		.d2-327680947 .fill-N4{fill:#585B70;}
-		.d2-327680947 .fill-N5{fill:#45475A;}
-		.d2-327680947 .fill-N6{fill:#313244;}
-		.d2-327680947 .fill-N7{fill:#1E1E2E;}
-		.d2-327680947 .fill-B1{fill:#CBA6f7;}
-		.d2-327680947 .fill-B2{fill:#CBA6f7;}
-		.d2-327680947 .fill-B3{fill:#6C7086;}
-		.d2-327680947 .fill-B4{fill:#585B70;}
-		.d2-327680947 .fill-B5{fill:#45475A;}
-		.d2-327680947 .fill-B6{fill:#313244;}
-		.d2-327680947 .fill-AA2{fill:#f38BA8;}
-		.d2-327680947 .fill-AA4{fill:#45475A;}
-		.d2-327680947 .fill-AA5{fill:#313244;}
-		.d2-327680947 .fill-AB4{fill:#45475A;}
-		.d2-327680947 .fill-AB5{fill:#313244;}
-		.d2-327680947 .stroke-N1{stroke:#CDD6F4;}
-		.d2-327680947 .stroke-N2{stroke:#BAC2DE;}
-		.d2-327680947 .stroke-N3{stroke:#A6ADC8;}
-		.d2-327680947 .stroke-N4{stroke:#585B70;}
-		.d2-327680947 .stroke-N5{stroke:#45475A;}
-		.d2-327680947 .stroke-N6{stroke:#313244;}
-		.d2-327680947 .stroke-N7{stroke:#1E1E2E;}
-		.d2-327680947 .stroke-B1{stroke:#CBA6f7;}
-		.d2-327680947 .stroke-B2{stroke:#CBA6f7;}
-		.d2-327680947 .stroke-B3{stroke:#6C7086;}
-		.d2-327680947 .stroke-B4{stroke:#585B70;}
-		.d2-327680947 .stroke-B5{stroke:#45475A;}
-		.d2-327680947 .stroke-B6{stroke:#313244;}
-		.d2-327680947 .stroke-AA2{stroke:#f38BA8;}
-		.d2-327680947 .stroke-AA4{stroke:#45475A;}
-		.d2-327680947 .stroke-AA5{stroke:#313244;}
-		.d2-327680947 .stroke-AB4{stroke:#45475A;}
-		.d2-327680947 .stroke-AB5{stroke:#313244;}
-		.d2-327680947 .background-color-N1{background-color:#CDD6F4;}
-		.d2-327680947 .background-color-N2{background-color:#BAC2DE;}
-		.d2-327680947 .background-color-N3{background-color:#A6ADC8;}
-		.d2-327680947 .background-color-N4{background-color:#585B70;}
-		.d2-327680947 .background-color-N5{background-color:#45475A;}
-		.d2-327680947 .background-color-N6{background-color:#313244;}
-		.d2-327680947 .background-color-N7{background-color:#1E1E2E;}
-		.d2-327680947 .background-color-B1{background-color:#CBA6f7;}
-		.d2-327680947 .background-color-B2{background-color:#CBA6f7;}
-		.d2-327680947 .background-color-B3{background-color:#6C7086;}
-		.d2-327680947 .background-color-B4{background-color:#585B70;}
-		.d2-327680947 .background-color-B5{background-color:#45475A;}
-		.d2-327680947 .background-color-B6{background-color:#313244;}
-		.d2-327680947 .background-color-AA2{background-color:#f38BA8;}
-		.d2-327680947 .background-color-AA4{background-color:#45475A;}
-		.d2-327680947 .background-color-AA5{background-color:#313244;}
-		.d2-327680947 .background-color-AB4{background-color:#45475A;}
-		.d2-327680947 .background-color-AB5{background-color:#313244;}
-		.d2-327680947 .color-N1{color:#CDD6F4;}
-		.d2-327680947 .color-N2{color:#BAC2DE;}
-		.d2-327680947 .color-N3{color:#A6ADC8;}
-		.d2-327680947 .color-N4{color:#585B70;}
-		.d2-327680947 .color-N5{color:#45475A;}
-		.d2-327680947 .color-N6{color:#313244;}
-		.d2-327680947 .color-N7{color:#1E1E2E;}
-		.d2-327680947 .color-B1{color:#CBA6f7;}
-		.d2-327680947 .color-B2{color:#CBA6f7;}
-		.d2-327680947 .color-B3{color:#6C7086;}
-		.d2-327680947 .color-B4{color:#585B70;}
-		.d2-327680947 .color-B5{color:#45475A;}
-		.d2-327680947 .color-B6{color:#313244;}
-		.d2-327680947 .color-AA2{color:#f38BA8;}
-		.d2-327680947 .color-AA4{color:#45475A;}
-		.d2-327680947 .color-AA5{color:#313244;}
-		.d2-327680947 .color-AB4{color:#45475A;}
-		.d2-327680947 .color-AB5{color:#313244;}.appendix text.text{fill:#CDD6F4}.md{--color-fg-default:#CDD6F4;--color-fg-muted:#BAC2DE;--color-fg-subtle:#A6ADC8;--color-canvas-default:#1E1E2E;--color-canvas-subtle:#313244;--color-border-default:#CBA6f7;--color-border-muted:#CBA6f7;--color-neutral-muted:#313244;--color-accent-fg:#CBA6f7;--color-accent-emphasis:#CBA6f7;--color-attention-subtle:#BAC2DE;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-B2{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-B3{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-B4{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-B5{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B6{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-AA2{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-AA4{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-AA5{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-AB4{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-AB5{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N1{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N2{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N5{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N6{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N7{fill:url(#streaks-darker);mix-blend-mode:lighten}.light-code{display: none}.dark-code{display: block}]]></style><g id="a"><g class="shape" ><rect x="1.000000" y="0.000000" width="54.000000" height="66.000000" stroke="#CBA6f7" fill="#313244" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="28.000000" y="38.500000" fill="#CDD6F4" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">a</text></g><g id="b"><g class="shape" ><rect x="0.000000" y="166.000000" width="55.000000" height="66.000000" stroke="#CBA6f7" fill="#313244" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="27.500000" y="204.500000" fill="#CDD6F4" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">b</text></g><g id="(a -&gt; b)[0]"><marker id="mk-3488378134" markerWidth="10.000000" markerHeight="12.000000" refX="7.000000" refY="6.000000" viewBox="0.000000 0.000000 10.000000 12.000000" orient="auto" markerUnits="userSpaceOnUse"> <polygon points="0.000000,0.000000 10.000000,6.000000 0.000000,12.000000" fill="#CBA6f7" class="connection fill-B1" stroke-width="2" /> </marker><path d="M 27.500000 68.000000 C 27.500000 106.000000 27.500000 126.000000 27.500000 162.000000" stroke="#CBA6f7" fill="none" class="connection stroke-B1" style="stroke-width:2;" marker-end="url(#mk-3488378134)" mask="url(#d2-327680947)" /></g><mask id="d2-327680947" maskUnits="userSpaceOnUse" x="-101" y="-101" width="257" height="434">
-||||||| parent of 33280fed5 (fixed e2e tests)
-		.d2-327680947 .fill-N1{fill:#CDD6F4;}
-		.d2-327680947 .fill-N2{fill:#BAC2DE;}
-		.d2-327680947 .fill-N3{fill:#A6ADC8;}
-		.d2-327680947 .fill-N4{fill:#585B70;}
-		.d2-327680947 .fill-N5{fill:#45475A;}
-		.d2-327680947 .fill-N6{fill:#313244;}
-		.d2-327680947 .fill-N7{fill:#1E1E2E;}
-		.d2-327680947 .fill-B1{fill:#CBA6f7;}
-		.d2-327680947 .fill-B2{fill:#CBA6f7;}
-		.d2-327680947 .fill-B3{fill:#6C7086;}
-		.d2-327680947 .fill-B4{fill:#585B70;}
-		.d2-327680947 .fill-B5{fill:#45475A;}
-		.d2-327680947 .fill-B6{fill:#313244;}
-		.d2-327680947 .fill-AA2{fill:#f38BA8;}
-		.d2-327680947 .fill-AA4{fill:#45475A;}
-		.d2-327680947 .fill-AA5{fill:#313244;}
-		.d2-327680947 .fill-AB4{fill:#45475A;}
-		.d2-327680947 .fill-AB5{fill:#313244;}
-		.d2-327680947 .stroke-N1{stroke:#CDD6F4;}
-		.d2-327680947 .stroke-N2{stroke:#BAC2DE;}
-		.d2-327680947 .stroke-N3{stroke:#A6ADC8;}
-		.d2-327680947 .stroke-N4{stroke:#585B70;}
-		.d2-327680947 .stroke-N5{stroke:#45475A;}
-		.d2-327680947 .stroke-N6{stroke:#313244;}
-		.d2-327680947 .stroke-N7{stroke:#1E1E2E;}
-		.d2-327680947 .stroke-B1{stroke:#CBA6f7;}
-		.d2-327680947 .stroke-B2{stroke:#CBA6f7;}
-		.d2-327680947 .stroke-B3{stroke:#6C7086;}
-		.d2-327680947 .stroke-B4{stroke:#585B70;}
-		.d2-327680947 .stroke-B5{stroke:#45475A;}
-		.d2-327680947 .stroke-B6{stroke:#313244;}
-		.d2-327680947 .stroke-AA2{stroke:#f38BA8;}
-		.d2-327680947 .stroke-AA4{stroke:#45475A;}
-		.d2-327680947 .stroke-AA5{stroke:#313244;}
-		.d2-327680947 .stroke-AB4{stroke:#45475A;}
-		.d2-327680947 .stroke-AB5{stroke:#313244;}
-		.d2-327680947 .background-color-N1{background-color:#CDD6F4;}
-		.d2-327680947 .background-color-N2{background-color:#BAC2DE;}
-		.d2-327680947 .background-color-N3{background-color:#A6ADC8;}
-		.d2-327680947 .background-color-N4{background-color:#585B70;}
-		.d2-327680947 .background-color-N5{background-color:#45475A;}
-		.d2-327680947 .background-color-N6{background-color:#313244;}
-		.d2-327680947 .background-color-N7{background-color:#1E1E2E;}
-		.d2-327680947 .background-color-B1{background-color:#CBA6f7;}
-		.d2-327680947 .background-color-B2{background-color:#CBA6f7;}
-		.d2-327680947 .background-color-B3{background-color:#6C7086;}
-		.d2-327680947 .background-color-B4{background-color:#585B70;}
-		.d2-327680947 .background-color-B5{background-color:#45475A;}
-		.d2-327680947 .background-color-B6{background-color:#313244;}
-		.d2-327680947 .background-color-AA2{background-color:#f38BA8;}
-		.d2-327680947 .background-color-AA4{background-color:#45475A;}
-		.d2-327680947 .background-color-AA5{background-color:#313244;}
-		.d2-327680947 .background-color-AB4{background-color:#45475A;}
-		.d2-327680947 .background-color-AB5{background-color:#313244;}
-		.d2-327680947 .color-N1{color:#CDD6F4;}
-		.d2-327680947 .color-N2{color:#BAC2DE;}
-		.d2-327680947 .color-N3{color:#A6ADC8;}
-		.d2-327680947 .color-N4{color:#585B70;}
-		.d2-327680947 .color-N5{color:#45475A;}
-		.d2-327680947 .color-N6{color:#313244;}
-		.d2-327680947 .color-N7{color:#1E1E2E;}
-		.d2-327680947 .color-B1{color:#CBA6f7;}
-		.d2-327680947 .color-B2{color:#CBA6f7;}
-		.d2-327680947 .color-B3{color:#6C7086;}
-		.d2-327680947 .color-B4{color:#585B70;}
-		.d2-327680947 .color-B5{color:#45475A;}
-		.d2-327680947 .color-B6{color:#313244;}
-		.d2-327680947 .color-AA2{color:#f38BA8;}
-		.d2-327680947 .color-AA4{color:#45475A;}
-		.d2-327680947 .color-AA5{color:#313244;}
-		.d2-327680947 .color-AB4{color:#45475A;}
-		.d2-327680947 .color-AB5{color:#313244;}.appendix text.text{fill:#CDD6F4}.md{--color-fg-default:#CDD6F4;--color-fg-muted:#BAC2DE;--color-fg-subtle:#A6ADC8;--color-canvas-default:#1E1E2E;--color-canvas-subtle:#313244;--color-border-default:#CBA6f7;--color-border-muted:#CBA6f7;--color-neutral-muted:#313244;--color-accent-fg:#CBA6f7;--color-accent-emphasis:#CBA6f7;--color-attention-subtle:#BAC2DE;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-B2{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-B3{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-B4{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-B5{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B6{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-AA2{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-AA4{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-AA5{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-AB4{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-AB5{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N1{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N2{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N5{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N6{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N7{fill:url(#streaks-darker);mix-blend-mode:lighten}.light-code{display: none}.dark-code{display: block}]]></style><g id="a"><g class="shape" ><rect x="1.000000" y="0.000000" width="54.000000" height="66.000000" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="28.000000" y="38.500000" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">a</text></g><g id="b"><g class="shape" ><rect x="0.000000" y="166.000000" width="55.000000" height="66.000000" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="27.500000" y="204.500000" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">b</text></g><g id="(a -&gt; b)[0]"><marker id="mk-3488378134" markerWidth="10.000000" markerHeight="12.000000" refX="7.000000" refY="6.000000" viewBox="0.000000 0.000000 10.000000 12.000000" orient="auto" markerUnits="userSpaceOnUse"> <polygon points="0.000000,0.000000 10.000000,6.000000 0.000000,12.000000" class="connection fill-B1" stroke-width="2" /> </marker><path d="M 27.500000 68.000000 C 27.500000 106.000000 27.500000 126.000000 27.500000 162.000000" fill="none" class="connection stroke-B1" style="stroke-width:2;" marker-end="url(#mk-3488378134)" mask="url(#d2-327680947)" /></g><mask id="d2-327680947" maskUnits="userSpaceOnUse" x="-101" y="-101" width="257" height="434">
-=======
 		.d2-3451263933 .fill-N1{fill:#CDD6F4;}
 		.d2-3451263933 .fill-N2{fill:#BAC2DE;}
 		.d2-3451263933 .fill-N3{fill:#A6ADC8;}
@@ -258,8 +89,7 @@
 		.d2-3451263933 .color-AA4{color:#45475A;}
 		.d2-3451263933 .color-AA5{color:#313244;}
 		.d2-3451263933 .color-AB4{color:#45475A;}
-		.d2-3451263933 .color-AB5{color:#313244;}.appendix text.text{fill:#CDD6F4}.md{--color-fg-default:#CDD6F4;--color-fg-muted:#BAC2DE;--color-fg-subtle:#A6ADC8;--color-canvas-default:#1E1E2E;--color-canvas-subtle:#313244;--color-border-default:#CBA6f7;--color-border-muted:#CBA6f7;--color-neutral-muted:#313244;--color-accent-fg:#CBA6f7;--color-accent-emphasis:#CBA6f7;--color-attention-subtle:#BAC2DE;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-B2{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-B3{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-B4{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-B5{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B6{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-AA2{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-AA4{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-AA5{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-AB4{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-AB5{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N1{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N2{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N5{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N6{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N7{fill:url(#streaks-darker);mix-blend-mode:lighten}.light-code{display: none}.dark-code{display: block}]]></style><g id="a"><g class="shape" ><rect x="1.000000" y="0.000000" width="54.000000" height="66.000000" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="28.000000" y="38.500000" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">a</text></g><g id="b"><g class="shape" ><rect x="0.000000" y="166.000000" width="55.000000" height="66.000000" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="27.500000" y="204.500000" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">b</text></g><g id="(a -&gt; b)[0]"><marker id="mk-3488378134" markerWidth="10.000000" markerHeight="12.000000" refX="7.000000" refY="6.000000" viewBox="0.000000 0.000000 10.000000 12.000000" orient="auto" markerUnits="userSpaceOnUse"> <polygon points="0.000000,0.000000 10.000000,6.000000 0.000000,12.000000" class="connection fill-B1" stroke-width="2" /> </marker><path d="M 27.500000 68.000000 C 27.500000 106.000000 27.500000 126.000000 27.500000 162.000000" fill="none" class="connection stroke-B1" style="stroke-width:2;" marker-end="url(#mk-3488378134)" mask="url(#d2-3451263933)" /></g><mask id="d2-3451263933" maskUnits="userSpaceOnUse" x="-101" y="-101" width="257" height="434">
+		.d2-3451263933 .color-AB5{color:#313244;}.appendix text.text{fill:#CDD6F4}.md{--color-fg-default:#CDD6F4;--color-fg-muted:#BAC2DE;--color-fg-subtle:#A6ADC8;--color-canvas-default:#1E1E2E;--color-canvas-subtle:#313244;--color-border-default:#CBA6f7;--color-border-muted:#CBA6f7;--color-neutral-muted:#313244;--color-accent-fg:#CBA6f7;--color-accent-emphasis:#CBA6f7;--color-attention-subtle:#BAC2DE;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-B2{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-B3{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-B4{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-B5{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B6{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-AA2{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-AA4{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-AA5{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-AB4{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-AB5{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N1{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N2{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N5{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N6{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N7{fill:url(#streaks-darker);mix-blend-mode:lighten}.light-code{display: none}.dark-code{display: block}]]></style><g id="a"><g class="shape" ><rect x="1.000000" y="0.000000" width="54.000000" height="66.000000" stroke="#CBA6f7" fill="#313244" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="28.000000" y="38.500000" fill="#CDD6F4" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">a</text></g><g id="b"><g class="shape" ><rect x="0.000000" y="166.000000" width="55.000000" height="66.000000" stroke="#CBA6f7" fill="#313244" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="27.500000" y="204.500000" fill="#CDD6F4" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">b</text></g><g id="(a -&gt; b)[0]"><marker id="mk-3488378134" markerWidth="10.000000" markerHeight="12.000000" refX="7.000000" refY="6.000000" viewBox="0.000000 0.000000 10.000000 12.000000" orient="auto" markerUnits="userSpaceOnUse"> <polygon points="0.000000,0.000000 10.000000,6.000000 0.000000,12.000000" fill="#CBA6f7" class="connection fill-B1" stroke-width="2" /> </marker><path d="M 27.500000 68.000000 C 27.500000 106.000000 27.500000 126.000000 27.500000 162.000000" stroke="#CBA6f7" fill="none" class="connection stroke-B1" style="stroke-width:2;" marker-end="url(#mk-3488378134)" mask="url(#d2-3451263933)" /></g><mask id="d2-3451263933" maskUnits="userSpaceOnUse" x="-101" y="-101" width="257" height="434">
->>>>>>> 33280fed5 (fixed e2e tests)
 <rect x="-101" y="-101" width="257" height="434" fill="white"></rect>
 <rect x="23.500000" y="22.500000" width="9" height="21" fill="rgba(0,0,0,0.75)"></rect>
 <rect x="22.500000" y="188.500000" width="10" height="21" fill="rgba(0,0,0,0.75)"></rect>

d2renderers/d2svg/dark_theme/testdata/child_to_child/dark_theme.exp.svg

@@ -1,26 +1,4 @@
-<<<<<<< HEAD
+<?xml version="1.0" encoding="utf-8"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" d2Version="v0.6.8-HEAD" preserveAspectRatio="xMinYMin meet" viewBox="0 0 350 634"><svg id="d2-svg" class="d2-1306478287" width="350" height="634" viewBox="-91 -121 350 634"><rect x="-91.000000" y="-121.000000" width="350.000000" height="634.000000" rx="0.000000" fill="#1E1E2E" class=" fill-N7" stroke-width="0" /><style type="text/css"><![CDATA[
-<<<<<<< HEAD
-<?xml version="1.0" encoding="utf-8"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" d2Version="v0.6.8-HEAD" preserveAspectRatio="xMinYMin meet" viewBox="0 0 350 634"><svg id="d2-svg" class="d2-914436609" width="350" height="634" viewBox="-91 -121 350 634"><rect x="-91.000000" y="-121.000000" width="350.000000" height="634.000000" rx="0.000000" fill="#1E1E2E" class=" fill-N7" stroke-width="0" /><style type="text/css"><![CDATA[
-||||||| parent of 33280fed5 (fixed e2e tests)
-<?xml version="1.0" encoding="utf-8"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" d2Version="v0.6.6-HEAD" preserveAspectRatio="xMinYMin meet" viewBox="0 0 350 634"><svg id="d2-svg" class="d2-914436609" width="350" height="634" viewBox="-91 -121 350 634"><rect x="-91.000000" y="-121.000000" width="350.000000" height="634.000000" rx="0.000000" class=" fill-N7" stroke-width="0" /><style type="text/css"><![CDATA[
-=======
-<<<<<<< HEAD
-<?xml version="1.0" encoding="utf-8"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" d2Version="v0.6.6-HEAD" preserveAspectRatio="xMinYMin meet" viewBox="0 0 350 634"><svg id="d2-svg" class="d2-914436609" width="350" height="634" viewBox="-91 -121 350 634"><rect x="-91.000000" y="-121.000000" width="350.000000" height="634.000000" rx="0.000000" class=" fill-N7" stroke-width="0" /><style type="text/css"><![CDATA[
->>>>>>> 33280fed5 (fixed e2e tests)
-.d2-914436609 .text {
-	font-family: "d2-914436609-font-regular";
-=======
-<?xml version="1.0" encoding="utf-8"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" d2Version="v0.6.5-HEAD" preserveAspectRatio="xMinYMin meet" viewBox="0 0 350 634"><svg id="d2-svg" class="d2-1306478287" width="350" height="634" viewBox="-91 -121 350 634"><rect x="-91.000000" y="-121.000000" width="350.000000" height="634.000000" rx="0.000000" class=" fill-N7" stroke-width="0" /><style type="text/css"><![CDATA[
-||||||| parent of cb2f2823c (Fix changes)
-<<<<<<< HEAD
-<?xml version="1.0" encoding="utf-8"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" d2Version="v0.6.6-HEAD" preserveAspectRatio="xMinYMin meet" viewBox="0 0 350 634"><svg id="d2-svg" class="d2-914436609" width="350" height="634" viewBox="-91 -121 350 634"><rect x="-91.000000" y="-121.000000" width="350.000000" height="634.000000" rx="0.000000" class=" fill-N7" stroke-width="0" /><style type="text/css"><![CDATA[
-.d2-914436609 .text {
-	font-family: "d2-914436609-font-regular";
-=======
-<?xml version="1.0" encoding="utf-8"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" d2Version="v0.6.5-HEAD" preserveAspectRatio="xMinYMin meet" viewBox="0 0 350 634"><svg id="d2-svg" class="d2-1306478287" width="350" height="634" viewBox="-91 -121 350 634"><rect x="-91.000000" y="-121.000000" width="350.000000" height="634.000000" rx="0.000000" class=" fill-N7" stroke-width="0" /><style type="text/css"><![CDATA[
-=======
-<?xml version="1.0" encoding="utf-8"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" d2Version="v0.6.6-HEAD" preserveAspectRatio="xMinYMin meet" viewBox="0 0 350 634"><svg id="d2-svg" class="d2-1306478287" width="350" height="634" viewBox="-91 -121 350 634"><rect x="-91.000000" y="-121.000000" width="350.000000" height="634.000000" rx="0.000000" class=" fill-N7" stroke-width="0" /><style type="text/css"><![CDATA[
->>>>>>> cb2f2823c (Fix changes)
 .d2-1306478287 .text {
 	font-family: "d2-1306478287-font-regular";
 }
@@ -47,153 +25,6 @@
   opacity: 0.5;
 }
 
-<<<<<<< HEAD
-		.d2-914436609 .fill-N1{fill:#CDD6F4;}
-		.d2-914436609 .fill-N2{fill:#BAC2DE;}
-		.d2-914436609 .fill-N3{fill:#A6ADC8;}
-		.d2-914436609 .fill-N4{fill:#585B70;}
-		.d2-914436609 .fill-N5{fill:#45475A;}
-		.d2-914436609 .fill-N6{fill:#313244;}
-		.d2-914436609 .fill-N7{fill:#1E1E2E;}
-		.d2-914436609 .fill-B1{fill:#CBA6f7;}
-		.d2-914436609 .fill-B2{fill:#CBA6f7;}
-		.d2-914436609 .fill-B3{fill:#6C7086;}
-		.d2-914436609 .fill-B4{fill:#585B70;}
-		.d2-914436609 .fill-B5{fill:#45475A;}
-		.d2-914436609 .fill-B6{fill:#313244;}
-		.d2-914436609 .fill-AA2{fill:#f38BA8;}
-		.d2-914436609 .fill-AA4{fill:#45475A;}
-		.d2-914436609 .fill-AA5{fill:#313244;}
-		.d2-914436609 .fill-AB4{fill:#45475A;}
-		.d2-914436609 .fill-AB5{fill:#313244;}
-		.d2-914436609 .stroke-N1{stroke:#CDD6F4;}
-		.d2-914436609 .stroke-N2{stroke:#BAC2DE;}
-		.d2-914436609 .stroke-N3{stroke:#A6ADC8;}
-		.d2-914436609 .stroke-N4{stroke:#585B70;}
-		.d2-914436609 .stroke-N5{stroke:#45475A;}
-		.d2-914436609 .stroke-N6{stroke:#313244;}
-		.d2-914436609 .stroke-N7{stroke:#1E1E2E;}
-		.d2-914436609 .stroke-B1{stroke:#CBA6f7;}
-		.d2-914436609 .stroke-B2{stroke:#CBA6f7;}
-		.d2-914436609 .stroke-B3{stroke:#6C7086;}
-		.d2-914436609 .stroke-B4{stroke:#585B70;}
-		.d2-914436609 .stroke-B5{stroke:#45475A;}
-		.d2-914436609 .stroke-B6{stroke:#313244;}
-		.d2-914436609 .stroke-AA2{stroke:#f38BA8;}
-		.d2-914436609 .stroke-AA4{stroke:#45475A;}
-		.d2-914436609 .stroke-AA5{stroke:#313244;}
-		.d2-914436609 .stroke-AB4{stroke:#45475A;}
-		.d2-914436609 .stroke-AB5{stroke:#313244;}
-		.d2-914436609 .background-color-N1{background-color:#CDD6F4;}
-		.d2-914436609 .background-color-N2{background-color:#BAC2DE;}
-		.d2-914436609 .background-color-N3{background-color:#A6ADC8;}
-		.d2-914436609 .background-color-N4{background-color:#585B70;}
-		.d2-914436609 .background-color-N5{background-color:#45475A;}
-		.d2-914436609 .background-color-N6{background-color:#313244;}
-		.d2-914436609 .background-color-N7{background-color:#1E1E2E;}
-		.d2-914436609 .background-color-B1{background-color:#CBA6f7;}
-		.d2-914436609 .background-color-B2{background-color:#CBA6f7;}
-		.d2-914436609 .background-color-B3{background-color:#6C7086;}
-		.d2-914436609 .background-color-B4{background-color:#585B70;}
-		.d2-914436609 .background-color-B5{background-color:#45475A;}
-		.d2-914436609 .background-color-B6{background-color:#313244;}
-		.d2-914436609 .background-color-AA2{background-color:#f38BA8;}
-		.d2-914436609 .background-color-AA4{background-color:#45475A;}
-		.d2-914436609 .background-color-AA5{background-color:#313244;}
-		.d2-914436609 .background-color-AB4{background-color:#45475A;}
-		.d2-914436609 .background-color-AB5{background-color:#313244;}
-		.d2-914436609 .color-N1{color:#CDD6F4;}
-		.d2-914436609 .color-N2{color:#BAC2DE;}
-		.d2-914436609 .color-N3{color:#A6ADC8;}
-		.d2-914436609 .color-N4{color:#585B70;}
-		.d2-914436609 .color-N5{color:#45475A;}
-		.d2-914436609 .color-N6{color:#313244;}
-		.d2-914436609 .color-N7{color:#1E1E2E;}
-		.d2-914436609 .color-B1{color:#CBA6f7;}
-		.d2-914436609 .color-B2{color:#CBA6f7;}
-		.d2-914436609 .color-B3{color:#6C7086;}
-		.d2-914436609 .color-B4{color:#585B70;}
-		.d2-914436609 .color-B5{color:#45475A;}
-		.d2-914436609 .color-B6{color:#313244;}
-		.d2-914436609 .color-AA2{color:#f38BA8;}
-		.d2-914436609 .color-AA4{color:#45475A;}
-		.d2-914436609 .color-AA5{color:#313244;}
-		.d2-914436609 .color-AB4{color:#45475A;}
-		.d2-914436609 .color-AB5{color:#313244;}.appendix text.text{fill:#CDD6F4}.md{--color-fg-default:#CDD6F4;--color-fg-muted:#BAC2DE;--color-fg-subtle:#A6ADC8;--color-canvas-default:#1E1E2E;--color-canvas-subtle:#313244;--color-border-default:#CBA6f7;--color-border-muted:#CBA6f7;--color-neutral-muted:#313244;--color-accent-fg:#CBA6f7;--color-accent-emphasis:#CBA6f7;--color-attention-subtle:#BAC2DE;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-B2{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-B3{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-B4{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-B5{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B6{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-AA2{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-AA4{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-AA5{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-AB4{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-AB5{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N1{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N2{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N5{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N6{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N7{fill:url(#streaks-darker);mix-blend-mode:lighten}.light-code{display: none}.dark-code{display: block}]]></style><g id="winter"><g class="shape" ><rect x="10.000000" y="20.000000" width="148.000000" height="126.000000" stroke="#CBA6f7" fill="#585B70" class=" stroke-B1 fill-B4" style="stroke-width:2;" /></g><text x="84.000000" y="7.000000" fill="#CDD6F4" class="text fill-N1" style="text-anchor:middle;font-size:28px">winter</text></g><g id="summer"><g class="shape" ><rect x="17.000000" y="286.000000" width="135.000000" height="126.000000" stroke="#CBA6f7" fill="#585B70" class=" stroke-B1 fill-B4" style="stroke-width:2;" /></g><text x="84.500000" y="273.000000" fill="#CDD6F4" class="text fill-N1" style="text-anchor:middle;font-size:28px">summer</text></g><g id="winter.snow"><g class="shape" ><rect x="40.000000" y="50.000000" width="88.000000" height="66.000000" stroke="#CBA6f7" fill="#45475A" class=" stroke-B1 fill-B5" style="stroke-width:2;" /></g><text x="84.000000" y="88.500000" fill="#CDD6F4" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">snow</text></g><g id="summer.sun"><g class="shape" ><rect x="47.000000" y="316.000000" width="75.000000" height="66.000000" stroke="#CBA6f7" fill="#45475A" class=" stroke-B1 fill-B5" style="stroke-width:2;" /></g><text x="84.500000" y="354.500000" fill="#CDD6F4" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">sun</text></g><g id="(winter.snow -&gt; summer.sun)[0]"><marker id="mk-3488378134" markerWidth="10.000000" markerHeight="12.000000" refX="7.000000" refY="6.000000" viewBox="0.000000 0.000000 10.000000 12.000000" orient="auto" markerUnits="userSpaceOnUse"> <polygon points="0.000000,0.000000 10.000000,6.000000 0.000000,12.000000" fill="#CBA6f7" class="connection fill-B1" stroke-width="2" /> </marker><path d="M 84.000000 118.000000 C 84.000000 156.000000 84.000000 176.000000 84.000000 191.000000 C 84.000000 206.000000 84.000000 276.000000 84.000000 312.000000" stroke="#CBA6f7" fill="none" class="connection stroke-B1" style="stroke-width:2;" marker-end="url(#mk-3488378134)" mask="url(#d2-914436609)" /></g><mask id="d2-914436609" maskUnits="userSpaceOnUse" x="-91" y="-121" width="350" height="634">
-||||||| parent of 33280fed5 (fixed e2e tests)
-		.d2-914436609 .fill-N1{fill:#CDD6F4;}
-		.d2-914436609 .fill-N2{fill:#BAC2DE;}
-		.d2-914436609 .fill-N3{fill:#A6ADC8;}
-		.d2-914436609 .fill-N4{fill:#585B70;}
-		.d2-914436609 .fill-N5{fill:#45475A;}
-		.d2-914436609 .fill-N6{fill:#313244;}
-		.d2-914436609 .fill-N7{fill:#1E1E2E;}
-		.d2-914436609 .fill-B1{fill:#CBA6f7;}
-		.d2-914436609 .fill-B2{fill:#CBA6f7;}
-		.d2-914436609 .fill-B3{fill:#6C7086;}
-		.d2-914436609 .fill-B4{fill:#585B70;}
-		.d2-914436609 .fill-B5{fill:#45475A;}
-		.d2-914436609 .fill-B6{fill:#313244;}
-		.d2-914436609 .fill-AA2{fill:#f38BA8;}
-		.d2-914436609 .fill-AA4{fill:#45475A;}
-		.d2-914436609 .fill-AA5{fill:#313244;}
-		.d2-914436609 .fill-AB4{fill:#45475A;}
-		.d2-914436609 .fill-AB5{fill:#313244;}
-		.d2-914436609 .stroke-N1{stroke:#CDD6F4;}
-		.d2-914436609 .stroke-N2{stroke:#BAC2DE;}
-		.d2-914436609 .stroke-N3{stroke:#A6ADC8;}
-		.d2-914436609 .stroke-N4{stroke:#585B70;}
-		.d2-914436609 .stroke-N5{stroke:#45475A;}
-		.d2-914436609 .stroke-N6{stroke:#313244;}
-		.d2-914436609 .stroke-N7{stroke:#1E1E2E;}
-		.d2-914436609 .stroke-B1{stroke:#CBA6f7;}
-		.d2-914436609 .stroke-B2{stroke:#CBA6f7;}
-		.d2-914436609 .stroke-B3{stroke:#6C7086;}
-		.d2-914436609 .stroke-B4{stroke:#585B70;}
-		.d2-914436609 .stroke-B5{stroke:#45475A;}
-		.d2-914436609 .stroke-B6{stroke:#313244;}
-		.d2-914436609 .stroke-AA2{stroke:#f38BA8;}
-		.d2-914436609 .stroke-AA4{stroke:#45475A;}
-		.d2-914436609 .stroke-AA5{stroke:#313244;}
-		.d2-914436609 .stroke-AB4{stroke:#45475A;}
-		.d2-914436609 .stroke-AB5{stroke:#313244;}
-		.d2-914436609 .background-color-N1{background-color:#CDD6F4;}
-		.d2-914436609 .background-color-N2{background-color:#BAC2DE;}
-		.d2-914436609 .background-color-N3{background-color:#A6ADC8;}
-		.d2-914436609 .background-color-N4{background-color:#585B70;}
-		.d2-914436609 .background-color-N5{background-color:#45475A;}
-		.d2-914436609 .background-color-N6{background-color:#313244;}
-		.d2-914436609 .background-color-N7{background-color:#1E1E2E;}
-		.d2-914436609 .background-color-B1{background-color:#CBA6f7;}
-		.d2-914436609 .background-color-B2{background-color:#CBA6f7;}
-		.d2-914436609 .background-color-B3{background-color:#6C7086;}
-		.d2-914436609 .background-color-B4{background-color:#585B70;}
-		.d2-914436609 .background-color-B5{background-color:#45475A;}
-		.d2-914436609 .background-color-B6{background-color:#313244;}
-		.d2-914436609 .background-color-AA2{background-color:#f38BA8;}
-		.d2-914436609 .background-color-AA4{background-color:#45475A;}
-		.d2-914436609 .background-color-AA5{background-color:#313244;}
-		.d2-914436609 .background-color-AB4{background-color:#45475A;}
-		.d2-914436609 .background-color-AB5{background-color:#313244;}
-		.d2-914436609 .color-N1{color:#CDD6F4;}
-		.d2-914436609 .color-N2{color:#BAC2DE;}
-		.d2-914436609 .color-N3{color:#A6ADC8;}
-		.d2-914436609 .color-N4{color:#585B70;}
-		.d2-914436609 .color-N5{color:#45475A;}
-		.d2-914436609 .color-N6{color:#313244;}
-		.d2-914436609 .color-N7{color:#1E1E2E;}
-		.d2-914436609 .color-B1{color:#CBA6f7;}
-		.d2-914436609 .color-B2{color:#CBA6f7;}
-		.d2-914436609 .color-B3{color:#6C7086;}
-		.d2-914436609 .color-B4{color:#585B70;}
-		.d2-914436609 .color-B5{color:#45475A;}
-		.d2-914436609 .color-B6{color:#313244;}
-		.d2-914436609 .color-AA2{color:#f38BA8;}
-		.d2-914436609 .color-AA4{color:#45475A;}
-		.d2-914436609 .color-AA5{color:#313244;}
-		.d2-914436609 .color-AB4{color:#45475A;}
-		.d2-914436609 .color-AB5{color:#313244;}.appendix text.text{fill:#CDD6F4}.md{--color-fg-default:#CDD6F4;--color-fg-muted:#BAC2DE;--color-fg-subtle:#A6ADC8;--color-canvas-default:#1E1E2E;--color-canvas-subtle:#313244;--color-border-default:#CBA6f7;--color-border-muted:#CBA6f7;--color-neutral-muted:#313244;--color-accent-fg:#CBA6f7;--color-accent-emphasis:#CBA6f7;--color-attention-subtle:#BAC2DE;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-B2{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-B3{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-B4{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-B5{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B6{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-AA2{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-AA4{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-AA5{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-AB4{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-AB5{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N1{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N2{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N5{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N6{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N7{fill:url(#streaks-darker);mix-blend-mode:lighten}.light-code{display: none}.dark-code{display: block}]]></style><g id="winter"><g class="shape" ><rect x="10.000000" y="20.000000" width="148.000000" height="126.000000" class=" stroke-B1 fill-B4" style="stroke-width:2;" /></g><text x="84.000000" y="7.000000" class="text fill-N1" style="text-anchor:middle;font-size:28px">winter</text></g><g id="summer"><g class="shape" ><rect x="17.000000" y="286.000000" width="135.000000" height="126.000000" class=" stroke-B1 fill-B4" style="stroke-width:2;" /></g><text x="84.500000" y="273.000000" class="text fill-N1" style="text-anchor:middle;font-size:28px">summer</text></g><g id="winter.snow"><g class="shape" ><rect x="40.000000" y="50.000000" width="88.000000" height="66.000000" class=" stroke-B1 fill-B5" style="stroke-width:2;" /></g><text x="84.000000" y="88.500000" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">snow</text></g><g id="summer.sun"><g class="shape" ><rect x="47.000000" y="316.000000" width="75.000000" height="66.000000" class=" stroke-B1 fill-B5" style="stroke-width:2;" /></g><text x="84.500000" y="354.500000" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">sun</text></g><g id="(winter.snow -&gt; summer.sun)[0]"><marker id="mk-3488378134" markerWidth="10.000000" markerHeight="12.000000" refX="7.000000" refY="6.000000" viewBox="0.000000 0.000000 10.000000 12.000000" orient="auto" markerUnits="userSpaceOnUse"> <polygon points="0.000000,0.000000 10.000000,6.000000 0.000000,12.000000" class="connection fill-B1" stroke-width="2" /> </marker><path d="M 84.000000 118.000000 C 84.000000 156.000000 84.000000 176.000000 84.000000 191.000000 C 84.000000 206.000000 84.000000 276.000000 84.000000 312.000000" fill="none" class="connection stroke-B1" style="stroke-width:2;" marker-end="url(#mk-3488378134)" mask="url(#d2-914436609)" /></g><mask id="d2-914436609" maskUnits="userSpaceOnUse" x="-91" y="-121" width="350" height="634">
-=======
 		.d2-1306478287 .fill-N1{fill:#CDD6F4;}
 		.d2-1306478287 .fill-N2{fill:#BAC2DE;}
 		.d2-1306478287 .fill-N3{fill:#A6ADC8;}
@@ -265,8 +96,7 @@
 		.d2-1306478287 .color-AA4{color:#45475A;}
 		.d2-1306478287 .color-AA5{color:#313244;}
 		.d2-1306478287 .color-AB4{color:#45475A;}
-		.d2-1306478287 .color-AB5{color:#313244;}.appendix text.text{fill:#CDD6F4}.md{--color-fg-default:#CDD6F4;--color-fg-muted:#BAC2DE;--color-fg-subtle:#A6ADC8;--color-canvas-default:#1E1E2E;--color-canvas-subtle:#313244;--color-border-default:#CBA6f7;--color-border-muted:#CBA6f7;--color-neutral-muted:#313244;--color-accent-fg:#CBA6f7;--color-accent-emphasis:#CBA6f7;--color-attention-subtle:#BAC2DE;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-B2{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-B3{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-B4{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-B5{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B6{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-AA2{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-AA4{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-AA5{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-AB4{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-AB5{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N1{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N2{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N5{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N6{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N7{fill:url(#streaks-darker);mix-blend-mode:lighten}.light-code{display: none}.dark-code{display: block}]]></style><g id="winter"><g class="shape" ><rect x="10.000000" y="20.000000" width="148.000000" height="126.000000" class=" stroke-B1 fill-B4" style="stroke-width:2;" /></g><text x="84.000000" y="7.000000" class="text fill-N1" style="text-anchor:middle;font-size:28px">winter</text></g><g id="summer"><g class="shape" ><rect x="17.000000" y="286.000000" width="135.000000" height="126.000000" class=" stroke-B1 fill-B4" style="stroke-width:2;" /></g><text x="84.500000" y="273.000000" class="text fill-N1" style="text-anchor:middle;font-size:28px">summer</text></g><g id="winter.snow"><g class="shape" ><rect x="40.000000" y="50.000000" width="88.000000" height="66.000000" class=" stroke-B1 fill-B5" style="stroke-width:2;" /></g><text x="84.000000" y="88.500000" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">snow</text></g><g id="summer.sun"><g class="shape" ><rect x="47.000000" y="316.000000" width="75.000000" height="66.000000" class=" stroke-B1 fill-B5" style="stroke-width:2;" /></g><text x="84.500000" y="354.500000" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">sun</text></g><g id="(winter.snow -&gt; summer.sun)[0]"><marker id="mk-3488378134" markerWidth="10.000000" markerHeight="12.000000" refX="7.000000" refY="6.000000" viewBox="0.000000 0.000000 10.000000 12.000000" orient="auto" markerUnits="userSpaceOnUse"> <polygon points="0.000000,0.000000 10.000000,6.000000 0.000000,12.000000" class="connection fill-B1" stroke-width="2" /> </marker><path d="M 84.000000 118.000000 C 84.000000 156.000000 84.000000 176.000000 84.000000 191.000000 C 84.000000 206.000000 84.000000 276.000000 84.000000 312.000000" fill="none" class="connection stroke-B1" style="stroke-width:2;" marker-end="url(#mk-3488378134)" mask="url(#d2-1306478287)" /></g><mask id="d2-1306478287" maskUnits="userSpaceOnUse" x="-91" y="-121" width="350" height="634">
+		.d2-1306478287 .color-AB5{color:#313244;}.appendix text.text{fill:#CDD6F4}.md{--color-fg-default:#CDD6F4;--color-fg-muted:#BAC2DE;--color-fg-subtle:#A6ADC8;--color-canvas-default:#1E1E2E;--color-canvas-subtle:#313244;--color-border-default:#CBA6f7;--color-border-muted:#CBA6f7;--color-neutral-muted:#313244;--color-accent-fg:#CBA6f7;--color-accent-emphasis:#CBA6f7;--color-attention-subtle:#BAC2DE;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-B2{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-B3{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-B4{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-B5{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B6{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-AA2{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-AA4{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-AA5{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-AB4{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-AB5{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N1{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N2{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N5{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N6{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N7{fill:url(#streaks-darker);mix-blend-mode:lighten}.light-code{display: none}.dark-code{display: block}]]></style><g id="winter"><g class="shape" ><rect x="10.000000" y="20.000000" width="148.000000" height="126.000000" stroke="#CBA6f7" fill="#585B70" class=" stroke-B1 fill-B4" style="stroke-width:2;" /></g><text x="84.000000" y="7.000000" fill="#CDD6F4" class="text fill-N1" style="text-anchor:middle;font-size:28px">winter</text></g><g id="summer"><g class="shape" ><rect x="17.000000" y="286.000000" width="135.000000" height="126.000000" stroke="#CBA6f7" fill="#585B70" class=" stroke-B1 fill-B4" style="stroke-width:2;" /></g><text x="84.500000" y="273.000000" fill="#CDD6F4" class="text fill-N1" style="text-anchor:middle;font-size:28px">summer</text></g><g id="winter.snow"><g class="shape" ><rect x="40.000000" y="50.000000" width="88.000000" height="66.000000" stroke="#CBA6f7" fill="#45475A" class=" stroke-B1 fill-B5" style="stroke-width:2;" /></g><text x="84.000000" y="88.500000" fill="#CDD6F4" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">snow</text></g><g id="summer.sun"><g class="shape" ><rect x="47.000000" y="316.000000" width="75.000000" height="66.000000" stroke="#CBA6f7" fill="#45475A" class=" stroke-B1 fill-B5" style="stroke-width:2;" /></g><text x="84.500000" y="354.500000" fill="#CDD6F4" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">sun</text></g><g id="(winter.snow -&gt; summer.sun)[0]"><marker id="mk-3488378134" markerWidth="10.000000" markerHeight="12.000000" refX="7.000000" refY="6.000000" viewBox="0.000000 0.000000 10.000000 12.000000" orient="auto" markerUnits="userSpaceOnUse"> <polygon points="0.000000,0.000000 10.000000,6.000000 0.000000,12.000000" fill="#CBA6f7" class="connection fill-B1" stroke-width="2" /> </marker><path d="M 84.000000 118.000000 C 84.000000 156.000000 84.000000 176.000000 84.000000 191.000000 C 84.000000 206.000000 84.000000 276.000000 84.000000 312.000000" stroke="#CBA6f7" fill="none" class="connection stroke-B1" style="stroke-width:2;" marker-end="url(#mk-3488378134)" mask="url(#d2-1306478287)" /></g><mask id="d2-1306478287" maskUnits="userSpaceOnUse" x="-91" y="-121" width="350" height="634">
->>>>>>> 33280fed5 (fixed e2e tests)
 <rect x="-91" y="-121" width="350" height="634" fill="white"></rect>
 <rect x="38.500000" y="-21.000000" width="91" height="36" fill="rgba(0,0,0,0.75)"></rect>
 <rect x="31.000000" y="245.000000" width="107" height="36" fill="rgba(0,0,0,0.75)"></rect>

d2renderers/d2svg/dark_theme/testdata/connection_label/dark_theme.exp.svg

@@ -1,26 +1,4 @@
-<<<<<<< HEAD
+<?xml version="1.0" encoding="utf-8"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" d2Version="v0.6.8-HEAD" preserveAspectRatio="xMinYMin meet" viewBox="0 0 257 455"><svg id="d2-svg" class="d2-1929145507" width="257" height="455" viewBox="-101 -101 257 455"><rect x="-101.000000" y="-101.000000" width="257.000000" height="455.000000" rx="0.000000" fill="#1E1E2E" class=" fill-N7" stroke-width="0" /><style type="text/css"><![CDATA[
-<<<<<<< HEAD
-<?xml version="1.0" encoding="utf-8"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" d2Version="v0.6.8-HEAD" preserveAspectRatio="xMinYMin meet" viewBox="0 0 257 455"><svg id="d2-svg" class="d2-2029734873" width="257" height="455" viewBox="-101 -101 257 455"><rect x="-101.000000" y="-101.000000" width="257.000000" height="455.000000" rx="0.000000" fill="#1E1E2E" class=" fill-N7" stroke-width="0" /><style type="text/css"><![CDATA[
-||||||| parent of 33280fed5 (fixed e2e tests)
-<?xml version="1.0" encoding="utf-8"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" d2Version="v0.6.6-HEAD" preserveAspectRatio="xMinYMin meet" viewBox="0 0 257 455"><svg id="d2-svg" class="d2-2029734873" width="257" height="455" viewBox="-101 -101 257 455"><rect x="-101.000000" y="-101.000000" width="257.000000" height="455.000000" rx="0.000000" class=" fill-N7" stroke-width="0" /><style type="text/css"><![CDATA[
-=======
-<<<<<<< HEAD
-<?xml version="1.0" encoding="utf-8"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" d2Version="v0.6.6-HEAD" preserveAspectRatio="xMinYMin meet" viewBox="0 0 257 455"><svg id="d2-svg" class="d2-2029734873" width="257" height="455" viewBox="-101 -101 257 455"><rect x="-101.000000" y="-101.000000" width="257.000000" height="455.000000" rx="0.000000" class=" fill-N7" stroke-width="0" /><style type="text/css"><![CDATA[
->>>>>>> 33280fed5 (fixed e2e tests)
-.d2-2029734873 .text-bold {
-	font-family: "d2-2029734873-font-bold";
-=======
-<?xml version="1.0" encoding="utf-8"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" d2Version="v0.6.5-HEAD" preserveAspectRatio="xMinYMin meet" viewBox="0 0 257 455"><svg id="d2-svg" class="d2-1929145507" width="257" height="455" viewBox="-101 -101 257 455"><rect x="-101.000000" y="-101.000000" width="257.000000" height="455.000000" rx="0.000000" class=" fill-N7" stroke-width="0" /><style type="text/css"><![CDATA[
-||||||| parent of cb2f2823c (Fix changes)
-<<<<<<< HEAD
-<?xml version="1.0" encoding="utf-8"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" d2Version="v0.6.6-HEAD" preserveAspectRatio="xMinYMin meet" viewBox="0 0 257 455"><svg id="d2-svg" class="d2-2029734873" width="257" height="455" viewBox="-101 -101 257 455"><rect x="-101.000000" y="-101.000000" width="257.000000" height="455.000000" rx="0.000000" class=" fill-N7" stroke-width="0" /><style type="text/css"><![CDATA[
-.d2-2029734873 .text-bold {
-	font-family: "d2-2029734873-font-bold";
-=======
-<?xml version="1.0" encoding="utf-8"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" d2Version="v0.6.5-HEAD" preserveAspectRatio="xMinYMin meet" viewBox="0 0 257 455"><svg id="d2-svg" class="d2-1929145507" width="257" height="455" viewBox="-101 -101 257 455"><rect x="-101.000000" y="-101.000000" width="257.000000" height="455.000000" rx="0.000000" class=" fill-N7" stroke-width="0" /><style type="text/css"><![CDATA[
-=======
-<?xml version="1.0" encoding="utf-8"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" d2Version="v0.6.6-HEAD" preserveAspectRatio="xMinYMin meet" viewBox="0 0 257 455"><svg id="d2-svg" class="d2-1929145507" width="257" height="455" viewBox="-101 -101 257 455"><rect x="-101.000000" y="-101.000000" width="257.000000" height="455.000000" rx="0.000000" class=" fill-N7" stroke-width="0" /><style type="text/css"><![CDATA[
->>>>>>> cb2f2823c (Fix changes)
 .d2-1929145507 .text-bold {
 	font-family: "d2-1929145507-font-bold";
 }
@@ -47,153 +25,6 @@
   opacity: 0.5;
 }
 
-<<<<<<< HEAD
-		.d2-2029734873 .fill-N1{fill:#CDD6F4;}
-		.d2-2029734873 .fill-N2{fill:#BAC2DE;}
-		.d2-2029734873 .fill-N3{fill:#A6ADC8;}
-		.d2-2029734873 .fill-N4{fill:#585B70;}
-		.d2-2029734873 .fill-N5{fill:#45475A;}
-		.d2-2029734873 .fill-N6{fill:#313244;}
-		.d2-2029734873 .fill-N7{fill:#1E1E2E;}
-		.d2-2029734873 .fill-B1{fill:#CBA6f7;}
-		.d2-2029734873 .fill-B2{fill:#CBA6f7;}
-		.d2-2029734873 .fill-B3{fill:#6C7086;}
-		.d2-2029734873 .fill-B4{fill:#585B70;}
-		.d2-2029734873 .fill-B5{fill:#45475A;}
-		.d2-2029734873 .fill-B6{fill:#313244;}
-		.d2-2029734873 .fill-AA2{fill:#f38BA8;}
-		.d2-2029734873 .fill-AA4{fill:#45475A;}
-		.d2-2029734873 .fill-AA5{fill:#313244;}
-		.d2-2029734873 .fill-AB4{fill:#45475A;}
-		.d2-2029734873 .fill-AB5{fill:#313244;}
-		.d2-2029734873 .stroke-N1{stroke:#CDD6F4;}
-		.d2-2029734873 .stroke-N2{stroke:#BAC2DE;}
-		.d2-2029734873 .stroke-N3{stroke:#A6ADC8;}
-		.d2-2029734873 .stroke-N4{stroke:#585B70;}
-		.d2-2029734873 .stroke-N5{stroke:#45475A;}
-		.d2-2029734873 .stroke-N6{stroke:#313244;}
-		.d2-2029734873 .stroke-N7{stroke:#1E1E2E;}
-		.d2-2029734873 .stroke-B1{stroke:#CBA6f7;}
-		.d2-2029734873 .stroke-B2{stroke:#CBA6f7;}
-		.d2-2029734873 .stroke-B3{stroke:#6C7086;}
-		.d2-2029734873 .stroke-B4{stroke:#585B70;}
-		.d2-2029734873 .stroke-B5{stroke:#45475A;}
-		.d2-2029734873 .stroke-B6{stroke:#313244;}
-		.d2-2029734873 .stroke-AA2{stroke:#f38BA8;}
-		.d2-2029734873 .stroke-AA4{stroke:#45475A;}
-		.d2-2029734873 .stroke-AA5{stroke:#313244;}
-		.d2-2029734873 .stroke-AB4{stroke:#45475A;}
-		.d2-2029734873 .stroke-AB5{stroke:#313244;}
-		.d2-2029734873 .background-color-N1{background-color:#CDD6F4;}
-		.d2-2029734873 .background-color-N2{background-color:#BAC2DE;}
-		.d2-2029734873 .background-color-N3{background-color:#A6ADC8;}
-		.d2-2029734873 .background-color-N4{background-color:#585B70;}
-		.d2-2029734873 .background-color-N5{background-color:#45475A;}
-		.d2-2029734873 .background-color-N6{background-color:#313244;}
-		.d2-2029734873 .background-color-N7{background-color:#1E1E2E;}
-		.d2-2029734873 .background-color-B1{background-color:#CBA6f7;}
-		.d2-2029734873 .background-color-B2{background-color:#CBA6f7;}
-		.d2-2029734873 .background-color-B3{background-color:#6C7086;}
-		.d2-2029734873 .background-color-B4{background-color:#585B70;}
-		.d2-2029734873 .background-color-B5{background-color:#45475A;}
-		.d2-2029734873 .background-color-B6{background-color:#313244;}
-		.d2-2029734873 .background-color-AA2{background-color:#f38BA8;}
-		.d2-2029734873 .background-color-AA4{background-color:#45475A;}
-		.d2-2029734873 .background-color-AA5{background-color:#313244;}
-		.d2-2029734873 .background-color-AB4{background-color:#45475A;}
-		.d2-2029734873 .background-color-AB5{background-color:#313244;}
-		.d2-2029734873 .color-N1{color:#CDD6F4;}
-		.d2-2029734873 .color-N2{color:#BAC2DE;}
-		.d2-2029734873 .color-N3{color:#A6ADC8;}
-		.d2-2029734873 .color-N4{color:#585B70;}
-		.d2-2029734873 .color-N5{color:#45475A;}
-		.d2-2029734873 .color-N6{color:#313244;}
-		.d2-2029734873 .color-N7{color:#1E1E2E;}
-		.d2-2029734873 .color-B1{color:#CBA6f7;}
-		.d2-2029734873 .color-B2{color:#CBA6f7;}
-		.d2-2029734873 .color-B3{color:#6C7086;}
-		.d2-2029734873 .color-B4{color:#585B70;}
-		.d2-2029734873 .color-B5{color:#45475A;}
-		.d2-2029734873 .color-B6{color:#313244;}
-		.d2-2029734873 .color-AA2{color:#f38BA8;}
-		.d2-2029734873 .color-AA4{color:#45475A;}
-		.d2-2029734873 .color-AA5{color:#313244;}
-		.d2-2029734873 .color-AB4{color:#45475A;}
-		.d2-2029734873 .color-AB5{color:#313244;}.appendix text.text{fill:#CDD6F4}.md{--color-fg-default:#CDD6F4;--color-fg-muted:#BAC2DE;--color-fg-subtle:#A6ADC8;--color-canvas-default:#1E1E2E;--color-canvas-subtle:#313244;--color-border-default:#CBA6f7;--color-border-muted:#CBA6f7;--color-neutral-muted:#313244;--color-accent-fg:#CBA6f7;--color-accent-emphasis:#CBA6f7;--color-attention-subtle:#BAC2DE;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-B2{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-B3{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-B4{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-B5{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B6{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-AA2{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-AA4{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-AA5{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-AB4{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-AB5{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N1{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N2{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N5{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N6{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N7{fill:url(#streaks-darker);mix-blend-mode:lighten}.light-code{display: none}.dark-code{display: block}]]></style><g id="a"><g class="shape" ><rect x="1.000000" y="0.000000" width="54.000000" height="66.000000" stroke="#CBA6f7" fill="#313244" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="28.000000" y="38.500000" fill="#CDD6F4" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">a</text></g><g id="b"><g class="shape" ><rect x="0.000000" y="187.000000" width="55.000000" height="66.000000" stroke="#CBA6f7" fill="#313244" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="27.500000" y="225.500000" fill="#CDD6F4" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">b</text></g><g id="(a -&gt; b)[0]"><marker id="mk-3488378134" markerWidth="10.000000" markerHeight="12.000000" refX="7.000000" refY="6.000000" viewBox="0.000000 0.000000 10.000000 12.000000" orient="auto" markerUnits="userSpaceOnUse"> <polygon points="0.000000,0.000000 10.000000,6.000000 0.000000,12.000000" fill="#CBA6f7" class="connection fill-B1" stroke-width="2" /> </marker><path d="M 27.500000 67.500000 C 27.500000 114.300003 27.500000 138.699997 27.500000 183.500000" stroke="#CBA6f7" fill="none" class="connection stroke-B1" style="stroke-width:2;" marker-end="url(#mk-3488378134)" mask="url(#d2-2029734873)" /><text x="28.000000" y="132.000000" fill="#BAC2DE" class="text-italic fill-N2" style="text-anchor:middle;font-size:16px">hello</text></g><mask id="d2-2029734873" maskUnits="userSpaceOnUse" x="-101" y="-101" width="257" height="455">
-||||||| parent of 33280fed5 (fixed e2e tests)
-		.d2-2029734873 .fill-N1{fill:#CDD6F4;}
-		.d2-2029734873 .fill-N2{fill:#BAC2DE;}
-		.d2-2029734873 .fill-N3{fill:#A6ADC8;}
-		.d2-2029734873 .fill-N4{fill:#585B70;}
-		.d2-2029734873 .fill-N5{fill:#45475A;}
-		.d2-2029734873 .fill-N6{fill:#313244;}
-		.d2-2029734873 .fill-N7{fill:#1E1E2E;}
-		.d2-2029734873 .fill-B1{fill:#CBA6f7;}
-		.d2-2029734873 .fill-B2{fill:#CBA6f7;}
-		.d2-2029734873 .fill-B3{fill:#6C7086;}
-		.d2-2029734873 .fill-B4{fill:#585B70;}
-		.d2-2029734873 .fill-B5{fill:#45475A;}
-		.d2-2029734873 .fill-B6{fill:#313244;}
-		.d2-2029734873 .fill-AA2{fill:#f38BA8;}
-		.d2-2029734873 .fill-AA4{fill:#45475A;}
-		.d2-2029734873 .fill-AA5{fill:#313244;}
-		.d2-2029734873 .fill-AB4{fill:#45475A;}
-		.d2-2029734873 .fill-AB5{fill:#313244;}
-		.d2-2029734873 .stroke-N1{stroke:#CDD6F4;}
-		.d2-2029734873 .stroke-N2{stroke:#BAC2DE;}
-		.d2-2029734873 .stroke-N3{stroke:#A6ADC8;}
-		.d2-2029734873 .stroke-N4{stroke:#585B70;}
-		.d2-2029734873 .stroke-N5{stroke:#45475A;}
-		.d2-2029734873 .stroke-N6{stroke:#313244;}
-		.d2-2029734873 .stroke-N7{stroke:#1E1E2E;}
-		.d2-2029734873 .stroke-B1{stroke:#CBA6f7;}
-		.d2-2029734873 .stroke-B2{stroke:#CBA6f7;}
-		.d2-2029734873 .stroke-B3{stroke:#6C7086;}
-		.d2-2029734873 .stroke-B4{stroke:#585B70;}
-		.d2-2029734873 .stroke-B5{stroke:#45475A;}
-		.d2-2029734873 .stroke-B6{stroke:#313244;}
-		.d2-2029734873 .stroke-AA2{stroke:#f38BA8;}
-		.d2-2029734873 .stroke-AA4{stroke:#45475A;}
-		.d2-2029734873 .stroke-AA5{stroke:#313244;}
-		.d2-2029734873 .stroke-AB4{stroke:#45475A;}
-		.d2-2029734873 .stroke-AB5{stroke:#313244;}
-		.d2-2029734873 .background-color-N1{background-color:#CDD6F4;}
-		.d2-2029734873 .background-color-N2{background-color:#BAC2DE;}
-		.d2-2029734873 .background-color-N3{background-color:#A6ADC8;}
-		.d2-2029734873 .background-color-N4{background-color:#585B70;}
-		.d2-2029734873 .background-color-N5{background-color:#45475A;}
-		.d2-2029734873 .background-color-N6{background-color:#313244;}
-		.d2-2029734873 .background-color-N7{background-color:#1E1E2E;}
-		.d2-2029734873 .background-color-B1{background-color:#CBA6f7;}
-		.d2-2029734873 .background-color-B2{background-color:#CBA6f7;}
-		.d2-2029734873 .background-color-B3{background-color:#6C7086;}
-		.d2-2029734873 .background-color-B4{background-color:#585B70;}
-		.d2-2029734873 .background-color-B5{background-color:#45475A;}
-		.d2-2029734873 .background-color-B6{background-color:#313244;}
-		.d2-2029734873 .background-color-AA2{background-color:#f38BA8;}
-		.d2-2029734873 .background-color-AA4{background-color:#45475A;}
-		.d2-2029734873 .background-color-AA5{background-color:#313244;}
-		.d2-2029734873 .background-color-AB4{background-color:#45475A;}
-		.d2-2029734873 .background-color-AB5{background-color:#313244;}
-		.d2-2029734873 .color-N1{color:#CDD6F4;}
-		.d2-2029734873 .color-N2{color:#BAC2DE;}
-		.d2-2029734873 .color-N3{color:#A6ADC8;}
-		.d2-2029734873 .color-N4{color:#585B70;}
-		.d2-2029734873 .color-N5{color:#45475A;}
-		.d2-2029734873 .color-N6{color:#313244;}
-		.d2-2029734873 .color-N7{color:#1E1E2E;}
-		.d2-2029734873 .color-B1{color:#CBA6f7;}
-		.d2-2029734873 .color-B2{color:#CBA6f7;}
-		.d2-2029734873 .color-B3{color:#6C7086;}
-		.d2-2029734873 .color-B4{color:#585B70;}
-		.d2-2029734873 .color-B5{color:#45475A;}
-		.d2-2029734873 .color-B6{color:#313244;}
-		.d2-2029734873 .color-AA2{color:#f38BA8;}
-		.d2-2029734873 .color-AA4{color:#45475A;}
-		.d2-2029734873 .color-AA5{color:#313244;}
-		.d2-2029734873 .color-AB4{color:#45475A;}
-		.d2-2029734873 .color-AB5{color:#313244;}.appendix text.text{fill:#CDD6F4}.md{--color-fg-default:#CDD6F4;--color-fg-muted:#BAC2DE;--color-fg-subtle:#A6ADC8;--color-canvas-default:#1E1E2E;--color-canvas-subtle:#313244;--color-border-default:#CBA6f7;--color-border-muted:#CBA6f7;--color-neutral-muted:#313244;--color-accent-fg:#CBA6f7;--color-accent-emphasis:#CBA6f7;--color-attention-subtle:#BAC2DE;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-B2{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-B3{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-B4{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-B5{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B6{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-AA2{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-AA4{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-AA5{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-AB4{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-AB5{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N1{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N2{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N5{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N6{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N7{fill:url(#streaks-darker);mix-blend-mode:lighten}.light-code{display: none}.dark-code{display: block}]]></style><g id="a"><g class="shape" ><rect x="1.000000" y="0.000000" width="54.000000" height="66.000000" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="28.000000" y="38.500000" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">a</text></g><g id="b"><g class="shape" ><rect x="0.000000" y="187.000000" width="55.000000" height="66.000000" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="27.500000" y="225.500000" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">b</text></g><g id="(a -&gt; b)[0]"><marker id="mk-3488378134" markerWidth="10.000000" markerHeight="12.000000" refX="7.000000" refY="6.000000" viewBox="0.000000 0.000000 10.000000 12.000000" orient="auto" markerUnits="userSpaceOnUse"> <polygon points="0.000000,0.000000 10.000000,6.000000 0.000000,12.000000" class="connection fill-B1" stroke-width="2" /> </marker><path d="M 27.500000 67.500000 C 27.500000 114.300003 27.500000 138.699997 27.500000 183.500000" fill="none" class="connection stroke-B1" style="stroke-width:2;" marker-end="url(#mk-3488378134)" mask="url(#d2-2029734873)" /><text x="28.000000" y="132.000000" class="text-italic fill-N2" style="text-anchor:middle;font-size:16px">hello</text></g><mask id="d2-2029734873" maskUnits="userSpaceOnUse" x="-101" y="-101" width="257" height="455">
-=======
 		.d2-1929145507 .fill-N1{fill:#CDD6F4;}
 		.d2-1929145507 .fill-N2{fill:#BAC2DE;}
 		.d2-1929145507 .fill-N3{fill:#A6ADC8;}
@@ -265,8 +96,7 @@
 		.d2-1929145507 .color-AA4{color:#45475A;}
 		.d2-1929145507 .color-AA5{color:#313244;}
 		.d2-1929145507 .color-AB4{color:#45475A;}
-		.d2-1929145507 .color-AB5{color:#313244;}.appendix text.text{fill:#CDD6F4}.md{--color-fg-default:#CDD6F4;--color-fg-muted:#BAC2DE;--color-fg-subtle:#A6ADC8;--color-canvas-default:#1E1E2E;--color-canvas-subtle:#313244;--color-border-default:#CBA6f7;--color-border-muted:#CBA6f7;--color-neutral-muted:#313244;--color-accent-fg:#CBA6f7;--color-accent-emphasis:#CBA6f7;--color-attention-subtle:#BAC2DE;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-B2{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-B3{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-B4{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-B5{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B6{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-AA2{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-AA4{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-AA5{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-AB4{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-AB5{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N1{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N2{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N5{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N6{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N7{fill:url(#streaks-darker);mix-blend-mode:lighten}.light-code{display: none}.dark-code{display: block}]]></style><g id="a"><g class="shape" ><rect x="1.000000" y="0.000000" width="54.000000" height="66.000000" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="28.000000" y="38.500000" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">a</text></g><g id="b"><g class="shape" ><rect x="0.000000" y="187.000000" width="55.000000" height="66.000000" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="27.500000" y="225.500000" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">b</text></g><g id="(a -&gt; b)[0]"><marker id="mk-3488378134" markerWidth="10.000000" markerHeight="12.000000" refX="7.000000" refY="6.000000" viewBox="0.000000 0.000000 10.000000 12.000000" orient="auto" markerUnits="userSpaceOnUse"> <polygon points="0.000000,0.000000 10.000000,6.000000 0.000000,12.000000" class="connection fill-B1" stroke-width="2" /> </marker><path d="M 27.500000 67.500000 C 27.500000 114.300003 27.500000 138.699997 27.500000 183.500000" fill="none" class="connection stroke-B1" style="stroke-width:2;" marker-end="url(#mk-3488378134)" mask="url(#d2-1929145507)" /><text x="28.000000" y="132.000000" class="text-italic fill-N2" style="text-anchor:middle;font-size:16px">hello</text></g><mask id="d2-1929145507" maskUnits="userSpaceOnUse" x="-101" y="-101" width="257" height="455">
+		.d2-1929145507 .color-AB5{color:#313244;}.appendix text.text{fill:#CDD6F4}.md{--color-fg-default:#CDD6F4;--color-fg-muted:#BAC2DE;--color-fg-subtle:#A6ADC8;--color-canvas-default:#1E1E2E;--color-canvas-subtle:#313244;--color-border-default:#CBA6f7;--color-border-muted:#CBA6f7;--color-neutral-muted:#313244;--color-accent-fg:#CBA6f7;--color-accent-emphasis:#CBA6f7;--color-attention-subtle:#BAC2DE;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-B2{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-B3{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-B4{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-B5{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B6{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-AA2{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-AA4{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-AA5{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-AB4{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-AB5{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N1{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N2{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N5{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N6{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N7{fill:url(#streaks-darker);mix-blend-mode:lighten}.light-code{display: none}.dark-code{display: block}]]></style><g id="a"><g class="shape" ><rect x="1.000000" y="0.000000" width="54.000000" height="66.000000" stroke="#CBA6f7" fill="#313244" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="28.000000" y="38.500000" fill="#CDD6F4" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">a</text></g><g id="b"><g class="shape" ><rect x="0.000000" y="187.000000" width="55.000000" height="66.000000" stroke="#CBA6f7" fill="#313244" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="27.500000" y="225.500000" fill="#CDD6F4" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">b</text></g><g id="(a -&gt; b)[0]"><marker id="mk-3488378134" markerWidth="10.000000" markerHeight="12.000000" refX="7.000000" refY="6.000000" viewBox="0.000000 0.000000 10.000000 12.000000" orient="auto" markerUnits="userSpaceOnUse"> <polygon points="0.000000,0.000000 10.000000,6.000000 0.000000,12.000000" fill="#CBA6f7" class="connection fill-B1" stroke-width="2" /> </marker><path d="M 27.500000 67.500000 C 27.500000 114.300003 27.500000 138.699997 27.500000 183.500000" stroke="#CBA6f7" fill="none" class="connection stroke-B1" style="stroke-width:2;" marker-end="url(#mk-3488378134)" mask="url(#d2-1929145507)" /><text x="28.000000" y="132.000000" fill="#BAC2DE" class="text-italic fill-N2" style="text-anchor:middle;font-size:16px">hello</text></g><mask id="d2-1929145507" maskUnits="userSpaceOnUse" x="-101" y="-101" width="257" height="455">
->>>>>>> 33280fed5 (fixed e2e tests)
 <rect x="-101" y="-101" width="257" height="455" fill="white"></rect>
 <rect x="23.500000" y="22.500000" width="9" height="21" fill="rgba(0,0,0,0.75)"></rect>
 <rect x="22.500000" y="209.500000" width="10" height="21" fill="rgba(0,0,0,0.75)"></rect>

d2renderers/d2svg/dark_theme/testdata/opacity/dark_theme.exp.svg

@@ -1,26 +1,4 @@
-<<<<<<< HEAD
+<?xml version="1.0" encoding="utf-8"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" d2Version="v0.6.8-HEAD" preserveAspectRatio="xMinYMin meet" viewBox="0 0 1178 477"><svg id="d2-svg" class="d2-2969664976" width="1178" height="477" viewBox="-100 -101 1178 477"><rect x="-100.000000" y="-101.000000" width="1178.000000" height="477.000000" rx="0.000000" fill="#1E1E2E" class=" fill-N7" stroke-width="0" /><style type="text/css"><![CDATA[
-<<<<<<< HEAD
-<?xml version="1.0" encoding="utf-8"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" d2Version="v0.6.8-HEAD" preserveAspectRatio="xMinYMin meet" viewBox="0 0 1178 477"><svg id="d2-svg" class="d2-1098532122" width="1178" height="477" viewBox="-100 -101 1178 477"><rect x="-100.000000" y="-101.000000" width="1178.000000" height="477.000000" rx="0.000000" fill="#1E1E2E" class=" fill-N7" stroke-width="0" /><style type="text/css"><![CDATA[
-||||||| parent of 33280fed5 (fixed e2e tests)
-<?xml version="1.0" encoding="utf-8"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" d2Version="v0.6.6-HEAD" preserveAspectRatio="xMinYMin meet" viewBox="0 0 1178 477"><svg id="d2-svg" class="d2-1098532122" width="1178" height="477" viewBox="-100 -101 1178 477"><rect x="-100.000000" y="-101.000000" width="1178.000000" height="477.000000" rx="0.000000" class=" fill-N7" stroke-width="0" /><style type="text/css"><![CDATA[
-=======
-<<<<<<< HEAD
-<?xml version="1.0" encoding="utf-8"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" d2Version="v0.6.6-HEAD" preserveAspectRatio="xMinYMin meet" viewBox="0 0 1178 477"><svg id="d2-svg" class="d2-1098532122" width="1178" height="477" viewBox="-100 -101 1178 477"><rect x="-100.000000" y="-101.000000" width="1178.000000" height="477.000000" rx="0.000000" class=" fill-N7" stroke-width="0" /><style type="text/css"><![CDATA[
->>>>>>> 33280fed5 (fixed e2e tests)
-.d2-1098532122 .text {
-	font-family: "d2-1098532122-font-regular";
-=======
-<?xml version="1.0" encoding="utf-8"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" d2Version="v0.6.5-HEAD" preserveAspectRatio="xMinYMin meet" viewBox="0 0 1178 477"><svg id="d2-svg" class="d2-2969664976" width="1178" height="477" viewBox="-100 -101 1178 477"><rect x="-100.000000" y="-101.000000" width="1178.000000" height="477.000000" rx="0.000000" class=" fill-N7" stroke-width="0" /><style type="text/css"><![CDATA[
-||||||| parent of cb2f2823c (Fix changes)
-<<<<<<< HEAD
-<?xml version="1.0" encoding="utf-8"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" d2Version="v0.6.6-HEAD" preserveAspectRatio="xMinYMin meet" viewBox="0 0 1178 477"><svg id="d2-svg" class="d2-1098532122" width="1178" height="477" viewBox="-100 -101 1178 477"><rect x="-100.000000" y="-101.000000" width="1178.000000" height="477.000000" rx="0.000000" class=" fill-N7" stroke-width="0" /><style type="text/css"><![CDATA[
-.d2-1098532122 .text {
-	font-family: "d2-1098532122-font-regular";
-=======
-<?xml version="1.0" encoding="utf-8"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" d2Version="v0.6.5-HEAD" preserveAspectRatio="xMinYMin meet" viewBox="0 0 1178 477"><svg id="d2-svg" class="d2-2969664976" width="1178" height="477" viewBox="-100 -101 1178 477"><rect x="-100.000000" y="-101.000000" width="1178.000000" height="477.000000" rx="0.000000" class=" fill-N7" stroke-width="0" /><style type="text/css"><![CDATA[
-=======
-<?xml version="1.0" encoding="utf-8"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" d2Version="v0.6.6-HEAD" preserveAspectRatio="xMinYMin meet" viewBox="0 0 1178 477"><svg id="d2-svg" class="d2-2969664976" width="1178" height="477" viewBox="-100 -101 1178 477"><rect x="-100.000000" y="-101.000000" width="1178.000000" height="477.000000" rx="0.000000" class=" fill-N7" stroke-width="0" /><style type="text/css"><![CDATA[
->>>>>>> cb2f2823c (Fix changes)
 .d2-2969664976 .text {
 	font-family: "d2-2969664976-font-regular";
 }
@@ -865,16 +843,8 @@
 .d2-2969664976 .md .contains-task-list:dir(rtl) .task-list-item-checkbox {
   margin: 0 -1.6em 0.25em 0.2em;
 }
-<<<<<<< HEAD
 </style><g id="x" style='opacity:0.400000'><g class="shape" ><rect x="181.000000" y="3.000000" width="54.000000" height="66.000000" stroke="#CBA6f7" fill="#313244" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="208.000000" y="41.500000" fill="#CDD6F4" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">x</text></g><g id="y" style='opacity:0.400000'><g class="shape" ></g><g><foreignObject requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" x="295.000000" y="24.000000" width="382" height="24"><div xmlns="http://www.w3.org/1999/xhtml" class="md"><p>linux: because a PC is a terrible thing to waste</p>
-</div></foreignObject></g></g><g id="a"><g class="shape" ><rect x="181.000000" y="209.000000" width="54.000000" height="66.000000" stroke="#CBA6f7" fill="#313244" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="208.000000" y="247.500000" fill="#CDD6F4" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">a</text></g><g id="users" style='opacity:0.400000'><g class="shape" ><rect x="737.000000" y="0.000000" width="240.000000" height="72.000000" stroke="#CDD6F4" fill="#1E1E2E" class="shape stroke-N1 fill-N7" style="stroke-width:2;" /><rect x="737.000000" y="0.000000" width="240.000000" height="36.000000" fill="#CDD6F4" class="class_header fill-N1" /><text x="747.000000" y="25.750000" fill="#1E1E2E" class="text fill-N7" style="text-anchor:start;font-size:24px">users</text><text x="747.000000" y="59.000000" fill="#CBA6f7" class="text fill-B2" style="text-anchor:start;font-size:20px">last_login</text><text x="869.000000" y="59.000000" fill="#BAC2DE" class="text fill-N2" style="text-anchor:start;font-size:20px">datetime</text><text x="967.000000" y="59.000000" fill="#f38BA8" class="text fill-AA2" style="text-anchor:end;font-size:20px" /><line x1="737.000000" x2="977.000000" y1="72.000000" y2="72.000000" stroke="#CDD6F4" class=" stroke-N1" style="stroke-width:2" /></g></g><g id="(x -&gt; a)[0]" style='opacity:0.400000'><marker id="mk-3488378134" markerWidth="10.000000" markerHeight="12.000000" refX="7.000000" refY="6.000000" viewBox="0.000000 0.000000 10.000000 12.000000" orient="auto" markerUnits="userSpaceOnUse"> <polygon points="0.000000,0.000000 10.000000,6.000000 0.000000,12.000000" fill="#CBA6f7" class="connection fill-B1" stroke-width="2" /> </marker><path d="M 208.000000 70.500000 C 208.000000 126.099998 208.000000 154.300003 208.000000 205.500000" stroke="#CBA6f7" fill="none" class="connection stroke-B1" style="stroke-width:2;" marker-end="url(#mk-3488378134)" mask="url(#d2-1098532122)" /><text x="208.000000" y="137.000000" fill="#BAC2DE" class="text-italic fill-N2" style="text-anchor:middle;font-size:16px"><tspan x="208.000000" dy="0.000000">You don&#39;t have to know how the computer works,</tspan><tspan x="208.000000" dy="18.500000">just how to work the computer.</tspan></text></g><mask id="d2-1098532122" maskUnits="userSpaceOnUse" x="-100" y="-101" width="1178" height="477">
+</div></foreignObject></g></g><g id="a"><g class="shape" ><rect x="181.000000" y="209.000000" width="54.000000" height="66.000000" stroke="#CBA6f7" fill="#313244" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="208.000000" y="247.500000" fill="#CDD6F4" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">a</text></g><g id="users" style='opacity:0.400000'><g class="shape" ><rect x="737.000000" y="0.000000" width="240.000000" height="72.000000" stroke="#CDD6F4" fill="#1E1E2E" class="shape stroke-N1 fill-N7" style="stroke-width:2;" /><rect x="737.000000" y="0.000000" width="240.000000" height="36.000000" fill="#CDD6F4" class="class_header fill-N1" /><text x="747.000000" y="25.750000" fill="#1E1E2E" class="text fill-N7" style="text-anchor:start;font-size:24px">users</text><text x="747.000000" y="59.000000" fill="#CBA6f7" class="text fill-B2" style="text-anchor:start;font-size:20px">last_login</text><text x="869.000000" y="59.000000" fill="#BAC2DE" class="text fill-N2" style="text-anchor:start;font-size:20px">datetime</text><text x="967.000000" y="59.000000" fill="#f38BA8" class="text fill-AA2" style="text-anchor:end;font-size:20px" /><line x1="737.000000" x2="977.000000" y1="72.000000" y2="72.000000" stroke="#CDD6F4" class=" stroke-N1" style="stroke-width:2" /></g></g><g id="(x -&gt; a)[0]" style='opacity:0.400000'><marker id="mk-3488378134" markerWidth="10.000000" markerHeight="12.000000" refX="7.000000" refY="6.000000" viewBox="0.000000 0.000000 10.000000 12.000000" orient="auto" markerUnits="userSpaceOnUse"> <polygon points="0.000000,0.000000 10.000000,6.000000 0.000000,12.000000" fill="#CBA6f7" class="connection fill-B1" stroke-width="2" /> </marker><path d="M 208.000000 70.500000 C 208.000000 126.099998 208.000000 154.300003 208.000000 205.500000" stroke="#CBA6f7" fill="none" class="connection stroke-B1" style="stroke-width:2;" marker-end="url(#mk-3488378134)" mask="url(#d2-2969664976)" /><text x="208.000000" y="137.000000" fill="#BAC2DE" class="text-italic fill-N2" style="text-anchor:middle;font-size:16px"><tspan x="208.000000" dy="0.000000">You don&#39;t have to know how the computer works,</tspan><tspan x="208.000000" dy="18.500000">just how to work the computer.</tspan></text></g><mask id="d2-2969664976" maskUnits="userSpaceOnUse" x="-100" y="-101" width="1178" height="477">
-||||||| parent of 33280fed5 (fixed e2e tests)
-</style><g id="x" style='opacity:0.400000'><g class="shape" ><rect x="181.000000" y="3.000000" width="54.000000" height="66.000000" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="208.000000" y="41.500000" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">x</text></g><g id="y" style='opacity:0.400000'><g class="shape" ></g><g><foreignObject requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" x="295.000000" y="24.000000" width="382" height="24"><div xmlns="http://www.w3.org/1999/xhtml" class="md"><p>linux: because a PC is a terrible thing to waste</p>
-</div></foreignObject></g></g><g id="a"><g class="shape" ><rect x="181.000000" y="209.000000" width="54.000000" height="66.000000" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="208.000000" y="247.500000" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">a</text></g><g id="users" style='opacity:0.400000'><g class="shape" ><rect x="737.000000" y="0.000000" width="240.000000" height="72.000000" class="shape stroke-N1 fill-N7" style="stroke-width:2;" /><rect x="737.000000" y="0.000000" width="240.000000" height="36.000000" class="class_header fill-N1" /><text x="747.000000" y="25.750000" class="text fill-N7" style="text-anchor:start;font-size:24px">users</text><text x="747.000000" y="59.000000" class="text fill-B2" style="text-anchor:start;font-size:20px">last_login</text><text x="869.000000" y="59.000000" class="text fill-N2" style="text-anchor:start;font-size:20px">datetime</text><text x="967.000000" y="59.000000" class="text fill-AA2" style="text-anchor:end;font-size:20px" /><line x1="737.000000" x2="977.000000" y1="72.000000" y2="72.000000" class=" stroke-N1" style="stroke-width:2" /></g></g><g id="(x -&gt; a)[0]" style='opacity:0.400000'><marker id="mk-3488378134" markerWidth="10.000000" markerHeight="12.000000" refX="7.000000" refY="6.000000" viewBox="0.000000 0.000000 10.000000 12.000000" orient="auto" markerUnits="userSpaceOnUse"> <polygon points="0.000000,0.000000 10.000000,6.000000 0.000000,12.000000" class="connection fill-B1" stroke-width="2" /> </marker><path d="M 208.000000 70.500000 C 208.000000 126.099998 208.000000 154.300003 208.000000 205.500000" fill="none" class="connection stroke-B1" style="stroke-width:2;" marker-end="url(#mk-3488378134)" mask="url(#d2-1098532122)" /><text x="208.000000" y="137.000000" class="text-italic fill-N2" style="text-anchor:middle;font-size:16px"><tspan x="208.000000" dy="0.000000">You don&#39;t have to know how the computer works,</tspan><tspan x="208.000000" dy="18.500000">just how to work the computer.</tspan></text></g><mask id="d2-1098532122" maskUnits="userSpaceOnUse" x="-100" y="-101" width="1178" height="477">
-=======
-</style><g id="x" style='opacity:0.400000'><g class="shape" ><rect x="181.000000" y="3.000000" width="54.000000" height="66.000000" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="208.000000" y="41.500000" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">x</text></g><g id="y" style='opacity:0.400000'><g class="shape" ></g><g><foreignObject requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" x="295.000000" y="24.000000" width="382" height="24"><div xmlns="http://www.w3.org/1999/xhtml" class="md"><p>linux: because a PC is a terrible thing to waste</p>
-</div></foreignObject></g></g><g id="a"><g class="shape" ><rect x="181.000000" y="209.000000" width="54.000000" height="66.000000" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="208.000000" y="247.500000" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">a</text></g><g id="users" style='opacity:0.400000'><g class="shape" ><rect x="737.000000" y="0.000000" width="240.000000" height="72.000000" class="shape stroke-N1 fill-N7" style="stroke-width:2;" /><rect x="737.000000" y="0.000000" width="240.000000" height="36.000000" class="class_header fill-N1" /><text x="747.000000" y="25.750000" class="text fill-N7" style="text-anchor:start;font-size:24px">users</text><text x="747.000000" y="59.000000" class="text fill-B2" style="text-anchor:start;font-size:20px">last_login</text><text x="869.000000" y="59.000000" class="text fill-N2" style="text-anchor:start;font-size:20px">datetime</text><text x="967.000000" y="59.000000" class="text fill-AA2" style="text-anchor:end;font-size:20px" /><line x1="737.000000" x2="977.000000" y1="72.000000" y2="72.000000" class=" stroke-N1" style="stroke-width:2" /></g></g><g id="(x -&gt; a)[0]" style='opacity:0.400000'><marker id="mk-3488378134" markerWidth="10.000000" markerHeight="12.000000" refX="7.000000" refY="6.000000" viewBox="0.000000 0.000000 10.000000 12.000000" orient="auto" markerUnits="userSpaceOnUse"> <polygon points="0.000000,0.000000 10.000000,6.000000 0.000000,12.000000" class="connection fill-B1" stroke-width="2" /> </marker><path d="M 208.000000 70.500000 C 208.000000 126.099998 208.000000 154.300003 208.000000 205.500000" fill="none" class="connection stroke-B1" style="stroke-width:2;" marker-end="url(#mk-3488378134)" mask="url(#d2-2969664976)" /><text x="208.000000" y="137.000000" class="text-italic fill-N2" style="text-anchor:middle;font-size:16px"><tspan x="208.000000" dy="0.000000">You don&#39;t have to know how the computer works,</tspan><tspan x="208.000000" dy="18.500000">just how to work the computer.</tspan></text></g><mask id="d2-2969664976" maskUnits="userSpaceOnUse" x="-100" y="-101" width="1178" height="477">
->>>>>>> 33280fed5 (fixed e2e tests)
 <rect x="-100" y="-101" width="1178" height="477" fill="white"></rect>
 <rect x="203.500000" y="25.500000" width="9" height="21" fill="rgba(0,0,0,0.75)"></rect>
 <rect x="295.000000" y="24.000000" width="382" height="24" fill="rgba(0,0,0,0.75)"></rect>

e2etests-cli/testdata/TestCLI_E2E/abspath.exp.svg

@@ -1,26 +1,4 @@
-<<<<<<< HEAD
+<?xml version="1.0" encoding="utf-8"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" d2Version="v0.6.8-HEAD" preserveAspectRatio="xMinYMin meet" viewBox="0 0 256 434"><svg id="d2-svg" class="d2-4198988860" width="256" height="434" viewBox="-101 -101 256 434"><rect x="-101.000000" y="-101.000000" width="256.000000" height="434.000000" rx="0.000000" fill="#FFFFFF" class=" fill-N7" stroke-width="0" /><style type="text/css"><![CDATA[
-<<<<<<< HEAD
-<?xml version="1.0" encoding="utf-8"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" d2Version="v0.6.8-HEAD" preserveAspectRatio="xMinYMin meet" viewBox="0 0 256 434"><svg id="d2-svg" class="d2-1843626214" width="256" height="434" viewBox="-101 -101 256 434"><rect x="-101.000000" y="-101.000000" width="256.000000" height="434.000000" rx="0.000000" fill="#FFFFFF" class=" fill-N7" stroke-width="0" /><style type="text/css"><![CDATA[
-||||||| parent of 33280fed5 (fixed e2e tests)
-<?xml version="1.0" encoding="utf-8"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" d2Version="v0.6.6-HEAD" preserveAspectRatio="xMinYMin meet" viewBox="0 0 256 434"><svg id="d2-svg" class="d2-1843626214" width="256" height="434" viewBox="-101 -101 256 434"><rect x="-101.000000" y="-101.000000" width="256.000000" height="434.000000" rx="0.000000" class=" fill-N7" stroke-width="0" /><style type="text/css"><![CDATA[
-=======
-<<<<<<< HEAD
-<?xml version="1.0" encoding="utf-8"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" d2Version="v0.6.6-HEAD" preserveAspectRatio="xMinYMin meet" viewBox="0 0 256 434"><svg id="d2-svg" class="d2-1843626214" width="256" height="434" viewBox="-101 -101 256 434"><rect x="-101.000000" y="-101.000000" width="256.000000" height="434.000000" rx="0.000000" class=" fill-N7" stroke-width="0" /><style type="text/css"><![CDATA[
->>>>>>> 33280fed5 (fixed e2e tests)
-.d2-1843626214 .text-bold {
-	font-family: "d2-1843626214-font-bold";
-=======
-<?xml version="1.0" encoding="utf-8"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" d2Version="v0.6.5-HEAD" preserveAspectRatio="xMinYMin meet" viewBox="0 0 256 434"><svg id="d2-svg" class="d2-4198988860" width="256" height="434" viewBox="-101 -101 256 434"><rect x="-101.000000" y="-101.000000" width="256.000000" height="434.000000" rx="0.000000" class=" fill-N7" stroke-width="0" /><style type="text/css"><![CDATA[
-||||||| parent of cb2f2823c (Fix changes)
-<<<<<<< HEAD
-<?xml version="1.0" encoding="utf-8"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" d2Version="v0.6.6-HEAD" preserveAspectRatio="xMinYMin meet" viewBox="0 0 256 434"><svg id="d2-svg" class="d2-1843626214" width="256" height="434" viewBox="-101 -101 256 434"><rect x="-101.000000" y="-101.000000" width="256.000000" height="434.000000" rx="0.000000" class=" fill-N7" stroke-width="0" /><style type="text/css"><![CDATA[
-.d2-1843626214 .text-bold {
-	font-family: "d2-1843626214-font-bold";
-=======
-<?xml version="1.0" encoding="utf-8"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" d2Version="v0.6.5-HEAD" preserveAspectRatio="xMinYMin meet" viewBox="0 0 256 434"><svg id="d2-svg" class="d2-4198988860" width="256" height="434" viewBox="-101 -101 256 434"><rect x="-101.000000" y="-101.000000" width="256.000000" height="434.000000" rx="0.000000" class=" fill-N7" stroke-width="0" /><style type="text/css"><![CDATA[
-=======
-<?xml version="1.0" encoding="utf-8"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" d2Version="v0.6.6-HEAD" preserveAspectRatio="xMinYMin meet" viewBox="0 0 256 434"><svg id="d2-svg" class="d2-4198988860" width="256" height="434" viewBox="-101 -101 256 434"><rect x="-101.000000" y="-101.000000" width="256.000000" height="434.000000" rx="0.000000" class=" fill-N7" stroke-width="0" /><style type="text/css"><![CDATA[
->>>>>>> cb2f2823c (Fix changes)
 .d2-4198988860 .text-bold {
 	font-family: "d2-4198988860-font-bold";
 }
@@ -40,153 +18,6 @@
   opacity: 0.5;
 }
 
-<<<<<<< HEAD
-		.d2-1843626214 .fill-N1{fill:#0A0F25;}
-		.d2-1843626214 .fill-N2{fill:#676C7E;}
-		.d2-1843626214 .fill-N3{fill:#9499AB;}
-		.d2-1843626214 .fill-N4{fill:#CFD2DD;}
-		.d2-1843626214 .fill-N5{fill:#DEE1EB;}
-		.d2-1843626214 .fill-N6{fill:#EEF1F8;}
-		.d2-1843626214 .fill-N7{fill:#FFFFFF;}
-		.d2-1843626214 .fill-B1{fill:#0D32B2;}
-		.d2-1843626214 .fill-B2{fill:#0D32B2;}
-		.d2-1843626214 .fill-B3{fill:#E3E9FD;}
-		.d2-1843626214 .fill-B4{fill:#E3E9FD;}
-		.d2-1843626214 .fill-B5{fill:#EDF0FD;}
-		.d2-1843626214 .fill-B6{fill:#F7F8FE;}
-		.d2-1843626214 .fill-AA2{fill:#4A6FF3;}
-		.d2-1843626214 .fill-AA4{fill:#EDF0FD;}
-		.d2-1843626214 .fill-AA5{fill:#F7F8FE;}
-		.d2-1843626214 .fill-AB4{fill:#EDF0FD;}
-		.d2-1843626214 .fill-AB5{fill:#F7F8FE;}
-		.d2-1843626214 .stroke-N1{stroke:#0A0F25;}
-		.d2-1843626214 .stroke-N2{stroke:#676C7E;}
-		.d2-1843626214 .stroke-N3{stroke:#9499AB;}
-		.d2-1843626214 .stroke-N4{stroke:#CFD2DD;}
-		.d2-1843626214 .stroke-N5{stroke:#DEE1EB;}
-		.d2-1843626214 .stroke-N6{stroke:#EEF1F8;}
-		.d2-1843626214 .stroke-N7{stroke:#FFFFFF;}
-		.d2-1843626214 .stroke-B1{stroke:#0D32B2;}
-		.d2-1843626214 .stroke-B2{stroke:#0D32B2;}
-		.d2-1843626214 .stroke-B3{stroke:#E3E9FD;}
-		.d2-1843626214 .stroke-B4{stroke:#E3E9FD;}
-		.d2-1843626214 .stroke-B5{stroke:#EDF0FD;}
-		.d2-1843626214 .stroke-B6{stroke:#F7F8FE;}
-		.d2-1843626214 .stroke-AA2{stroke:#4A6FF3;}
-		.d2-1843626214 .stroke-AA4{stroke:#EDF0FD;}
-		.d2-1843626214 .stroke-AA5{stroke:#F7F8FE;}
-		.d2-1843626214 .stroke-AB4{stroke:#EDF0FD;}
-		.d2-1843626214 .stroke-AB5{stroke:#F7F8FE;}
-		.d2-1843626214 .background-color-N1{background-color:#0A0F25;}
-		.d2-1843626214 .background-color-N2{background-color:#676C7E;}
-		.d2-1843626214 .background-color-N3{background-color:#9499AB;}
-		.d2-1843626214 .background-color-N4{background-color:#CFD2DD;}
-		.d2-1843626214 .background-color-N5{background-color:#DEE1EB;}
-		.d2-1843626214 .background-color-N6{background-color:#EEF1F8;}
-		.d2-1843626214 .background-color-N7{background-color:#FFFFFF;}
-		.d2-1843626214 .background-color-B1{background-color:#0D32B2;}
-		.d2-1843626214 .background-color-B2{background-color:#0D32B2;}
-		.d2-1843626214 .background-color-B3{background-color:#E3E9FD;}
-		.d2-1843626214 .background-color-B4{background-color:#E3E9FD;}
-		.d2-1843626214 .background-color-B5{background-color:#EDF0FD;}
-		.d2-1843626214 .background-color-B6{background-color:#F7F8FE;}
-		.d2-1843626214 .background-color-AA2{background-color:#4A6FF3;}
-		.d2-1843626214 .background-color-AA4{background-color:#EDF0FD;}
-		.d2-1843626214 .background-color-AA5{background-color:#F7F8FE;}
-		.d2-1843626214 .background-color-AB4{background-color:#EDF0FD;}
-		.d2-1843626214 .background-color-AB5{background-color:#F7F8FE;}
-		.d2-1843626214 .color-N1{color:#0A0F25;}
-		.d2-1843626214 .color-N2{color:#676C7E;}
-		.d2-1843626214 .color-N3{color:#9499AB;}
-		.d2-1843626214 .color-N4{color:#CFD2DD;}
-		.d2-1843626214 .color-N5{color:#DEE1EB;}
-		.d2-1843626214 .color-N6{color:#EEF1F8;}
-		.d2-1843626214 .color-N7{color:#FFFFFF;}
-		.d2-1843626214 .color-B1{color:#0D32B2;}
-		.d2-1843626214 .color-B2{color:#0D32B2;}
-		.d2-1843626214 .color-B3{color:#E3E9FD;}
-		.d2-1843626214 .color-B4{color:#E3E9FD;}
-		.d2-1843626214 .color-B5{color:#EDF0FD;}
-		.d2-1843626214 .color-B6{color:#F7F8FE;}
-		.d2-1843626214 .color-AA2{color:#4A6FF3;}
-		.d2-1843626214 .color-AA4{color:#EDF0FD;}
-		.d2-1843626214 .color-AA5{color:#F7F8FE;}
-		.d2-1843626214 .color-AB4{color:#EDF0FD;}
-		.d2-1843626214 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]></style><g id="x"><g class="shape" ><rect x="1.000000" y="0.000000" width="53.000000" height="66.000000" stroke="#0D32B2" fill="#F7F8FE" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="27.500000" y="38.500000" fill="#0A0F25" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">x</text></g><g id="y"><g class="shape" ><rect x="0.000000" y="166.000000" width="54.000000" height="66.000000" stroke="#0D32B2" fill="#F7F8FE" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="27.000000" y="204.500000" fill="#0A0F25" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">y</text></g><g id="(x -&gt; y)[0]"><marker id="mk-3488378134" markerWidth="10.000000" markerHeight="12.000000" refX="7.000000" refY="6.000000" viewBox="0.000000 0.000000 10.000000 12.000000" orient="auto" markerUnits="userSpaceOnUse"> <polygon points="0.000000,0.000000 10.000000,6.000000 0.000000,12.000000" fill="#0D32B2" class="connection fill-B1" stroke-width="2" /> </marker><path d="M 27.000000 68.000000 C 27.000000 106.000000 27.000000 126.000000 27.000000 162.000000" stroke="#0D32B2" fill="none" class="connection stroke-B1" style="stroke-width:2;" marker-end="url(#mk-3488378134)" mask="url(#d2-1843626214)" /></g><mask id="d2-1843626214" maskUnits="userSpaceOnUse" x="-101" y="-101" width="256" height="434">
-||||||| parent of 33280fed5 (fixed e2e tests)
-		.d2-1843626214 .fill-N1{fill:#0A0F25;}
-		.d2-1843626214 .fill-N2{fill:#676C7E;}
-		.d2-1843626214 .fill-N3{fill:#9499AB;}
-		.d2-1843626214 .fill-N4{fill:#CFD2DD;}
-		.d2-1843626214 .fill-N5{fill:#DEE1EB;}
-		.d2-1843626214 .fill-N6{fill:#EEF1F8;}
-		.d2-1843626214 .fill-N7{fill:#FFFFFF;}
-		.d2-1843626214 .fill-B1{fill:#0D32B2;}
-		.d2-1843626214 .fill-B2{fill:#0D32B2;}
-		.d2-1843626214 .fill-B3{fill:#E3E9FD;}
-		.d2-1843626214 .fill-B4{fill:#E3E9FD;}
-		.d2-1843626214 .fill-B5{fill:#EDF0FD;}
-		.d2-1843626214 .fill-B6{fill:#F7F8FE;}
-		.d2-1843626214 .fill-AA2{fill:#4A6FF3;}
-		.d2-1843626214 .fill-AA4{fill:#EDF0FD;}
-		.d2-1843626214 .fill-AA5{fill:#F7F8FE;}
-		.d2-1843626214 .fill-AB4{fill:#EDF0FD;}
-		.d2-1843626214 .fill-AB5{fill:#F7F8FE;}
-		.d2-1843626214 .stroke-N1{stroke:#0A0F25;}
-		.d2-1843626214 .stroke-N2{stroke:#676C7E;}
-		.d2-1843626214 .stroke-N3{stroke:#9499AB;}
-		.d2-1843626214 .stroke-N4{stroke:#CFD2DD;}
-		.d2-1843626214 .stroke-N5{stroke:#DEE1EB;}
-		.d2-1843626214 .stroke-N6{stroke:#EEF1F8;}
-		.d2-1843626214 .stroke-N7{stroke:#FFFFFF;}
-		.d2-1843626214 .stroke-B1{stroke:#0D32B2;}
-		.d2-1843626214 .stroke-B2{stroke:#0D32B2;}
-		.d2-1843626214 .stroke-B3{stroke:#E3E9FD;}
-		.d2-1843626214 .stroke-B4{stroke:#E3E9FD;}
-		.d2-1843626214 .stroke-B5{stroke:#EDF0FD;}
-		.d2-1843626214 .stroke-B6{stroke:#F7F8FE;}
-		.d2-1843626214 .stroke-AA2{stroke:#4A6FF3;}
-		.d2-1843626214 .stroke-AA4{stroke:#EDF0FD;}
-		.d2-1843626214 .stroke-AA5{stroke:#F7F8FE;}
-		.d2-1843626214 .stroke-AB4{stroke:#EDF0FD;}
-		.d2-1843626214 .stroke-AB5{stroke:#F7F8FE;}
-		.d2-1843626214 .background-color-N1{background-color:#0A0F25;}
-		.d2-1843626214 .background-color-N2{background-color:#676C7E;}
-		.d2-1843626214 .background-color-N3{background-color:#9499AB;}
-		.d2-1843626214 .background-color-N4{background-color:#CFD2DD;}
-		.d2-1843626214 .background-color-N5{background-color:#DEE1EB;}
-		.d2-1843626214 .background-color-N6{background-color:#EEF1F8;}
-		.d2-1843626214 .background-color-N7{background-color:#FFFFFF;}
-		.d2-1843626214 .background-color-B1{background-color:#0D32B2;}
-		.d2-1843626214 .background-color-B2{background-color:#0D32B2;}
-		.d2-1843626214 .background-color-B3{background-color:#E3E9FD;}
-		.d2-1843626214 .background-color-B4{background-color:#E3E9FD;}
-		.d2-1843626214 .background-color-B5{background-color:#EDF0FD;}
-		.d2-1843626214 .background-color-B6{background-color:#F7F8FE;}
-		.d2-1843626214 .background-color-AA2{background-color:#4A6FF3;}
-		.d2-1843626214 .background-color-AA4{background-color:#EDF0FD;}
-		.d2-1843626214 .background-color-AA5{background-color:#F7F8FE;}
-		.d2-1843626214 .background-color-AB4{background-color:#EDF0FD;}
-		.d2-1843626214 .background-color-AB5{background-color:#F7F8FE;}
-		.d2-1843626214 .color-N1{color:#0A0F25;}
-		.d2-1843626214 .color-N2{color:#676C7E;}
-		.d2-1843626214 .color-N3{color:#9499AB;}
-		.d2-1843626214 .color-N4{color:#CFD2DD;}
-		.d2-1843626214 .color-N5{color:#DEE1EB;}
-		.d2-1843626214 .color-N6{color:#EEF1F8;}
-		.d2-1843626214 .color-N7{color:#FFFFFF;}
-		.d2-1843626214 .color-B1{color:#0D32B2;}
-		.d2-1843626214 .color-B2{color:#0D32B2;}
-		.d2-1843626214 .color-B3{color:#E3E9FD;}
-		.d2-1843626214 .color-B4{color:#E3E9FD;}
-		.d2-1843626214 .color-B5{color:#EDF0FD;}
-		.d2-1843626214 .color-B6{color:#F7F8FE;}
-		.d2-1843626214 .color-AA2{color:#4A6FF3;}
-		.d2-1843626214 .color-AA4{color:#EDF0FD;}
-		.d2-1843626214 .color-AA5{color:#F7F8FE;}
-		.d2-1843626214 .color-AB4{color:#EDF0FD;}
-		.d2-1843626214 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]></style><g id="x"><g class="shape" ><rect x="1.000000" y="0.000000" width="53.000000" height="66.000000" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="27.500000" y="38.500000" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">x</text></g><g id="y"><g class="shape" ><rect x="0.000000" y="166.000000" width="54.000000" height="66.000000" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="27.000000" y="204.500000" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">y</text></g><g id="(x -&gt; y)[0]"><marker id="mk-3488378134" markerWidth="10.000000" markerHeight="12.000000" refX="7.000000" refY="6.000000" viewBox="0.000000 0.000000 10.000000 12.000000" orient="auto" markerUnits="userSpaceOnUse"> <polygon points="0.000000,0.000000 10.000000,6.000000 0.000000,12.000000" class="connection fill-B1" stroke-width="2" /> </marker><path d="M 27.000000 68.000000 C 27.000000 106.000000 27.000000 126.000000 27.000000 162.000000" fill="none" class="connection stroke-B1" style="stroke-width:2;" marker-end="url(#mk-3488378134)" mask="url(#d2-1843626214)" /></g><mask id="d2-1843626214" maskUnits="userSpaceOnUse" x="-101" y="-101" width="256" height="434">
-=======
 		.d2-4198988860 .fill-N1{fill:#0A0F25;}
 		.d2-4198988860 .fill-N2{fill:#676C7E;}
 		.d2-4198988860 .fill-N3{fill:#9499AB;}
@@ -258,8 +89,7 @@
 		.d2-4198988860 .color-AA4{color:#EDF0FD;}
 		.d2-4198988860 .color-AA5{color:#F7F8FE;}
 		.d2-4198988860 .color-AB4{color:#EDF0FD;}
-		.d2-4198988860 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]></style><g id="x"><g class="shape" ><rect x="1.000000" y="0.000000" width="53.000000" height="66.000000" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="27.500000" y="38.500000" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">x</text></g><g id="y"><g class="shape" ><rect x="0.000000" y="166.000000" width="54.000000" height="66.000000" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="27.000000" y="204.500000" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">y</text></g><g id="(x -&gt; y)[0]"><marker id="mk-3488378134" markerWidth="10.000000" markerHeight="12.000000" refX="7.000000" refY="6.000000" viewBox="0.000000 0.000000 10.000000 12.000000" orient="auto" markerUnits="userSpaceOnUse"> <polygon points="0.000000,0.000000 10.000000,6.000000 0.000000,12.000000" class="connection fill-B1" stroke-width="2" /> </marker><path d="M 27.000000 68.000000 C 27.000000 106.000000 27.000000 126.000000 27.000000 162.000000" fill="none" class="connection stroke-B1" style="stroke-width:2;" marker-end="url(#mk-3488378134)" mask="url(#d2-4198988860)" /></g><mask id="d2-4198988860" maskUnits="userSpaceOnUse" x="-101" y="-101" width="256" height="434">
+		.d2-4198988860 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]></style><g id="x"><g class="shape" ><rect x="1.000000" y="0.000000" width="53.000000" height="66.000000" stroke="#0D32B2" fill="#F7F8FE" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="27.500000" y="38.500000" fill="#0A0F25" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">x</text></g><g id="y"><g class="shape" ><rect x="0.000000" y="166.000000" width="54.000000" height="66.000000" stroke="#0D32B2" fill="#F7F8FE" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="27.000000" y="204.500000" fill="#0A0F25" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">y</text></g><g id="(x -&gt; y)[0]"><marker id="mk-3488378134" markerWidth="10.000000" markerHeight="12.000000" refX="7.000000" refY="6.000000" viewBox="0.000000 0.000000 10.000000 12.000000" orient="auto" markerUnits="userSpaceOnUse"> <polygon points="0.000000,0.000000 10.000000,6.000000 0.000000,12.000000" fill="#0D32B2" class="connection fill-B1" stroke-width="2" /> </marker><path d="M 27.000000 68.000000 C 27.000000 106.000000 27.000000 126.000000 27.000000 162.000000" stroke="#0D32B2" fill="none" class="connection stroke-B1" style="stroke-width:2;" marker-end="url(#mk-3488378134)" mask="url(#d2-4198988860)" /></g><mask id="d2-4198988860" maskUnits="userSpaceOnUse" x="-101" y="-101" width="256" height="434">
->>>>>>> 33280fed5 (fixed e2e tests)
 <rect x="-101" y="-101" width="256" height="434" fill="white"></rect>
 <rect x="23.500000" y="22.500000" width="8" height="21" fill="rgba(0,0,0,0.75)"></rect>
 <rect x="22.500000" y="188.500000" width="9" height="21" fill="rgba(0,0,0,0.75)"></rect>

e2etests-cli/testdata/TestCLI_E2E/animation.exp.svg

@@ -1,28 +1,4 @@
-<<<<<<< HEAD
-<<<<<<< HEAD
 <?xml version="1.0" encoding="utf-8"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" d2Version="v0.6.8-HEAD" preserveAspectRatio="xMinYMin meet" viewBox="0 0 514 665"><svg id="d2-svg" width="514" height="665" viewBox="-206 -166 514 665"><style type="text/css"><![CDATA[
-||||||| parent of 33280fed5 (fixed e2e tests)
-<?xml version="1.0" encoding="utf-8"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" d2Version="v0.6.6-HEAD" preserveAspectRatio="xMinYMin meet" viewBox="0 0 514 665"><svg id="d2-svg" width="514" height="665" viewBox="-206 -166 514 665"><style type="text/css"><![CDATA[
-=======
-<<<<<<< HEAD
-||||||| parent of cb2f2823c (Fix changes)
-<<<<<<< HEAD
-=======
->>>>>>> cb2f2823c (Fix changes)
-<?xml version="1.0" encoding="utf-8"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" d2Version="v0.6.6-HEAD" preserveAspectRatio="xMinYMin meet" viewBox="0 0 514 665"><svg id="d2-svg" width="514" height="665" viewBox="-206 -166 514 665"><style type="text/css"><![CDATA[
-<<<<<<< HEAD
->>>>>>> 33280fed5 (fixed e2e tests)
-.d2-4130279961 .text {
-	font-family: "d2-4130279961-font-regular";
-=======
-<?xml version="1.0" encoding="utf-8"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" d2Version="v0.6.5-HEAD" preserveAspectRatio="xMinYMin meet" viewBox="0 0 514 665"><svg id="d2-svg" width="514" height="665" viewBox="-206 -166 514 665"><style type="text/css"><![CDATA[
-||||||| parent of cb2f2823c (Fix changes)
-.d2-4130279961 .text {
-	font-family: "d2-4130279961-font-regular";
-=======
-<?xml version="1.0" encoding="utf-8"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" d2Version="v0.6.5-HEAD" preserveAspectRatio="xMinYMin meet" viewBox="0 0 514 665"><svg id="d2-svg" width="514" height="665" viewBox="-206 -166 514 665"><style type="text/css"><![CDATA[
-=======
->>>>>>> cb2f2823c (Fix changes)
 .d2-3977802915 .text {
 	font-family: "d2-3977802915-font-regular";
 }
@@ -893,43 +869,19 @@
 		75.000000%, 100.000000% {
 				opacity: 1;
 		}
-<<<<<<< HEAD
+}]]></style><g style="animation: d2Transition-d2-3977802915-0 5600ms infinite"  class="d2-3977802915" width="412" height="247" viewBox="-206 -166 412 247"><rect x="-206.000000" y="-166.000000" width="412.000000" height="247.000000" rx="0.000000" fill="#FFFFFF" class=" fill-N7" stroke-width="0" /><g id="&#34;Chicken&#39;s plan&#34;"><g class="shape" ></g><text x="0.000000" y="-30.000000" fill="#0A0F25" class="text fill-N1" style="text-anchor:middle;font-size:35px">Chicken&#39;s plan</text></g><mask id="d2-3977802915" maskUnits="userSpaceOnUse" x="-206" y="-166" width="412" height="247">
-}]]></style><g style="animation: d2Transition-d2-4130279961-0 5600ms infinite"  class="d2-4130279961" width="412" height="247" viewBox="-206 -166 412 247"><rect x="-206.000000" y="-166.000000" width="412.000000" height="247.000000" rx="0.000000" fill="#FFFFFF" class=" fill-N7" stroke-width="0" /><g id="&#34;Chicken&#39;s plan&#34;"><g class="shape" ></g><text x="0.000000" y="-30.000000" fill="#0A0F25" class="text fill-N1" style="text-anchor:middle;font-size:35px">Chicken&#39;s plan</text></g><mask id="d2-4130279961" maskUnits="userSpaceOnUse" x="-206" y="-166" width="412" height="247">
-||||||| parent of 33280fed5 (fixed e2e tests)
-}]]></style><g style="animation: d2Transition-d2-4130279961-0 5600ms infinite"  class="d2-4130279961" width="412" height="247" viewBox="-206 -166 412 247"><rect x="-206.000000" y="-166.000000" width="412.000000" height="247.000000" rx="0.000000" class=" fill-N7" stroke-width="0" /><g id="&#34;Chicken&#39;s plan&#34;"><g class="shape" ></g><text x="0.000000" y="-30.000000" class="text fill-N1" style="text-anchor:middle;font-size:35px">Chicken&#39;s plan</text></g><mask id="d2-4130279961" maskUnits="userSpaceOnUse" x="-206" y="-166" width="412" height="247">
-=======
-}]]></style><g style="animation: d2Transition-d2-3977802915-0 5600ms infinite"  class="d2-3977802915" width="412" height="247" viewBox="-206 -166 412 247"><rect x="-206.000000" y="-166.000000" width="412.000000" height="247.000000" rx="0.000000" class=" fill-N7" stroke-width="0" /><g id="&#34;Chicken&#39;s plan&#34;"><g class="shape" ></g><text x="0.000000" y="-30.000000" class="text fill-N1" style="text-anchor:middle;font-size:35px">Chicken&#39;s plan</text></g><mask id="d2-3977802915" maskUnits="userSpaceOnUse" x="-206" y="-166" width="412" height="247">
->>>>>>> 33280fed5 (fixed e2e tests)
 <rect x="-206" y="-166" width="412" height="247" fill="white"></rect>
 <rect x="-105.000000" y="-65.000000" width="210" height="45" fill="rgba(0,0,0,0.75)"></rect>
-<<<<<<< HEAD
+</mask></g><g style="animation: d2Transition-d2-3977802915-1 5600ms infinite"  class="d2-3977802915" width="412" height="333" viewBox="-131 -166 412 333"><rect x="-131.000000" y="-166.000000" width="412.000000" height="333.000000" rx="0.000000" fill="#FFFFFF" class=" fill-N7" stroke-width="0" /><g id="&#34;Chicken&#39;s plan&#34;"><g class="shape" ></g><text x="75.000000" y="-30.000000" fill="#0A0F25" class="text fill-N1" style="text-anchor:middle;font-size:35px">Chicken&#39;s plan</text></g><g id="Approach road"><g class="shape" ><rect x="0.000000" y="0.000000" width="150.000000" height="66.000000" stroke="#0D32B2" fill="#F7F8FE" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="75.000000" y="38.500000" fill="#0A0F25" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">Approach road</text></g><mask id="d2-4293673862" maskUnits="userSpaceOnUse" x="-131" y="-166" width="412" height="333">
-</mask></g><g style="animation: d2Transition-d2-4130279961-1 5600ms infinite"  class="d2-4130279961" width="412" height="333" viewBox="-131 -166 412 333"><rect x="-131.000000" y="-166.000000" width="412.000000" height="333.000000" rx="0.000000" fill="#FFFFFF" class=" fill-N7" stroke-width="0" /><g id="&#34;Chicken&#39;s plan&#34;"><g class="shape" ></g><text x="75.000000" y="-30.000000" fill="#0A0F25" class="text fill-N1" style="text-anchor:middle;font-size:35px">Chicken&#39;s plan</text></g><g id="Approach road"><g class="shape" ><rect x="0.000000" y="0.000000" width="150.000000" height="66.000000" stroke="#0D32B2" fill="#F7F8FE" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="75.000000" y="38.500000" fill="#0A0F25" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">Approach road</text></g><mask id="d2-4293673862" maskUnits="userSpaceOnUse" x="-131" y="-166" width="412" height="333">
-||||||| parent of 33280fed5 (fixed e2e tests)
-</mask></g><g style="animation: d2Transition-d2-4130279961-1 5600ms infinite"  class="d2-4130279961" width="412" height="333" viewBox="-131 -166 412 333"><rect x="-131.000000" y="-166.000000" width="412.000000" height="333.000000" rx="0.000000" class=" fill-N7" stroke-width="0" /><g id="&#34;Chicken&#39;s plan&#34;"><g class="shape" ></g><text x="75.000000" y="-30.000000" class="text fill-N1" style="text-anchor:middle;font-size:35px">Chicken&#39;s plan</text></g><g id="Approach road"><g class="shape" ><rect x="0.000000" y="0.000000" width="150.000000" height="66.000000" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="75.000000" y="38.500000" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">Approach road</text></g><mask id="d2-4293673862" maskUnits="userSpaceOnUse" x="-131" y="-166" width="412" height="333">
-=======
-</mask></g><g style="animation: d2Transition-d2-3977802915-1 5600ms infinite"  class="d2-3977802915" width="412" height="333" viewBox="-131 -166 412 333"><rect x="-131.000000" y="-166.000000" width="412.000000" height="333.000000" rx="0.000000" class=" fill-N7" stroke-width="0" /><g id="&#34;Chicken&#39;s plan&#34;"><g class="shape" ></g><text x="75.000000" y="-30.000000" class="text fill-N1" style="text-anchor:middle;font-size:35px">Chicken&#39;s plan</text></g><g id="Approach road"><g class="shape" ><rect x="0.000000" y="0.000000" width="150.000000" height="66.000000" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="75.000000" y="38.500000" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">Approach road</text></g><mask id="d2-4293673862" maskUnits="userSpaceOnUse" x="-131" y="-166" width="412" height="333">
->>>>>>> 33280fed5 (fixed e2e tests)
 <rect x="-131" y="-166" width="412" height="333" fill="white"></rect>
 <rect x="-30.000000" y="-65.000000" width="210" height="45" fill="rgba(0,0,0,0.75)"></rect>
 <rect x="22.500000" y="22.500000" width="105" height="21" fill="rgba(0,0,0,0.75)"></rect>
-<<<<<<< HEAD
+</mask></g><g style="animation: d2Transition-d2-3977802915-2 5600ms infinite"  class="d2-3977802915" width="412" height="499" viewBox="-131 -166 412 499"><rect x="-131.000000" y="-166.000000" width="412.000000" height="499.000000" rx="0.000000" fill="#FFFFFF" class=" fill-N7" stroke-width="0" /><g id="&#34;Chicken&#39;s plan&#34;"><g class="shape" ></g><text x="75.000000" y="-30.000000" fill="#0A0F25" class="text fill-N1" style="text-anchor:middle;font-size:35px">Chicken&#39;s plan</text></g><g id="Approach road"><g class="shape" ><rect x="0.000000" y="0.000000" width="150.000000" height="66.000000" stroke="#0D32B2" fill="#F7F8FE" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="75.000000" y="38.500000" fill="#0A0F25" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">Approach road</text></g><g id="Cross road"><g class="shape" ><rect x="15.000000" y="166.000000" width="120.000000" height="66.000000" stroke="#0D32B2" fill="#F7F8FE" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="75.000000" y="204.500000" fill="#0A0F25" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">Cross road</text></g><g id="(Approach road -&gt; Cross road)[0]"><marker id="mk-3488378134" markerWidth="10.000000" markerHeight="12.000000" refX="7.000000" refY="6.000000" viewBox="0.000000 0.000000 10.000000 12.000000" orient="auto" markerUnits="userSpaceOnUse"> <polygon points="0.000000,0.000000 10.000000,6.000000 0.000000,12.000000" fill="#0D32B2" class="connection fill-B1" stroke-width="2" /> </marker><path d="M 75.000000 68.000000 C 75.000000 106.000000 75.000000 126.000000 75.000000 162.000000" stroke="#0D32B2" fill="none" class="connection stroke-B1" style="stroke-width:2;" marker-end="url(#mk-3488378134)" mask="url(#d2-97309593)" /></g><mask id="d2-97309593" maskUnits="userSpaceOnUse" x="-131" y="-166" width="412" height="499">
-</mask></g><g style="animation: d2Transition-d2-4130279961-2 5600ms infinite"  class="d2-4130279961" width="412" height="499" viewBox="-131 -166 412 499"><rect x="-131.000000" y="-166.000000" width="412.000000" height="499.000000" rx="0.000000" fill="#FFFFFF" class=" fill-N7" stroke-width="0" /><g id="&#34;Chicken&#39;s plan&#34;"><g class="shape" ></g><text x="75.000000" y="-30.000000" fill="#0A0F25" class="text fill-N1" style="text-anchor:middle;font-size:35px">Chicken&#39;s plan</text></g><g id="Approach road"><g class="shape" ><rect x="0.000000" y="0.000000" width="150.000000" height="66.000000" stroke="#0D32B2" fill="#F7F8FE" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="75.000000" y="38.500000" fill="#0A0F25" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">Approach road</text></g><g id="Cross road"><g class="shape" ><rect x="15.000000" y="166.000000" width="120.000000" height="66.000000" stroke="#0D32B2" fill="#F7F8FE" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="75.000000" y="204.500000" fill="#0A0F25" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">Cross road</text></g><g id="(Approach road -&gt; Cross road)[0]"><marker id="mk-3488378134" markerWidth="10.000000" markerHeight="12.000000" refX="7.000000" refY="6.000000" viewBox="0.000000 0.000000 10.000000 12.000000" orient="auto" markerUnits="userSpaceOnUse"> <polygon points="0.000000,0.000000 10.000000,6.000000 0.000000,12.000000" fill="#0D32B2" class="connection fill-B1" stroke-width="2" /> </marker><path d="M 75.000000 68.000000 C 75.000000 106.000000 75.000000 126.000000 75.000000 162.000000" stroke="#0D32B2" fill="none" class="connection stroke-B1" style="stroke-width:2;" marker-end="url(#mk-3488378134)" mask="url(#d2-600153991)" /></g><mask id="d2-600153991" maskUnits="userSpaceOnUse" x="-131" y="-166" width="412" height="499">
-||||||| parent of 33280fed5 (fixed e2e tests)
-</mask></g><g style="animation: d2Transition-d2-4130279961-2 5600ms infinite"  class="d2-4130279961" width="412" height="499" viewBox="-131 -166 412 499"><rect x="-131.000000" y="-166.000000" width="412.000000" height="499.000000" rx="0.000000" class=" fill-N7" stroke-width="0" /><g id="&#34;Chicken&#39;s plan&#34;"><g class="shape" ></g><text x="75.000000" y="-30.000000" class="text fill-N1" style="text-anchor:middle;font-size:35px">Chicken&#39;s plan</text></g><g id="Approach road"><g class="shape" ><rect x="0.000000" y="0.000000" width="150.000000" height="66.000000" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="75.000000" y="38.500000" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">Approach road</text></g><g id="Cross road"><g class="shape" ><rect x="15.000000" y="166.000000" width="120.000000" height="66.000000" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="75.000000" y="204.500000" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">Cross road</text></g><g id="(Approach road -&gt; Cross road)[0]"><marker id="mk-3488378134" markerWidth="10.000000" markerHeight="12.000000" refX="7.000000" refY="6.000000" viewBox="0.000000 0.000000 10.000000 12.000000" orient="auto" markerUnits="userSpaceOnUse"> <polygon points="0.000000,0.000000 10.000000,6.000000 0.000000,12.000000" class="connection fill-B1" stroke-width="2" /> </marker><path d="M 75.000000 68.000000 C 75.000000 106.000000 75.000000 126.000000 75.000000 162.000000" fill="none" class="connection stroke-B1" style="stroke-width:2;" marker-end="url(#mk-3488378134)" mask="url(#d2-600153991)" /></g><mask id="d2-600153991" maskUnits="userSpaceOnUse" x="-131" y="-166" width="412" height="499">
-=======
-</mask></g><g style="animation: d2Transition-d2-3977802915-2 5600ms infinite"  class="d2-3977802915" width="412" height="499" viewBox="-131 -166 412 499"><rect x="-131.000000" y="-166.000000" width="412.000000" height="499.000000" rx="0.000000" class=" fill-N7" stroke-width="0" /><g id="&#34;Chicken&#39;s plan&#34;"><g class="shape" ></g><text x="75.000000" y="-30.000000" class="text fill-N1" style="text-anchor:middle;font-size:35px">Chicken&#39;s plan</text></g><g id="Approach road"><g class="shape" ><rect x="0.000000" y="0.000000" width="150.000000" height="66.000000" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="75.000000" y="38.500000" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">Approach road</text></g><g id="Cross road"><g class="shape" ><rect x="15.000000" y="166.000000" width="120.000000" height="66.000000" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="75.000000" y="204.500000" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">Cross road</text></g><g id="(Approach road -&gt; Cross road)[0]"><marker id="mk-3488378134" markerWidth="10.000000" markerHeight="12.000000" refX="7.000000" refY="6.000000" viewBox="0.000000 0.000000 10.000000 12.000000" orient="auto" markerUnits="userSpaceOnUse"> <polygon points="0.000000,0.000000 10.000000,6.000000 0.000000,12.000000" class="connection fill-B1" stroke-width="2" /> </marker><path d="M 75.000000 68.000000 C 75.000000 106.000000 75.000000 126.000000 75.000000 162.000000" fill="none" class="connection stroke-B1" style="stroke-width:2;" marker-end="url(#mk-3488378134)" mask="url(#d2-97309593)" /></g><mask id="d2-97309593" maskUnits="userSpaceOnUse" x="-131" y="-166" width="412" height="499">
->>>>>>> 33280fed5 (fixed e2e tests)
 <rect x="-131" y="-166" width="412" height="499" fill="white"></rect>
 <rect x="-30.000000" y="-65.000000" width="210" height="45" fill="rgba(0,0,0,0.75)"></rect>
 <rect x="22.500000" y="22.500000" width="105" height="21" fill="rgba(0,0,0,0.75)"></rect>
 <rect x="37.500000" y="188.500000" width="75" height="21" fill="rgba(0,0,0,0.75)"></rect>
-<<<<<<< HEAD
+</mask></g><g style="animation: d2Transition-d2-3977802915-3 5600ms infinite"  class="d2-3977802915" width="412" height="665" viewBox="-104 -166 412 665"><rect x="-104.000000" y="-166.000000" width="412.000000" height="665.000000" rx="0.000000" fill="#FFFFFF" class=" fill-N7" stroke-width="0" /><g id="&#34;Chicken&#39;s plan&#34;"><g class="shape" ></g><text x="102.000000" y="-30.000000" fill="#0A0F25" class="text fill-N1" style="text-anchor:middle;font-size:35px">Chicken&#39;s plan</text></g><g id="Approach road"><g class="shape" ><rect x="27.000000" y="0.000000" width="150.000000" height="66.000000" stroke="#0D32B2" fill="#F7F8FE" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="102.000000" y="38.500000" fill="#0A0F25" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">Approach road</text></g><g id="Cross road"><g class="shape" ><rect x="42.000000" y="166.000000" width="120.000000" height="66.000000" stroke="#0D32B2" fill="#F7F8FE" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="102.000000" y="204.500000" fill="#0A0F25" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">Cross road</text></g><g id="Make you wonder why"><g class="shape" ><rect x="0.000000" y="332.000000" width="203.000000" height="66.000000" stroke="#0D32B2" fill="#F7F8FE" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="101.500000" y="370.500000" fill="#0A0F25" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">Make you wonder why</text></g><g id="(Approach road -&gt; Cross road)[0]"><marker id="mk-3488378134" markerWidth="10.000000" markerHeight="12.000000" refX="7.000000" refY="6.000000" viewBox="0.000000 0.000000 10.000000 12.000000" orient="auto" markerUnits="userSpaceOnUse"> <polygon points="0.000000,0.000000 10.000000,6.000000 0.000000,12.000000" fill="#0D32B2" class="connection fill-B1" stroke-width="2" /> </marker><path d="M 101.500000 68.000000 C 101.500000 106.000000 101.500000 126.000000 101.500000 162.000000" stroke="#0D32B2" fill="none" class="connection stroke-B1" style="stroke-width:2;" marker-end="url(#mk-3488378134)" mask="url(#d2-3174726174)" /></g><g id="(Cross road -&gt; Make you wonder why)[0]"><path d="M 101.500000 234.000000 C 101.500000 272.000000 101.500000 292.000000 101.500000 328.000000" stroke="#0D32B2" fill="none" class="connection stroke-B1" style="stroke-width:2;" marker-end="url(#mk-3488378134)" mask="url(#d2-3174726174)" /></g><mask id="d2-3174726174" maskUnits="userSpaceOnUse" x="-104" y="-166" width="412" height="665">
-</mask></g><g style="animation: d2Transition-d2-4130279961-3 5600ms infinite"  class="d2-4130279961" width="412" height="665" viewBox="-104 -166 412 665"><rect x="-104.000000" y="-166.000000" width="412.000000" height="665.000000" rx="0.000000" fill="#FFFFFF" class=" fill-N7" stroke-width="0" /><g id="&#34;Chicken&#39;s plan&#34;"><g class="shape" ></g><text x="102.000000" y="-30.000000" fill="#0A0F25" class="text fill-N1" style="text-anchor:middle;font-size:35px">Chicken&#39;s plan</text></g><g id="Approach road"><g class="shape" ><rect x="27.000000" y="0.000000" width="150.000000" height="66.000000" stroke="#0D32B2" fill="#F7F8FE" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="102.000000" y="38.500000" fill="#0A0F25" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">Approach road</text></g><g id="Cross road"><g class="shape" ><rect x="42.000000" y="166.000000" width="120.000000" height="66.000000" stroke="#0D32B2" fill="#F7F8FE" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="102.000000" y="204.500000" fill="#0A0F25" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">Cross road</text></g><g id="Make you wonder why"><g class="shape" ><rect x="0.000000" y="332.000000" width="203.000000" height="66.000000" stroke="#0D32B2" fill="#F7F8FE" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="101.500000" y="370.500000" fill="#0A0F25" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">Make you wonder why</text></g><g id="(Approach road -&gt; Cross road)[0]"><marker id="mk-3488378134" markerWidth="10.000000" markerHeight="12.000000" refX="7.000000" refY="6.000000" viewBox="0.000000 0.000000 10.000000 12.000000" orient="auto" markerUnits="userSpaceOnUse"> <polygon points="0.000000,0.000000 10.000000,6.000000 0.000000,12.000000" fill="#0D32B2" class="connection fill-B1" stroke-width="2" /> </marker><path d="M 101.500000 68.000000 C 101.500000 106.000000 101.500000 126.000000 101.500000 162.000000" stroke="#0D32B2" fill="none" class="connection stroke-B1" style="stroke-width:2;" marker-end="url(#mk-3488378134)" mask="url(#d2-191946974)" /></g><g id="(Cross road -&gt; Make you wonder why)[0]"><path d="M 101.500000 234.000000 C 101.500000 272.000000 101.500000 292.000000 101.500000 328.000000" stroke="#0D32B2" fill="none" class="connection stroke-B1" style="stroke-width:2;" marker-end="url(#mk-3488378134)" mask="url(#d2-191946974)" /></g><mask id="d2-191946974" maskUnits="userSpaceOnUse" x="-104" y="-166" width="412" height="665">
-||||||| parent of 33280fed5 (fixed e2e tests)
-</mask></g><g style="animation: d2Transition-d2-4130279961-3 5600ms infinite"  class="d2-4130279961" width="412" height="665" viewBox="-104 -166 412 665"><rect x="-104.000000" y="-166.000000" width="412.000000" height="665.000000" rx="0.000000" class=" fill-N7" stroke-width="0" /><g id="&#34;Chicken&#39;s plan&#34;"><g class="shape" ></g><text x="102.000000" y="-30.000000" class="text fill-N1" style="text-anchor:middle;font-size:35px">Chicken&#39;s plan</text></g><g id="Approach road"><g class="shape" ><rect x="27.000000" y="0.000000" width="150.000000" height="66.000000" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="102.000000" y="38.500000" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">Approach road</text></g><g id="Cross road"><g class="shape" ><rect x="42.000000" y="166.000000" width="120.000000" height="66.000000" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="102.000000" y="204.500000" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">Cross road</text></g><g id="Make you wonder why"><g class="shape" ><rect x="0.000000" y="332.000000" width="203.000000" height="66.000000" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="101.500000" y="370.500000" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">Make you wonder why</text></g><g id="(Approach road -&gt; Cross road)[0]"><marker id="mk-3488378134" markerWidth="10.000000" markerHeight="12.000000" refX="7.000000" refY="6.000000" viewBox="0.000000 0.000000 10.000000 12.000000" orient="auto" markerUnits="userSpaceOnUse"> <polygon points="0.000000,0.000000 10.000000,6.000000 0.000000,12.000000" class="connection fill-B1" stroke-width="2" /> </marker><path d="M 101.500000 68.000000 C 101.500000 106.000000 101.500000 126.000000 101.500000 162.000000" fill="none" class="connection stroke-B1" style="stroke-width:2;" marker-end="url(#mk-3488378134)" mask="url(#d2-191946974)" /></g><g id="(Cross road -&gt; Make you wonder why)[0]"><path d="M 101.500000 234.000000 C 101.500000 272.000000 101.500000 292.000000 101.500000 328.000000" fill="none" class="connection stroke-B1" style="stroke-width:2;" marker-end="url(#mk-3488378134)" mask="url(#d2-191946974)" /></g><mask id="d2-191946974" maskUnits="userSpaceOnUse" x="-104" y="-166" width="412" height="665">
-=======
-</mask></g><g style="animation: d2Transition-d2-3977802915-3 5600ms infinite"  class="d2-3977802915" width="412" height="665" viewBox="-104 -166 412 665"><rect x="-104.000000" y="-166.000000" width="412.000000" height="665.000000" rx="0.000000" class=" fill-N7" stroke-width="0" /><g id="&#34;Chicken&#39;s plan&#34;"><g class="shape" ></g><text x="102.000000" y="-30.000000" class="text fill-N1" style="text-anchor:middle;font-size:35px">Chicken&#39;s plan</text></g><g id="Approach road"><g class="shape" ><rect x="27.000000" y="0.000000" width="150.000000" height="66.000000" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="102.000000" y="38.500000" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">Approach road</text></g><g id="Cross road"><g class="shape" ><rect x="42.000000" y="166.000000" width="120.000000" height="66.000000" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="102.000000" y="204.500000" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">Cross road</text></g><g id="Make you wonder why"><g class="shape" ><rect x="0.000000" y="332.000000" width="203.000000" height="66.000000" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="101.500000" y="370.500000" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">Make you wonder why</text></g><g id="(Approach road -&gt; Cross road)[0]"><marker id="mk-3488378134" markerWidth="10.000000" markerHeight="12.000000" refX="7.000000" refY="6.000000" viewBox="0.000000 0.000000 10.000000 12.000000" orient="auto" markerUnits="userSpaceOnUse"> <polygon points="0.000000,0.000000 10.000000,6.000000 0.000000,12.000000" class="connection fill-B1" stroke-width="2" /> </marker><path d="M 101.500000 68.000000 C 101.500000 106.000000 101.500000 126.000000 101.500000 162.000000" fill="none" class="connection stroke-B1" style="stroke-width:2;" marker-end="url(#mk-3488378134)" mask="url(#d2-3174726174)" /></g><g id="(Cross road -&gt; Make you wonder why)[0]"><path d="M 101.500000 234.000000 C 101.500000 272.000000 101.500000 292.000000 101.500000 328.000000" fill="none" class="connection stroke-B1" style="stroke-width:2;" marker-end="url(#mk-3488378134)" mask="url(#d2-3174726174)" /></g><mask id="d2-3174726174" maskUnits="userSpaceOnUse" x="-104" y="-166" width="412" height="665">
->>>>>>> 33280fed5 (fixed e2e tests)
 <rect x="-104" y="-166" width="412" height="665" fill="white"></rect>
 <rect x="-3.000000" y="-65.000000" width="210" height="45" fill="rgba(0,0,0,0.75)"></rect>
 <rect x="49.500000" y="22.500000" width="105" height="21" fill="rgba(0,0,0,0.75)"></rect>

e2etests-cli/testdata/TestCLI_E2E/center.exp.svg

@@ -1,26 +1,4 @@
-<<<<<<< HEAD
+<?xml version="1.0" encoding="utf-8"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" d2Version="v0.6.8-HEAD" preserveAspectRatio="xMidYMid meet" viewBox="0 0 256 434"><svg id="d2-svg" class="d2-4198988860" width="256" height="434" viewBox="-101 -101 256 434"><rect x="-101.000000" y="-101.000000" width="256.000000" height="434.000000" rx="0.000000" fill="#FFFFFF" class=" fill-N7" stroke-width="0" /><style type="text/css"><![CDATA[
-<<<<<<< HEAD
-<?xml version="1.0" encoding="utf-8"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" d2Version="v0.6.8-HEAD" preserveAspectRatio="xMidYMid meet" viewBox="0 0 256 434"><svg id="d2-svg" class="d2-1843626214" width="256" height="434" viewBox="-101 -101 256 434"><rect x="-101.000000" y="-101.000000" width="256.000000" height="434.000000" rx="0.000000" fill="#FFFFFF" class=" fill-N7" stroke-width="0" /><style type="text/css"><![CDATA[
-||||||| parent of 33280fed5 (fixed e2e tests)
-<?xml version="1.0" encoding="utf-8"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" d2Version="v0.6.6-HEAD" preserveAspectRatio="xMidYMid meet" viewBox="0 0 256 434"><svg id="d2-svg" class="d2-1843626214" width="256" height="434" viewBox="-101 -101 256 434"><rect x="-101.000000" y="-101.000000" width="256.000000" height="434.000000" rx="0.000000" class=" fill-N7" stroke-width="0" /><style type="text/css"><![CDATA[
-=======
-<<<<<<< HEAD
-<?xml version="1.0" encoding="utf-8"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" d2Version="v0.6.6-HEAD" preserveAspectRatio="xMidYMid meet" viewBox="0 0 256 434"><svg id="d2-svg" class="d2-1843626214" width="256" height="434" viewBox="-101 -101 256 434"><rect x="-101.000000" y="-101.000000" width="256.000000" height="434.000000" rx="0.000000" class=" fill-N7" stroke-width="0" /><style type="text/css"><![CDATA[
->>>>>>> 33280fed5 (fixed e2e tests)
-.d2-1843626214 .text-bold {
-	font-family: "d2-1843626214-font-bold";
-=======
-<?xml version="1.0" encoding="utf-8"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" d2Version="v0.6.5-HEAD" preserveAspectRatio="xMidYMid meet" viewBox="0 0 256 434"><svg id="d2-svg" class="d2-4198988860" width="256" height="434" viewBox="-101 -101 256 434"><rect x="-101.000000" y="-101.000000" width="256.000000" height="434.000000" rx="0.000000" class=" fill-N7" stroke-width="0" /><style type="text/css"><![CDATA[
-||||||| parent of cb2f2823c (Fix changes)
-<<<<<<< HEAD
-<?xml version="1.0" encoding="utf-8"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" d2Version="v0.6.6-HEAD" preserveAspectRatio="xMidYMid meet" viewBox="0 0 256 434"><svg id="d2-svg" class="d2-1843626214" width="256" height="434" viewBox="-101 -101 256 434"><rect x="-101.000000" y="-101.000000" width="256.000000" height="434.000000" rx="0.000000" class=" fill-N7" stroke-width="0" /><style type="text/css"><![CDATA[
-.d2-1843626214 .text-bold {
-	font-family: "d2-1843626214-font-bold";
-=======
-<?xml version="1.0" encoding="utf-8"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" d2Version="v0.6.5-HEAD" preserveAspectRatio="xMidYMid meet" viewBox="0 0 256 434"><svg id="d2-svg" class="d2-4198988860" width="256" height="434" viewBox="-101 -101 256 434"><rect x="-101.000000" y="-101.000000" width="256.000000" height="434.000000" rx="0.000000" class=" fill-N7" stroke-width="0" /><style type="text/css"><![CDATA[
-=======
-<?xml version="1.0" encoding="utf-8"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" d2Version="v0.6.6-HEAD" preserveAspectRatio="xMidYMid meet" viewBox="0 0 256 434"><svg id="d2-svg" class="d2-4198988860" width="256" height="434" viewBox="-101 -101 256 434"><rect x="-101.000000" y="-101.000000" width="256.000000" height="434.000000" rx="0.000000" class=" fill-N7" stroke-width="0" /><style type="text/css"><![CDATA[
->>>>>>> cb2f2823c (Fix changes)
 .d2-4198988860 .text-bold {
 	font-family: "d2-4198988860-font-bold";
 }
@@ -40,153 +18,6 @@
   opacity: 0.5;
 }
 
-<<<<<<< HEAD
-		.d2-1843626214 .fill-N1{fill:#0A0F25;}
-		.d2-1843626214 .fill-N2{fill:#676C7E;}
-		.d2-1843626214 .fill-N3{fill:#9499AB;}
-		.d2-1843626214 .fill-N4{fill:#CFD2DD;}
-		.d2-1843626214 .fill-N5{fill:#DEE1EB;}
-		.d2-1843626214 .fill-N6{fill:#EEF1F8;}
-		.d2-1843626214 .fill-N7{fill:#FFFFFF;}
-		.d2-1843626214 .fill-B1{fill:#0D32B2;}
-		.d2-1843626214 .fill-B2{fill:#0D32B2;}
-		.d2-1843626214 .fill-B3{fill:#E3E9FD;}
-		.d2-1843626214 .fill-B4{fill:#E3E9FD;}
-		.d2-1843626214 .fill-B5{fill:#EDF0FD;}
-		.d2-1843626214 .fill-B6{fill:#F7F8FE;}
-		.d2-1843626214 .fill-AA2{fill:#4A6FF3;}
-		.d2-1843626214 .fill-AA4{fill:#EDF0FD;}
-		.d2-1843626214 .fill-AA5{fill:#F7F8FE;}
-		.d2-1843626214 .fill-AB4{fill:#EDF0FD;}
-		.d2-1843626214 .fill-AB5{fill:#F7F8FE;}
-		.d2-1843626214 .stroke-N1{stroke:#0A0F25;}
-		.d2-1843626214 .stroke-N2{stroke:#676C7E;}
-		.d2-1843626214 .stroke-N3{stroke:#9499AB;}
-		.d2-1843626214 .stroke-N4{stroke:#CFD2DD;}
-		.d2-1843626214 .stroke-N5{stroke:#DEE1EB;}
-		.d2-1843626214 .stroke-N6{stroke:#EEF1F8;}
-		.d2-1843626214 .stroke-N7{stroke:#FFFFFF;}
-		.d2-1843626214 .stroke-B1{stroke:#0D32B2;}
-		.d2-1843626214 .stroke-B2{stroke:#0D32B2;}
-		.d2-1843626214 .stroke-B3{stroke:#E3E9FD;}
-		.d2-1843626214 .stroke-B4{stroke:#E3E9FD;}
-		.d2-1843626214 .stroke-B5{stroke:#EDF0FD;}
-		.d2-1843626214 .stroke-B6{stroke:#F7F8FE;}
-		.d2-1843626214 .stroke-AA2{stroke:#4A6FF3;}
-		.d2-1843626214 .stroke-AA4{stroke:#EDF0FD;}
-		.d2-1843626214 .stroke-AA5{stroke:#F7F8FE;}
-		.d2-1843626214 .stroke-AB4{stroke:#EDF0FD;}
-		.d2-1843626214 .stroke-AB5{stroke:#F7F8FE;}
-		.d2-1843626214 .background-color-N1{background-color:#0A0F25;}
-		.d2-1843626214 .background-color-N2{background-color:#676C7E;}
-		.d2-1843626214 .background-color-N3{background-color:#9499AB;}
-		.d2-1843626214 .background-color-N4{background-color:#CFD2DD;}
-		.d2-1843626214 .background-color-N5{background-color:#DEE1EB;}
-		.d2-1843626214 .background-color-N6{background-color:#EEF1F8;}
-		.d2-1843626214 .background-color-N7{background-color:#FFFFFF;}
-		.d2-1843626214 .background-color-B1{background-color:#0D32B2;}
-		.d2-1843626214 .background-color-B2{background-color:#0D32B2;}
-		.d2-1843626214 .background-color-B3{background-color:#E3E9FD;}
-		.d2-1843626214 .background-color-B4{background-color:#E3E9FD;}
-		.d2-1843626214 .background-color-B5{background-color:#EDF0FD;}
-		.d2-1843626214 .background-color-B6{background-color:#F7F8FE;}
-		.d2-1843626214 .background-color-AA2{background-color:#4A6FF3;}
-		.d2-1843626214 .background-color-AA4{background-color:#EDF0FD;}
-		.d2-1843626214 .background-color-AA5{background-color:#F7F8FE;}
-		.d2-1843626214 .background-color-AB4{background-color:#EDF0FD;}
-		.d2-1843626214 .background-color-AB5{background-color:#F7F8FE;}
-		.d2-1843626214 .color-N1{color:#0A0F25;}
-		.d2-1843626214 .color-N2{color:#676C7E;}
-		.d2-1843626214 .color-N3{color:#9499AB;}
-		.d2-1843626214 .color-N4{color:#CFD2DD;}
-		.d2-1843626214 .color-N5{color:#DEE1EB;}
-		.d2-1843626214 .color-N6{color:#EEF1F8;}
-		.d2-1843626214 .color-N7{color:#FFFFFF;}
-		.d2-1843626214 .color-B1{color:#0D32B2;}
-		.d2-1843626214 .color-B2{color:#0D32B2;}
-		.d2-1843626214 .color-B3{color:#E3E9FD;}
-		.d2-1843626214 .color-B4{color:#E3E9FD;}
-		.d2-1843626214 .color-B5{color:#EDF0FD;}
-		.d2-1843626214 .color-B6{color:#F7F8FE;}
-		.d2-1843626214 .color-AA2{color:#4A6FF3;}
-		.d2-1843626214 .color-AA4{color:#EDF0FD;}
-		.d2-1843626214 .color-AA5{color:#F7F8FE;}
-		.d2-1843626214 .color-AB4{color:#EDF0FD;}
-		.d2-1843626214 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]></style><g id="x"><g class="shape" ><rect x="1.000000" y="0.000000" width="53.000000" height="66.000000" stroke="#0D32B2" fill="#F7F8FE" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="27.500000" y="38.500000" fill="#0A0F25" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">x</text></g><g id="y"><g class="shape" ><rect x="0.000000" y="166.000000" width="54.000000" height="66.000000" stroke="#0D32B2" fill="#F7F8FE" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="27.000000" y="204.500000" fill="#0A0F25" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">y</text></g><g id="(x -&gt; y)[0]"><marker id="mk-3488378134" markerWidth="10.000000" markerHeight="12.000000" refX="7.000000" refY="6.000000" viewBox="0.000000 0.000000 10.000000 12.000000" orient="auto" markerUnits="userSpaceOnUse"> <polygon points="0.000000,0.000000 10.000000,6.000000 0.000000,12.000000" fill="#0D32B2" class="connection fill-B1" stroke-width="2" /> </marker><path d="M 27.000000 68.000000 C 27.000000 106.000000 27.000000 126.000000 27.000000 162.000000" stroke="#0D32B2" fill="none" class="connection stroke-B1" style="stroke-width:2;" marker-end="url(#mk-3488378134)" mask="url(#d2-1843626214)" /></g><mask id="d2-1843626214" maskUnits="userSpaceOnUse" x="-101" y="-101" width="256" height="434">
-||||||| parent of 33280fed5 (fixed e2e tests)
-		.d2-1843626214 .fill-N1{fill:#0A0F25;}
-		.d2-1843626214 .fill-N2{fill:#676C7E;}
-		.d2-1843626214 .fill-N3{fill:#9499AB;}
-		.d2-1843626214 .fill-N4{fill:#CFD2DD;}
-		.d2-1843626214 .fill-N5{fill:#DEE1EB;}
-		.d2-1843626214 .fill-N6{fill:#EEF1F8;}
-		.d2-1843626214 .fill-N7{fill:#FFFFFF;}
-		.d2-1843626214 .fill-B1{fill:#0D32B2;}
-		.d2-1843626214 .fill-B2{fill:#0D32B2;}
-		.d2-1843626214 .fill-B3{fill:#E3E9FD;}
-		.d2-1843626214 .fill-B4{fill:#E3E9FD;}
-		.d2-1843626214 .fill-B5{fill:#EDF0FD;}
-		.d2-1843626214 .fill-B6{fill:#F7F8FE;}
-		.d2-1843626214 .fill-AA2{fill:#4A6FF3;}
-		.d2-1843626214 .fill-AA4{fill:#EDF0FD;}
-		.d2-1843626214 .fill-AA5{fill:#F7F8FE;}
-		.d2-1843626214 .fill-AB4{fill:#EDF0FD;}
-		.d2-1843626214 .fill-AB5{fill:#F7F8FE;}
-		.d2-1843626214 .stroke-N1{stroke:#0A0F25;}
-		.d2-1843626214 .stroke-N2{stroke:#676C7E;}
-		.d2-1843626214 .stroke-N3{stroke:#9499AB;}
-		.d2-1843626214 .stroke-N4{stroke:#CFD2DD;}
-		.d2-1843626214 .stroke-N5{stroke:#DEE1EB;}
-		.d2-1843626214 .stroke-N6{stroke:#EEF1F8;}
-		.d2-1843626214 .stroke-N7{stroke:#FFFFFF;}
-		.d2-1843626214 .stroke-B1{stroke:#0D32B2;}
-		.d2-1843626214 .stroke-B2{stroke:#0D32B2;}
-		.d2-1843626214 .stroke-B3{stroke:#E3E9FD;}
-		.d2-1843626214 .stroke-B4{stroke:#E3E9FD;}
-		.d2-1843626214 .stroke-B5{stroke:#EDF0FD;}
-		.d2-1843626214 .stroke-B6{stroke:#F7F8FE;}
-		.d2-1843626214 .stroke-AA2{stroke:#4A6FF3;}
-		.d2-1843626214 .stroke-AA4{stroke:#EDF0FD;}
-		.d2-1843626214 .stroke-AA5{stroke:#F7F8FE;}
-		.d2-1843626214 .stroke-AB4{stroke:#EDF0FD;}
-		.d2-1843626214 .stroke-AB5{stroke:#F7F8FE;}
-		.d2-1843626214 .background-color-N1{background-color:#0A0F25;}
-		.d2-1843626214 .background-color-N2{background-color:#676C7E;}
-		.d2-1843626214 .background-color-N3{background-color:#9499AB;}
-		.d2-1843626214 .background-color-N4{background-color:#CFD2DD;}
-		.d2-1843626214 .background-color-N5{background-color:#DEE1EB;}
-		.d2-1843626214 .background-color-N6{background-color:#EEF1F8;}
-		.d2-1843626214 .background-color-N7{background-color:#FFFFFF;}
-		.d2-1843626214 .background-color-B1{background-color:#0D32B2;}
-		.d2-1843626214 .background-color-B2{background-color:#0D32B2;}
-		.d2-1843626214 .background-color-B3{background-color:#E3E9FD;}
-		.d2-1843626214 .background-color-B4{background-color:#E3E9FD;}
-		.d2-1843626214 .background-color-B5{background-color:#EDF0FD;}
-		.d2-1843626214 .background-color-B6{background-color:#F7F8FE;}
-		.d2-1843626214 .background-color-AA2{background-color:#4A6FF3;}
-		.d2-1843626214 .background-color-AA4{background-color:#EDF0FD;}
-		.d2-1843626214 .background-color-AA5{background-color:#F7F8FE;}
-		.d2-1843626214 .background-color-AB4{background-color:#EDF0FD;}
-		.d2-1843626214 .background-color-AB5{background-color:#F7F8FE;}
-		.d2-1843626214 .color-N1{color:#0A0F25;}
-		.d2-1843626214 .color-N2{color:#676C7E;}
-		.d2-1843626214 .color-N3{color:#9499AB;}
-		.d2-1843626214 .color-N4{color:#CFD2DD;}
-		.d2-1843626214 .color-N5{color:#DEE1EB;}
-		.d2-1843626214 .color-N6{color:#EEF1F8;}
-		.d2-1843626214 .color-N7{color:#FFFFFF;}
-		.d2-1843626214 .color-B1{color:#0D32B2;}
-		.d2-1843626214 .color-B2{color:#0D32B2;}
-		.d2-1843626214 .color-B3{color:#E3E9FD;}
-		.d2-1843626214 .color-B4{color:#E3E9FD;}
-		.d2-1843626214 .color-B5{color:#EDF0FD;}
-		.d2-1843626214 .color-B6{color:#F7F8FE;}
-		.d2-1843626214 .color-AA2{color:#4A6FF3;}
-		.d2-1843626214 .color-AA4{color:#EDF0FD;}
-		.d2-1843626214 .color-AA5{color:#F7F8FE;}
-		.d2-1843626214 .color-AB4{color:#EDF0FD;}
-		.d2-1843626214 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]></style><g id="x"><g class="shape" ><rect x="1.000000" y="0.000000" width="53.000000" height="66.000000" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="27.500000" y="38.500000" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">x</text></g><g id="y"><g class="shape" ><rect x="0.000000" y="166.000000" width="54.000000" height="66.000000" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="27.000000" y="204.500000" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">y</text></g><g id="(x -&gt; y)[0]"><marker id="mk-3488378134" markerWidth="10.000000" markerHeight="12.000000" refX="7.000000" refY="6.000000" viewBox="0.000000 0.000000 10.000000 12.000000" orient="auto" markerUnits="userSpaceOnUse"> <polygon points="0.000000,0.000000 10.000000,6.000000 0.000000,12.000000" class="connection fill-B1" stroke-width="2" /> </marker><path d="M 27.000000 68.000000 C 27.000000 106.000000 27.000000 126.000000 27.000000 162.000000" fill="none" class="connection stroke-B1" style="stroke-width:2;" marker-end="url(#mk-3488378134)" mask="url(#d2-1843626214)" /></g><mask id="d2-1843626214" maskUnits="userSpaceOnUse" x="-101" y="-101" width="256" height="434">
-=======
 		.d2-4198988860 .fill-N1{fill:#0A0F25;}
 		.d2-4198988860 .fill-N2{fill:#676C7E;}
 		.d2-4198988860 .fill-N3{fill:#9499AB;}
@@ -258,8 +89,7 @@
 		.d2-4198988860 .color-AA4{color:#EDF0FD;}
 		.d2-4198988860 .color-AA5{color:#F7F8FE;}
 		.d2-4198988860 .color-AB4{color:#EDF0FD;}
-		.d2-4198988860 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]></style><g id="x"><g class="shape" ><rect x="1.000000" y="0.000000" width="53.000000" height="66.000000" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="27.500000" y="38.500000" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">x</text></g><g id="y"><g class="shape" ><rect x="0.000000" y="166.000000" width="54.000000" height="66.000000" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="27.000000" y="204.500000" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">y</text></g><g id="(x -&gt; y)[0]"><marker id="mk-3488378134" markerWidth="10.000000" markerHeight="12.000000" refX="7.000000" refY="6.000000" viewBox="0.000000 0.000000 10.000000 12.000000" orient="auto" markerUnits="userSpaceOnUse"> <polygon points="0.000000,0.000000 10.000000,6.000000 0.000000,12.000000" class="connection fill-B1" stroke-width="2" /> </marker><path d="M 27.000000 68.000000 C 27.000000 106.000000 27.000000 126.000000 27.000000 162.000000" fill="none" class="connection stroke-B1" style="stroke-width:2;" marker-end="url(#mk-3488378134)" mask="url(#d2-4198988860)" /></g><mask id="d2-4198988860" maskUnits="userSpaceOnUse" x="-101" y="-101" width="256" height="434">
+		.d2-4198988860 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]></style><g id="x"><g class="shape" ><rect x="1.000000" y="0.000000" width="53.000000" height="66.000000" stroke="#0D32B2" fill="#F7F8FE" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="27.500000" y="38.500000" fill="#0A0F25" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">x</text></g><g id="y"><g class="shape" ><rect x="0.000000" y="166.000000" width="54.000000" height="66.000000" stroke="#0D32B2" fill="#F7F8FE" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="27.000000" y="204.500000" fill="#0A0F25" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">y</text></g><g id="(x -&gt; y)[0]"><marker id="mk-3488378134" markerWidth="10.000000" markerHeight="12.000000" refX="7.000000" refY="6.000000" viewBox="0.000000 0.000000 10.000000 12.000000" orient="auto" markerUnits="userSpaceOnUse"> <polygon points="0.000000,0.000000 10.000000,6.000000 0.000000,12.000000" fill="#0D32B2" class="connection fill-B1" stroke-width="2" /> </marker><path d="M 27.000000 68.000000 C 27.000000 106.000000 27.000000 126.000000 27.000000 162.000000" stroke="#0D32B2" fill="none" class="connection stroke-B1" style="stroke-width:2;" marker-end="url(#mk-3488378134)" mask="url(#d2-4198988860)" /></g><mask id="d2-4198988860" maskUnits="userSpaceOnUse" x="-101" y="-101" width="256" height="434">
->>>>>>> 33280fed5 (fixed e2e tests)
 <rect x="-101" y="-101" width="256" height="434" fill="white"></rect>
 <rect x="23.500000" y="22.500000" width="8" height="21" fill="rgba(0,0,0,0.75)"></rect>
 <rect x="22.500000" y="188.500000" width="9" height="21" fill="rgba(0,0,0,0.75)"></rect>

e2etests-cli/testdata/TestCLI_E2E/empty-base.exp.svg

@@ -1,28 +1,4 @@
-<<<<<<< HEAD
-<<<<<<< HEAD
 <?xml version="1.0" encoding="utf-8"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" d2Version="v0.6.8-HEAD" preserveAspectRatio="xMinYMin meet" viewBox="0 0 368 766"><svg id="d2-svg" width="368" height="766" viewBox="-101 -101 368 766"><style type="text/css"><![CDATA[
-||||||| parent of 33280fed5 (fixed e2e tests)
-<?xml version="1.0" encoding="utf-8"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" d2Version="v0.6.6-HEAD" preserveAspectRatio="xMinYMin meet" viewBox="0 0 368 766"><svg id="d2-svg" width="368" height="766" viewBox="-101 -101 368 766"><style type="text/css"><![CDATA[
-=======
-<<<<<<< HEAD
-||||||| parent of cb2f2823c (Fix changes)
-<<<<<<< HEAD
-=======
->>>>>>> cb2f2823c (Fix changes)
-<?xml version="1.0" encoding="utf-8"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" d2Version="v0.6.6-HEAD" preserveAspectRatio="xMinYMin meet" viewBox="0 0 368 766"><svg id="d2-svg" width="368" height="766" viewBox="-101 -101 368 766"><style type="text/css"><![CDATA[
-<<<<<<< HEAD
->>>>>>> 33280fed5 (fixed e2e tests)
-.d2-1574744994 .text-bold {
-	font-family: "d2-1574744994-font-bold";
-=======
-<?xml version="1.0" encoding="utf-8"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" d2Version="v0.6.5-HEAD" preserveAspectRatio="xMinYMin meet" viewBox="0 0 368 766"><svg id="d2-svg" width="368" height="766" viewBox="-101 -101 368 766"><style type="text/css"><![CDATA[
-||||||| parent of cb2f2823c (Fix changes)
-.d2-1574744994 .text-bold {
-	font-family: "d2-1574744994-font-bold";
-=======
-<?xml version="1.0" encoding="utf-8"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" d2Version="v0.6.5-HEAD" preserveAspectRatio="xMinYMin meet" viewBox="0 0 368 766"><svg id="d2-svg" width="368" height="766" viewBox="-101 -101 368 766"><style type="text/css"><![CDATA[
-=======
->>>>>>> cb2f2823c (Fix changes)
 .d2-2628216882 .text-bold {
 	font-family: "d2-2628216882-font-bold";
 }
@@ -140,35 +116,17 @@
 		66.666667%, 100.000000% {
 				opacity: 1;
 		}
-<<<<<<< HEAD
+}]]></style><g style="animation: d2Transition-d2-2628216882-0 4200ms infinite"  class="d2-2628216882" width="255" height="434" viewBox="-101 -101 255 434"><rect x="-101.000000" y="-101.000000" width="255.000000" height="434.000000" rx="0.000000" fill="#FFFFFF" class=" fill-N7" stroke-width="0" /><g id="a"><g class="shape" ><rect x="0.000000" y="0.000000" width="53.000000" height="66.000000" stroke="#0D32B2" fill="#F7F8FE" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="26.500000" y="38.500000" fill="#0A0F25" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">a</text></g><g id="b"><g class="shape" ><rect x="0.000000" y="166.000000" width="53.000000" height="66.000000" stroke="#0D32B2" fill="#F7F8FE" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="26.500000" y="204.500000" fill="#0A0F25" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">b</text></g><g id="(a -&gt; b)[0]"><marker id="mk-3488378134" markerWidth="10.000000" markerHeight="12.000000" refX="7.000000" refY="6.000000" viewBox="0.000000 0.000000 10.000000 12.000000" orient="auto" markerUnits="userSpaceOnUse"> <polygon points="0.000000,0.000000 10.000000,6.000000 0.000000,12.000000" fill="#0D32B2" class="connection fill-B1" stroke-width="2" /> </marker><path d="M 26.500000 68.000000 C 26.500000 106.000000 26.500000 126.000000 26.500000 162.000000" stroke="#0D32B2" fill="none" class="connection stroke-B1" style="stroke-width:2;" marker-end="url(#mk-3488378134)" mask="url(#d2-3918947874)" /></g><mask id="d2-3918947874" maskUnits="userSpaceOnUse" x="-101" y="-101" width="255" height="434">
-}]]></style><g style="animation: d2Transition-d2-1574744994-0 4200ms infinite"  class="d2-1574744994" width="255" height="434" viewBox="-101 -101 255 434"><rect x="-101.000000" y="-101.000000" width="255.000000" height="434.000000" rx="0.000000" fill="#FFFFFF" class=" fill-N7" stroke-width="0" /><g id="a"><g class="shape" ><rect x="0.000000" y="0.000000" width="53.000000" height="66.000000" stroke="#0D32B2" fill="#F7F8FE" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="26.500000" y="38.500000" fill="#0A0F25" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">a</text></g><g id="b"><g class="shape" ><rect x="0.000000" y="166.000000" width="53.000000" height="66.000000" stroke="#0D32B2" fill="#F7F8FE" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="26.500000" y="204.500000" fill="#0A0F25" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">b</text></g><g id="(a -&gt; b)[0]"><marker id="mk-3488378134" markerWidth="10.000000" markerHeight="12.000000" refX="7.000000" refY="6.000000" viewBox="0.000000 0.000000 10.000000 12.000000" orient="auto" markerUnits="userSpaceOnUse"> <polygon points="0.000000,0.000000 10.000000,6.000000 0.000000,12.000000" fill="#0D32B2" class="connection fill-B1" stroke-width="2" /> </marker><path d="M 26.500000 68.000000 C 26.500000 106.000000 26.500000 126.000000 26.500000 162.000000" stroke="#0D32B2" fill="none" class="connection stroke-B1" style="stroke-width:2;" marker-end="url(#mk-3488378134)" mask="url(#d2-1919875308)" /></g><mask id="d2-1919875308" maskUnits="userSpaceOnUse" x="-101" y="-101" width="255" height="434">
-||||||| parent of 33280fed5 (fixed e2e tests)
-}]]></style><g style="animation: d2Transition-d2-1574744994-0 4200ms infinite"  class="d2-1574744994" width="255" height="434" viewBox="-101 -101 255 434"><rect x="-101.000000" y="-101.000000" width="255.000000" height="434.000000" rx="0.000000" class=" fill-N7" stroke-width="0" /><g id="a"><g class="shape" ><rect x="0.000000" y="0.000000" width="53.000000" height="66.000000" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="26.500000" y="38.500000" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">a</text></g><g id="b"><g class="shape" ><rect x="0.000000" y="166.000000" width="53.000000" height="66.000000" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="26.500000" y="204.500000" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">b</text></g><g id="(a -&gt; b)[0]"><marker id="mk-3488378134" markerWidth="10.000000" markerHeight="12.000000" refX="7.000000" refY="6.000000" viewBox="0.000000 0.000000 10.000000 12.000000" orient="auto" markerUnits="userSpaceOnUse"> <polygon points="0.000000,0.000000 10.000000,6.000000 0.000000,12.000000" class="connection fill-B1" stroke-width="2" /> </marker><path d="M 26.500000 68.000000 C 26.500000 106.000000 26.500000 126.000000 26.500000 162.000000" fill="none" class="connection stroke-B1" style="stroke-width:2;" marker-end="url(#mk-3488378134)" mask="url(#d2-1919875308)" /></g><mask id="d2-1919875308" maskUnits="userSpaceOnUse" x="-101" y="-101" width="255" height="434">
-=======
-}]]></style><g style="animation: d2Transition-d2-2628216882-0 4200ms infinite"  class="d2-2628216882" width="255" height="434" viewBox="-101 -101 255 434"><rect x="-101.000000" y="-101.000000" width="255.000000" height="434.000000" rx="0.000000" class=" fill-N7" stroke-width="0" /><g id="a"><g class="shape" ><rect x="0.000000" y="0.000000" width="53.000000" height="66.000000" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="26.500000" y="38.500000" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">a</text></g><g id="b"><g class="shape" ><rect x="0.000000" y="166.000000" width="53.000000" height="66.000000" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="26.500000" y="204.500000" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">b</text></g><g id="(a -&gt; b)[0]"><marker id="mk-3488378134" markerWidth="10.000000" markerHeight="12.000000" refX="7.000000" refY="6.000000" viewBox="0.000000 0.000000 10.000000 12.000000" orient="auto" markerUnits="userSpaceOnUse"> <polygon points="0.000000,0.000000 10.000000,6.000000 0.000000,12.000000" class="connection fill-B1" stroke-width="2" /> </marker><path d="M 26.500000 68.000000 C 26.500000 106.000000 26.500000 126.000000 26.500000 162.000000" fill="none" class="connection stroke-B1" style="stroke-width:2;" marker-end="url(#mk-3488378134)" mask="url(#d2-3918947874)" /></g><mask id="d2-3918947874" maskUnits="userSpaceOnUse" x="-101" y="-101" width="255" height="434">
->>>>>>> 33280fed5 (fixed e2e tests)
 <rect x="-101" y="-101" width="255" height="434" fill="white"></rect>
 <rect x="22.500000" y="22.500000" width="8" height="21" fill="rgba(0,0,0,0.75)"></rect>
 <rect x="22.500000" y="188.500000" width="8" height="21" fill="rgba(0,0,0,0.75)"></rect>
-<<<<<<< HEAD
+</mask></g><g style="animation: d2Transition-d2-2628216882-1 4200ms infinite"  class="d2-2628216882" width="368" height="600" viewBox="-101 -101 368 600"><rect x="-101.000000" y="-101.000000" width="368.000000" height="600.000000" rx="0.000000" fill="#FFFFFF" class=" fill-N7" stroke-width="0" /><g id="a"><g class="shape" ><rect x="0.000000" y="0.000000" width="53.000000" height="66.000000" stroke="#0D32B2" fill="#F7F8FE" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="26.500000" y="38.500000" fill="#0A0F25" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">a</text></g><g id="b"><g class="shape" ><rect x="0.000000" y="166.000000" width="53.000000" height="66.000000" stroke="#0D32B2" fill="#F7F8FE" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="26.500000" y="204.500000" fill="#0A0F25" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">b</text></g><g id="d"><g class="shape" ><rect x="56.000000" y="332.000000" width="54.000000" height="66.000000" stroke="#0D32B2" fill="#F7F8FE" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="83.000000" y="370.500000" fill="#0A0F25" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">d</text></g><g id="c"><g class="shape" ><rect x="113.000000" y="166.000000" width="53.000000" height="66.000000" stroke="#0D32B2" fill="#F7F8FE" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="139.500000" y="204.500000" fill="#0A0F25" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">c</text></g><g id="(a -&gt; b)[0]"><marker id="mk-3488378134" markerWidth="10.000000" markerHeight="12.000000" refX="7.000000" refY="6.000000" viewBox="0.000000 0.000000 10.000000 12.000000" orient="auto" markerUnits="userSpaceOnUse"> <polygon points="0.000000,0.000000 10.000000,6.000000 0.000000,12.000000" fill="#0D32B2" class="connection fill-B1" stroke-width="2" /> </marker><path d="M 26.500000 68.000000 C 26.500000 106.000000 26.500000 126.000000 26.500000 162.000000" stroke="#0D32B2" fill="none" class="connection stroke-B1" style="stroke-width:2;" marker-end="url(#mk-3488378134)" mask="url(#d2-624927376)" /></g><g id="(b -&gt; d)[0]"><path d="M 26.500000 234.000000 C 26.500000 272.000000 33.299999 292.000000 58.250760 328.692294" stroke="#0D32B2" fill="none" class="connection stroke-B1" style="stroke-width:2;" marker-end="url(#mk-3488378134)" mask="url(#d2-624927376)" /></g><g id="(c -&gt; d)[0]"><path d="M 139.500000 234.000000 C 139.500000 272.000000 132.699997 292.000000 107.749240 328.692294" stroke="#0D32B2" fill="none" class="connection stroke-B1" style="stroke-width:2;" marker-end="url(#mk-3488378134)" mask="url(#d2-624927376)" /></g><mask id="d2-624927376" maskUnits="userSpaceOnUse" x="-101" y="-101" width="368" height="600">
-</mask></g><g style="animation: d2Transition-d2-1574744994-1 4200ms infinite"  class="d2-1574744994" width="368" height="600" viewBox="-101 -101 368 600"><rect x="-101.000000" y="-101.000000" width="368.000000" height="600.000000" rx="0.000000" fill="#FFFFFF" class=" fill-N7" stroke-width="0" /><g id="a"><g class="shape" ><rect x="0.000000" y="0.000000" width="53.000000" height="66.000000" stroke="#0D32B2" fill="#F7F8FE" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="26.500000" y="38.500000" fill="#0A0F25" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">a</text></g><g id="b"><g class="shape" ><rect x="0.000000" y="166.000000" width="53.000000" height="66.000000" stroke="#0D32B2" fill="#F7F8FE" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="26.500000" y="204.500000" fill="#0A0F25" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">b</text></g><g id="d"><g class="shape" ><rect x="56.000000" y="332.000000" width="54.000000" height="66.000000" stroke="#0D32B2" fill="#F7F8FE" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="83.000000" y="370.500000" fill="#0A0F25" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">d</text></g><g id="c"><g class="shape" ><rect x="113.000000" y="166.000000" width="53.000000" height="66.000000" stroke="#0D32B2" fill="#F7F8FE" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="139.500000" y="204.500000" fill="#0A0F25" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">c</text></g><g id="(a -&gt; b)[0]"><marker id="mk-3488378134" markerWidth="10.000000" markerHeight="12.000000" refX="7.000000" refY="6.000000" viewBox="0.000000 0.000000 10.000000 12.000000" orient="auto" markerUnits="userSpaceOnUse"> <polygon points="0.000000,0.000000 10.000000,6.000000 0.000000,12.000000" fill="#0D32B2" class="connection fill-B1" stroke-width="2" /> </marker><path d="M 26.500000 68.000000 C 26.500000 106.000000 26.500000 126.000000 26.500000 162.000000" stroke="#0D32B2" fill="none" class="connection stroke-B1" style="stroke-width:2;" marker-end="url(#mk-3488378134)" mask="url(#d2-483309782)" /></g><g id="(b -&gt; d)[0]"><path d="M 26.500000 234.000000 C 26.500000 272.000000 33.299999 292.000000 58.250760 328.692294" stroke="#0D32B2" fill="none" class="connection stroke-B1" style="stroke-width:2;" marker-end="url(#mk-3488378134)" mask="url(#d2-483309782)" /></g><g id="(c -&gt; d)[0]"><path d="M 139.500000 234.000000 C 139.500000 272.000000 132.699997 292.000000 107.749240 328.692294" stroke="#0D32B2" fill="none" class="connection stroke-B1" style="stroke-width:2;" marker-end="url(#mk-3488378134)" mask="url(#d2-483309782)" /></g><mask id="d2-483309782" maskUnits="userSpaceOnUse" x="-101" y="-101" width="368" height="600">
-||||||| parent of 33280fed5 (fixed e2e tests)
-</mask></g><g style="animation: d2Transition-d2-1574744994-1 4200ms infinite"  class="d2-1574744994" width="368" height="600" viewBox="-101 -101 368 600"><rect x="-101.000000" y="-101.000000" width="368.000000" height="600.000000" rx="0.000000" class=" fill-N7" stroke-width="0" /><g id="a"><g class="shape" ><rect x="0.000000" y="0.000000" width="53.000000" height="66.000000" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="26.500000" y="38.500000" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">a</text></g><g id="b"><g class="shape" ><rect x="0.000000" y="166.000000" width="53.000000" height="66.000000" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="26.500000" y="204.500000" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">b</text></g><g id="d"><g class="shape" ><rect x="56.000000" y="332.000000" width="54.000000" height="66.000000" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="83.000000" y="370.500000" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">d</text></g><g id="c"><g class="shape" ><rect x="113.000000" y="166.000000" width="53.000000" height="66.000000" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="139.500000" y="204.500000" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">c</text></g><g id="(a -&gt; b)[0]"><marker id="mk-3488378134" markerWidth="10.000000" markerHeight="12.000000" refX="7.000000" refY="6.000000" viewBox="0.000000 0.000000 10.000000 12.000000" orient="auto" markerUnits="userSpaceOnUse"> <polygon points="0.000000,0.000000 10.000000,6.000000 0.000000,12.000000" class="connection fill-B1" stroke-width="2" /> </marker><path d="M 26.500000 68.000000 C 26.500000 106.000000 26.500000 126.000000 26.500000 162.000000" fill="none" class="connection stroke-B1" style="stroke-width:2;" marker-end="url(#mk-3488378134)" mask="url(#d2-483309782)" /></g><g id="(b -&gt; d)[0]"><path d="M 26.500000 234.000000 C 26.500000 272.000000 33.299999 292.000000 58.250760 328.692294" fill="none" class="connection stroke-B1" style="stroke-width:2;" marker-end="url(#mk-3488378134)" mask="url(#d2-483309782)" /></g><g id="(c -&gt; d)[0]"><path d="M 139.500000 234.000000 C 139.500000 272.000000 132.699997 292.000000 107.749240 328.692294" fill="none" class="connection stroke-B1" style="stroke-width:2;" marker-end="url(#mk-3488378134)" mask="url(#d2-483309782)" /></g><mask id="d2-483309782" maskUnits="userSpaceOnUse" x="-101" y="-101" width="368" height="600">
-=======
-</mask></g><g style="animation: d2Transition-d2-2628216882-1 4200ms infinite"  class="d2-2628216882" width="368" height="600" viewBox="-101 -101 368 600"><rect x="-101.000000" y="-101.000000" width="368.000000" height="600.000000" rx="0.000000" class=" fill-N7" stroke-width="0" /><g id="a"><g class="shape" ><rect x="0.000000" y="0.000000" width="53.000000" height="66.000000" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="26.500000" y="38.500000" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">a</text></g><g id="b"><g class="shape" ><rect x="0.000000" y="166.000000" width="53.000000" height="66.000000" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="26.500000" y="204.500000" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">b</text></g><g id="d"><g class="shape" ><rect x="56.000000" y="332.000000" width="54.000000" height="66.000000" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="83.000000" y="370.500000" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">d</text></g><g id="c"><g class="shape" ><rect x="113.000000" y="166.000000" width="53.000000" height="66.000000" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="139.500000" y="204.500000" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">c</text></g><g id="(a -&gt; b)[0]"><marker id="mk-3488378134" markerWidth="10.000000" markerHeight="12.000000" refX="7.000000" refY="6.000000" viewBox="0.000000 0.000000 10.000000 12.000000" orient="auto" markerUnits="userSpaceOnUse"> <polygon points="0.000000,0.000000 10.000000,6.000000 0.000000,12.000000" class="connection fill-B1" stroke-width="2" /> </marker><path d="M 26.500000 68.000000 C 26.500000 106.000000 26.500000 126.000000 26.500000 162.000000" fill="none" class="connection stroke-B1" style="stroke-width:2;" marker-end="url(#mk-3488378134)" mask="url(#d2-624927376)" /></g><g id="(b -&gt; d)[0]"><path d="M 26.500000 234.000000 C 26.500000 272.000000 33.299999 292.000000 58.250760 328.692294" fill="none" class="connection stroke-B1" style="stroke-width:2;" marker-end="url(#mk-3488378134)" mask="url(#d2-624927376)" /></g><g id="(c -&gt; d)[0]"><path d="M 139.500000 234.000000 C 139.500000 272.000000 132.699997 292.000000 107.749240 328.692294" fill="none" class="connection stroke-B1" style="stroke-width:2;" marker-end="url(#mk-3488378134)" mask="url(#d2-624927376)" /></g><mask id="d2-624927376" maskUnits="userSpaceOnUse" x="-101" y="-101" width="368" height="600">
->>>>>>> 33280fed5 (fixed e2e tests)
 <rect x="-101" y="-101" width="368" height="600" fill="white"></rect>
 <rect x="22.500000" y="22.500000" width="8" height="21" fill="rgba(0,0,0,0.75)"></rect>
 <rect x="22.500000" y="188.500000" width="8" height="21" fill="rgba(0,0,0,0.75)"></rect>
 <rect x="78.500000" y="354.500000" width="9" height="21" fill="rgba(0,0,0,0.75)"></rect>
 <rect x="135.500000" y="188.500000" width="8" height="21" fill="rgba(0,0,0,0.75)"></rect>
-<<<<<<< HEAD
+</mask></g><g style="animation: d2Transition-d2-2628216882-2 4200ms infinite"  class="d2-2628216882" width="368" height="766" viewBox="-101 -101 368 766"><rect x="-101.000000" y="-101.000000" width="368.000000" height="766.000000" rx="0.000000" fill="#FFFFFF" class=" fill-N7" stroke-width="0" /><g id="a"><g class="shape" ><rect x="0.000000" y="0.000000" width="53.000000" height="66.000000" stroke="#0D32B2" fill="#F7F8FE" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="26.500000" y="38.500000" fill="#0A0F25" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">a</text></g><g id="b"><g class="shape" ><rect x="0.000000" y="166.000000" width="53.000000" height="66.000000" stroke="#0D32B2" fill="#F7F8FE" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="26.500000" y="204.500000" fill="#0A0F25" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">b</text></g><g id="d"><g class="shape" ><rect x="56.000000" y="332.000000" width="54.000000" height="66.000000" stroke="#0D32B2" fill="#F7F8FE" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="83.000000" y="370.500000" fill="#0A0F25" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">d</text></g><g id="c"><g class="shape" ><rect x="113.000000" y="166.000000" width="53.000000" height="66.000000" stroke="#0D32B2" fill="#F7F8FE" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="139.500000" y="204.500000" fill="#0A0F25" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">c</text></g><g id="e"><g class="shape" ><rect x="57.000000" y="498.000000" width="53.000000" height="66.000000" stroke="#0D32B2" fill="#F7F8FE" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="83.500000" y="536.500000" fill="#0A0F25" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">e</text></g><g id="(a -&gt; b)[0]"><marker id="mk-3488378134" markerWidth="10.000000" markerHeight="12.000000" refX="7.000000" refY="6.000000" viewBox="0.000000 0.000000 10.000000 12.000000" orient="auto" markerUnits="userSpaceOnUse"> <polygon points="0.000000,0.000000 10.000000,6.000000 0.000000,12.000000" fill="#0D32B2" class="connection fill-B1" stroke-width="2" /> </marker><path d="M 26.500000 68.000000 C 26.500000 106.000000 26.500000 126.000000 26.500000 162.000000" stroke="#0D32B2" fill="none" class="connection stroke-B1" style="stroke-width:2;" marker-end="url(#mk-3488378134)" mask="url(#d2-3022566698)" /></g><g id="(b -&gt; d)[0]"><path d="M 26.500000 234.000000 C 26.500000 272.000000 33.299999 292.000000 58.250760 328.692294" stroke="#0D32B2" fill="none" class="connection stroke-B1" style="stroke-width:2;" marker-end="url(#mk-3488378134)" mask="url(#d2-3022566698)" /></g><g id="(c -&gt; d)[0]"><path d="M 139.500000 234.000000 C 139.500000 272.000000 132.699997 292.000000 107.749240 328.692294" stroke="#0D32B2" fill="none" class="connection stroke-B1" style="stroke-width:2;" marker-end="url(#mk-3488378134)" mask="url(#d2-3022566698)" /></g><g id="(d -&gt; e)[0]"><path d="M 83.000000 400.000000 C 83.000000 438.000000 83.000000 458.000000 83.000000 494.000000" stroke="#0D32B2" fill="none" class="connection stroke-B1" style="stroke-width:2;" marker-end="url(#mk-3488378134)" mask="url(#d2-3022566698)" /></g><mask id="d2-3022566698" maskUnits="userSpaceOnUse" x="-101" y="-101" width="368" height="766">
-</mask></g><g style="animation: d2Transition-d2-1574744994-2 4200ms infinite"  class="d2-1574744994" width="368" height="766" viewBox="-101 -101 368 766"><rect x="-101.000000" y="-101.000000" width="368.000000" height="766.000000" rx="0.000000" fill="#FFFFFF" class=" fill-N7" stroke-width="0" /><g id="a"><g class="shape" ><rect x="0.000000" y="0.000000" width="53.000000" height="66.000000" stroke="#0D32B2" fill="#F7F8FE" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="26.500000" y="38.500000" fill="#0A0F25" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">a</text></g><g id="b"><g class="shape" ><rect x="0.000000" y="166.000000" width="53.000000" height="66.000000" stroke="#0D32B2" fill="#F7F8FE" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="26.500000" y="204.500000" fill="#0A0F25" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">b</text></g><g id="d"><g class="shape" ><rect x="56.000000" y="332.000000" width="54.000000" height="66.000000" stroke="#0D32B2" fill="#F7F8FE" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="83.000000" y="370.500000" fill="#0A0F25" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">d</text></g><g id="c"><g class="shape" ><rect x="113.000000" y="166.000000" width="53.000000" height="66.000000" stroke="#0D32B2" fill="#F7F8FE" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="139.500000" y="204.500000" fill="#0A0F25" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">c</text></g><g id="e"><g class="shape" ><rect x="57.000000" y="498.000000" width="53.000000" height="66.000000" stroke="#0D32B2" fill="#F7F8FE" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="83.500000" y="536.500000" fill="#0A0F25" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">e</text></g><g id="(a -&gt; b)[0]"><marker id="mk-3488378134" markerWidth="10.000000" markerHeight="12.000000" refX="7.000000" refY="6.000000" viewBox="0.000000 0.000000 10.000000 12.000000" orient="auto" markerUnits="userSpaceOnUse"> <polygon points="0.000000,0.000000 10.000000,6.000000 0.000000,12.000000" fill="#0D32B2" class="connection fill-B1" stroke-width="2" /> </marker><path d="M 26.500000 68.000000 C 26.500000 106.000000 26.500000 126.000000 26.500000 162.000000" stroke="#0D32B2" fill="none" class="connection stroke-B1" style="stroke-width:2;" marker-end="url(#mk-3488378134)" mask="url(#d2-2079318802)" /></g><g id="(b -&gt; d)[0]"><path d="M 26.500000 234.000000 C 26.500000 272.000000 33.299999 292.000000 58.250760 328.692294" stroke="#0D32B2" fill="none" class="connection stroke-B1" style="stroke-width:2;" marker-end="url(#mk-3488378134)" mask="url(#d2-2079318802)" /></g><g id="(c -&gt; d)[0]"><path d="M 139.500000 234.000000 C 139.500000 272.000000 132.699997 292.000000 107.749240 328.692294" stroke="#0D32B2" fill="none" class="connection stroke-B1" style="stroke-width:2;" marker-end="url(#mk-3488378134)" mask="url(#d2-2079318802)" /></g><g id="(d -&gt; e)[0]"><path d="M 83.000000 400.000000 C 83.000000 438.000000 83.000000 458.000000 83.000000 494.000000" stroke="#0D32B2" fill="none" class="connection stroke-B1" style="stroke-width:2;" marker-end="url(#mk-3488378134)" mask="url(#d2-2079318802)" /></g><mask id="d2-2079318802" maskUnits="userSpaceOnUse" x="-101" y="-101" width="368" height="766">
-||||||| parent of 33280fed5 (fixed e2e tests)
-</mask></g><g style="animation: d2Transition-d2-1574744994-2 4200ms infinite"  class="d2-1574744994" width="368" height="766" viewBox="-101 -101 368 766"><rect x="-101.000000" y="-101.000000" width="368.000000" height="766.000000" rx="0.000000" class=" fill-N7" stroke-width="0" /><g id="a"><g class="shape" ><rect x="0.000000" y="0.000000" width="53.000000" height="66.000000" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="26.500000" y="38.500000" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">a</text></g><g id="b"><g class="shape" ><rect x="0.000000" y="166.000000" width="53.000000" height="66.000000" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="26.500000" y="204.500000" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">b</text></g><g id="d"><g class="shape" ><rect x="56.000000" y="332.000000" width="54.000000" height="66.000000" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="83.000000" y="370.500000" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">d</text></g><g id="c"><g class="shape" ><rect x="113.000000" y="166.000000" width="53.000000" height="66.000000" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="139.500000" y="204.500000" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">c</text></g><g id="e"><g class="shape" ><rect x="57.000000" y="498.000000" width="53.000000" height="66.000000" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="83.500000" y="536.500000" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">e</text></g><g id="(a -&gt; b)[0]"><marker id="mk-3488378134" markerWidth="10.000000" markerHeight="12.000000" refX="7.000000" refY="6.000000" viewBox="0.000000 0.000000 10.000000 12.000000" orient="auto" markerUnits="userSpaceOnUse"> <polygon points="0.000000,0.000000 10.000000,6.000000 0.000000,12.000000" class="connection fill-B1" stroke-width="2" /> </marker><path d="M 26.500000 68.000000 C 26.500000 106.000000 26.500000 126.000000 26.500000 162.000000" fill="none" class="connection stroke-B1" style="stroke-width:2;" marker-end="url(#mk-3488378134)" mask="url(#d2-2079318802)" /></g><g id="(b -&gt; d)[0]"><path d="M 26.500000 234.000000 C 26.500000 272.000000 33.299999 292.000000 58.250760 328.692294" fill="none" class="connection stroke-B1" style="stroke-width:2;" marker-end="url(#mk-3488378134)" mask="url(#d2-2079318802)" /></g><g id="(c -&gt; d)[0]"><path d="M 139.500000 234.000000 C 139.500000 272.000000 132.699997 292.000000 107.749240 328.692294" fill="none" class="connection stroke-B1" style="stroke-width:2;" marker-end="url(#mk-3488378134)" mask="url(#d2-2079318802)" /></g><g id="(d -&gt; e)[0]"><path d="M 83.000000 400.000000 C 83.000000 438.000000 83.000000 458.000000 83.000000 494.000000" fill="none" class="connection stroke-B1" style="stroke-width:2;" marker-end="url(#mk-3488378134)" mask="url(#d2-2079318802)" /></g><mask id="d2-2079318802" maskUnits="userSpaceOnUse" x="-101" y="-101" width="368" height="766">
-=======
-</mask></g><g style="animation: d2Transition-d2-2628216882-2 4200ms infinite"  class="d2-2628216882" width="368" height="766" viewBox="-101 -101 368 766"><rect x="-101.000000" y="-101.000000" width="368.000000" height="766.000000" rx="0.000000" class=" fill-N7" stroke-width="0" /><g id="a"><g class="shape" ><rect x="0.000000" y="0.000000" width="53.000000" height="66.000000" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="26.500000" y="38.500000" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">a</text></g><g id="b"><g class="shape" ><rect x="0.000000" y="166.000000" width="53.000000" height="66.000000" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="26.500000" y="204.500000" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">b</text></g><g id="d"><g class="shape" ><rect x="56.000000" y="332.000000" width="54.000000" height="66.000000" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="83.000000" y="370.500000" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">d</text></g><g id="c"><g class="shape" ><rect x="113.000000" y="166.000000" width="53.000000" height="66.000000" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="139.500000" y="204.500000" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">c</text></g><g id="e"><g class="shape" ><rect x="57.000000" y="498.000000" width="53.000000" height="66.000000" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="83.500000" y="536.500000" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">e</text></g><g id="(a -&gt; b)[0]"><marker id="mk-3488378134" markerWidth="10.000000" markerHeight="12.000000" refX="7.000000" refY="6.000000" viewBox="0.000000 0.000000 10.000000 12.000000" orient="auto" markerUnits="userSpaceOnUse"> <polygon points="0.000000,0.000000 10.000000,6.000000 0.000000,12.000000" class="connection fill-B1" stroke-width="2" /> </marker><path d="M 26.500000 68.000000 C 26.500000 106.000000 26.500000 126.000000 26.500000 162.000000" fill="none" class="connection stroke-B1" style="stroke-width:2;" marker-end="url(#mk-3488378134)" mask="url(#d2-3022566698)" /></g><g id="(b -&gt; d)[0]"><path d="M 26.500000 234.000000 C 26.500000 272.000000 33.299999 292.000000 58.250760 328.692294" fill="none" class="connection stroke-B1" style="stroke-width:2;" marker-end="url(#mk-3488378134)" mask="url(#d2-3022566698)" /></g><g id="(c -&gt; d)[0]"><path d="M 139.500000 234.000000 C 139.500000 272.000000 132.699997 292.000000 107.749240 328.692294" fill="none" class="connection stroke-B1" style="stroke-width:2;" marker-end="url(#mk-3488378134)" mask="url(#d2-3022566698)" /></g><g id="(d -&gt; e)[0]"><path d="M 83.000000 400.000000 C 83.000000 438.000000 83.000000 458.000000 83.000000 494.000000" fill="none" class="connection stroke-B1" style="stroke-width:2;" marker-end="url(#mk-3488378134)" mask="url(#d2-3022566698)" /></g><mask id="d2-3022566698" maskUnits="userSpaceOnUse" x="-101" y="-101" width="368" height="766">
->>>>>>> 33280fed5 (fixed e2e tests)
 <rect x="-101" y="-101" width="368" height="766" fill="white"></rect>
 <rect x="22.500000" y="22.500000" width="8" height="21" fill="rgba(0,0,0,0.75)"></rect>
 <rect x="22.500000" y="188.500000" width="8" height="21" fill="rgba(0,0,0,0.75)"></rect>

e2etests-cli/testdata/TestCLI_E2E/import.exp.svg

@@ -1,26 +1,4 @@
-<<<<<<< HEAD
+<?xml version="1.0" encoding="utf-8"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" d2Version="v0.6.8-HEAD" preserveAspectRatio="xMinYMin meet" viewBox="0 0 279 445"><svg id="d2-svg" class="d2-4289526217" width="279" height="445" viewBox="-101 -101 279 445"><rect x="-101.000000" y="-101.000000" width="279.000000" height="445.000000" rx="0.000000" fill="#FFFFFF" class=" fill-N7" stroke-width="0" /><style type="text/css"><![CDATA[
-<<<<<<< HEAD
-<?xml version="1.0" encoding="utf-8"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" d2Version="v0.6.8-HEAD" preserveAspectRatio="xMinYMin meet" viewBox="0 0 279 445"><svg id="d2-svg" class="d2-3562348775" width="279" height="445" viewBox="-101 -101 279 445"><rect x="-101.000000" y="-101.000000" width="279.000000" height="445.000000" rx="0.000000" fill="#FFFFFF" class=" fill-N7" stroke-width="0" /><style type="text/css"><![CDATA[
-||||||| parent of 33280fed5 (fixed e2e tests)
-<?xml version="1.0" encoding="utf-8"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" d2Version="v0.6.6-HEAD" preserveAspectRatio="xMinYMin meet" viewBox="0 0 279 445"><svg id="d2-svg" class="d2-3562348775" width="279" height="445" viewBox="-101 -101 279 445"><rect x="-101.000000" y="-101.000000" width="279.000000" height="445.000000" rx="0.000000" class=" fill-N7" stroke-width="0" /><style type="text/css"><![CDATA[
-=======
-<<<<<<< HEAD
-<?xml version="1.0" encoding="utf-8"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" d2Version="v0.6.6-HEAD" preserveAspectRatio="xMinYMin meet" viewBox="0 0 279 445"><svg id="d2-svg" class="d2-3562348775" width="279" height="445" viewBox="-101 -101 279 445"><rect x="-101.000000" y="-101.000000" width="279.000000" height="445.000000" rx="0.000000" class=" fill-N7" stroke-width="0" /><style type="text/css"><![CDATA[
->>>>>>> 33280fed5 (fixed e2e tests)
-.d2-3562348775 .text-bold {
-	font-family: "d2-3562348775-font-bold";
-=======
-<?xml version="1.0" encoding="utf-8"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" d2Version="v0.6.5-HEAD" preserveAspectRatio="xMinYMin meet" viewBox="0 0 279 445"><svg id="d2-svg" class="d2-4289526217" width="279" height="445" viewBox="-101 -101 279 445"><rect x="-101.000000" y="-101.000000" width="279.000000" height="445.000000" rx="0.000000" class=" fill-N7" stroke-width="0" /><style type="text/css"><![CDATA[
-||||||| parent of cb2f2823c (Fix changes)
-<<<<<<< HEAD
-<?xml version="1.0" encoding="utf-8"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" d2Version="v0.6.6-HEAD" preserveAspectRatio="xMinYMin meet" viewBox="0 0 279 445"><svg id="d2-svg" class="d2-3562348775" width="279" height="445" viewBox="-101 -101 279 445"><rect x="-101.000000" y="-101.000000" width="279.000000" height="445.000000" rx="0.000000" class=" fill-N7" stroke-width="0" /><style type="text/css"><![CDATA[
-.d2-3562348775 .text-bold {
-	font-family: "d2-3562348775-font-bold";
-=======
-<?xml version="1.0" encoding="utf-8"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" d2Version="v0.6.5-HEAD" preserveAspectRatio="xMinYMin meet" viewBox="0 0 279 445"><svg id="d2-svg" class="d2-4289526217" width="279" height="445" viewBox="-101 -101 279 445"><rect x="-101.000000" y="-101.000000" width="279.000000" height="445.000000" rx="0.000000" class=" fill-N7" stroke-width="0" /><style type="text/css"><![CDATA[
-=======
-<?xml version="1.0" encoding="utf-8"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" d2Version="v0.6.6-HEAD" preserveAspectRatio="xMinYMin meet" viewBox="0 0 279 445"><svg id="d2-svg" class="d2-4289526217" width="279" height="445" viewBox="-101 -101 279 445"><rect x="-101.000000" y="-101.000000" width="279.000000" height="445.000000" rx="0.000000" class=" fill-N7" stroke-width="0" /><style type="text/css"><![CDATA[
->>>>>>> cb2f2823c (Fix changes)
 .d2-4289526217 .text-bold {
 	font-family: "d2-4289526217-font-bold";
 }
@@ -40,153 +18,6 @@
   opacity: 0.5;
 }
 
-<<<<<<< HEAD
-		.d2-3562348775 .fill-N1{fill:#0A0F25;}
-		.d2-3562348775 .fill-N2{fill:#676C7E;}
-		.d2-3562348775 .fill-N3{fill:#9499AB;}
-		.d2-3562348775 .fill-N4{fill:#CFD2DD;}
-		.d2-3562348775 .fill-N5{fill:#DEE1EB;}
-		.d2-3562348775 .fill-N6{fill:#EEF1F8;}
-		.d2-3562348775 .fill-N7{fill:#FFFFFF;}
-		.d2-3562348775 .fill-B1{fill:#0D32B2;}
-		.d2-3562348775 .fill-B2{fill:#0D32B2;}
-		.d2-3562348775 .fill-B3{fill:#E3E9FD;}
-		.d2-3562348775 .fill-B4{fill:#E3E9FD;}
-		.d2-3562348775 .fill-B5{fill:#EDF0FD;}
-		.d2-3562348775 .fill-B6{fill:#F7F8FE;}
-		.d2-3562348775 .fill-AA2{fill:#4A6FF3;}
-		.d2-3562348775 .fill-AA4{fill:#EDF0FD;}
-		.d2-3562348775 .fill-AA5{fill:#F7F8FE;}
-		.d2-3562348775 .fill-AB4{fill:#EDF0FD;}
-		.d2-3562348775 .fill-AB5{fill:#F7F8FE;}
-		.d2-3562348775 .stroke-N1{stroke:#0A0F25;}
-		.d2-3562348775 .stroke-N2{stroke:#676C7E;}
-		.d2-3562348775 .stroke-N3{stroke:#9499AB;}
-		.d2-3562348775 .stroke-N4{stroke:#CFD2DD;}
-		.d2-3562348775 .stroke-N5{stroke:#DEE1EB;}
-		.d2-3562348775 .stroke-N6{stroke:#EEF1F8;}
-		.d2-3562348775 .stroke-N7{stroke:#FFFFFF;}
-		.d2-3562348775 .stroke-B1{stroke:#0D32B2;}
-		.d2-3562348775 .stroke-B2{stroke:#0D32B2;}
-		.d2-3562348775 .stroke-B3{stroke:#E3E9FD;}
-		.d2-3562348775 .stroke-B4{stroke:#E3E9FD;}
-		.d2-3562348775 .stroke-B5{stroke:#EDF0FD;}
-		.d2-3562348775 .stroke-B6{stroke:#F7F8FE;}
-		.d2-3562348775 .stroke-AA2{stroke:#4A6FF3;}
-		.d2-3562348775 .stroke-AA4{stroke:#EDF0FD;}
-		.d2-3562348775 .stroke-AA5{stroke:#F7F8FE;}
-		.d2-3562348775 .stroke-AB4{stroke:#EDF0FD;}
-		.d2-3562348775 .stroke-AB5{stroke:#F7F8FE;}
-		.d2-3562348775 .background-color-N1{background-color:#0A0F25;}
-		.d2-3562348775 .background-color-N2{background-color:#676C7E;}
-		.d2-3562348775 .background-color-N3{background-color:#9499AB;}
-		.d2-3562348775 .background-color-N4{background-color:#CFD2DD;}
-		.d2-3562348775 .background-color-N5{background-color:#DEE1EB;}
-		.d2-3562348775 .background-color-N6{background-color:#EEF1F8;}
-		.d2-3562348775 .background-color-N7{background-color:#FFFFFF;}
-		.d2-3562348775 .background-color-B1{background-color:#0D32B2;}
-		.d2-3562348775 .background-color-B2{background-color:#0D32B2;}
-		.d2-3562348775 .background-color-B3{background-color:#E3E9FD;}
-		.d2-3562348775 .background-color-B4{background-color:#E3E9FD;}
-		.d2-3562348775 .background-color-B5{background-color:#EDF0FD;}
-		.d2-3562348775 .background-color-B6{background-color:#F7F8FE;}
-		.d2-3562348775 .background-color-AA2{background-color:#4A6FF3;}
-		.d2-3562348775 .background-color-AA4{background-color:#EDF0FD;}
-		.d2-3562348775 .background-color-AA5{background-color:#F7F8FE;}
-		.d2-3562348775 .background-color-AB4{background-color:#EDF0FD;}
-		.d2-3562348775 .background-color-AB5{background-color:#F7F8FE;}
-		.d2-3562348775 .color-N1{color:#0A0F25;}
-		.d2-3562348775 .color-N2{color:#676C7E;}
-		.d2-3562348775 .color-N3{color:#9499AB;}
-		.d2-3562348775 .color-N4{color:#CFD2DD;}
-		.d2-3562348775 .color-N5{color:#DEE1EB;}
-		.d2-3562348775 .color-N6{color:#EEF1F8;}
-		.d2-3562348775 .color-N7{color:#FFFFFF;}
-		.d2-3562348775 .color-B1{color:#0D32B2;}
-		.d2-3562348775 .color-B2{color:#0D32B2;}
-		.d2-3562348775 .color-B3{color:#E3E9FD;}
-		.d2-3562348775 .color-B4{color:#E3E9FD;}
-		.d2-3562348775 .color-B5{color:#EDF0FD;}
-		.d2-3562348775 .color-B6{color:#F7F8FE;}
-		.d2-3562348775 .color-AA2{color:#4A6FF3;}
-		.d2-3562348775 .color-AA4{color:#EDF0FD;}
-		.d2-3562348775 .color-AA5{color:#F7F8FE;}
-		.d2-3562348775 .color-AB4{color:#EDF0FD;}
-		.d2-3562348775 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]></style><g id="x"><g class="shape" ><ellipse rx="38.500000" ry="38.500000" cx="38.500000" cy="38.500000" stroke="#0D32B2" fill="#F7F8FE" class="shape stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="38.500000" y="44.000000" fill="#0A0F25" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">x</text></g><g id="y"><g class="shape" ><rect x="6.000000" y="177.000000" width="66.000000" height="66.000000" stroke="#0D32B2" fill="#F7F8FE" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="39.000000" y="215.500000" fill="#0A0F25" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">y</text></g><g id="(x -&gt; y)[0]"><marker id="mk-3488378134" markerWidth="10.000000" markerHeight="12.000000" refX="7.000000" refY="6.000000" viewBox="0.000000 0.000000 10.000000 12.000000" orient="auto" markerUnits="userSpaceOnUse"> <polygon points="0.000000,0.000000 10.000000,6.000000 0.000000,12.000000" fill="#0D32B2" class="connection fill-B1" stroke-width="2" /> </marker><path d="M 38.980001 78.999900 C 38.599998 117.000000 38.500000 137.000000 38.500000 173.000000" stroke="#0D32B2" fill="none" class="connection stroke-B1" style="stroke-width:2;" marker-end="url(#mk-3488378134)" mask="url(#d2-3562348775)" /></g><mask id="d2-3562348775" maskUnits="userSpaceOnUse" x="-101" y="-101" width="279" height="445">
-||||||| parent of 33280fed5 (fixed e2e tests)
-		.d2-3562348775 .fill-N1{fill:#0A0F25;}
-		.d2-3562348775 .fill-N2{fill:#676C7E;}
-		.d2-3562348775 .fill-N3{fill:#9499AB;}
-		.d2-3562348775 .fill-N4{fill:#CFD2DD;}
-		.d2-3562348775 .fill-N5{fill:#DEE1EB;}
-		.d2-3562348775 .fill-N6{fill:#EEF1F8;}
-		.d2-3562348775 .fill-N7{fill:#FFFFFF;}
-		.d2-3562348775 .fill-B1{fill:#0D32B2;}
-		.d2-3562348775 .fill-B2{fill:#0D32B2;}
-		.d2-3562348775 .fill-B3{fill:#E3E9FD;}
-		.d2-3562348775 .fill-B4{fill:#E3E9FD;}
-		.d2-3562348775 .fill-B5{fill:#EDF0FD;}
-		.d2-3562348775 .fill-B6{fill:#F7F8FE;}
-		.d2-3562348775 .fill-AA2{fill:#4A6FF3;}
-		.d2-3562348775 .fill-AA4{fill:#EDF0FD;}
-		.d2-3562348775 .fill-AA5{fill:#F7F8FE;}
-		.d2-3562348775 .fill-AB4{fill:#EDF0FD;}
-		.d2-3562348775 .fill-AB5{fill:#F7F8FE;}
-		.d2-3562348775 .stroke-N1{stroke:#0A0F25;}
-		.d2-3562348775 .stroke-N2{stroke:#676C7E;}
-		.d2-3562348775 .stroke-N3{stroke:#9499AB;}
-		.d2-3562348775 .stroke-N4{stroke:#CFD2DD;}
-		.d2-3562348775 .stroke-N5{stroke:#DEE1EB;}
-		.d2-3562348775 .stroke-N6{stroke:#EEF1F8;}
-		.d2-3562348775 .stroke-N7{stroke:#FFFFFF;}
-		.d2-3562348775 .stroke-B1{stroke:#0D32B2;}
-		.d2-3562348775 .stroke-B2{stroke:#0D32B2;}
-		.d2-3562348775 .stroke-B3{stroke:#E3E9FD;}
-		.d2-3562348775 .stroke-B4{stroke:#E3E9FD;}
-		.d2-3562348775 .stroke-B5{stroke:#EDF0FD;}
-		.d2-3562348775 .stroke-B6{stroke:#F7F8FE;}
-		.d2-3562348775 .stroke-AA2{stroke:#4A6FF3;}
-		.d2-3562348775 .stroke-AA4{stroke:#EDF0FD;}
-		.d2-3562348775 .stroke-AA5{stroke:#F7F8FE;}
-		.d2-3562348775 .stroke-AB4{stroke:#EDF0FD;}
-		.d2-3562348775 .stroke-AB5{stroke:#F7F8FE;}
-		.d2-3562348775 .background-color-N1{background-color:#0A0F25;}
-		.d2-3562348775 .background-color-N2{background-color:#676C7E;}
-		.d2-3562348775 .background-color-N3{background-color:#9499AB;}
-		.d2-3562348775 .background-color-N4{background-color:#CFD2DD;}
-		.d2-3562348775 .background-color-N5{background-color:#DEE1EB;}
-		.d2-3562348775 .background-color-N6{background-color:#EEF1F8;}
-		.d2-3562348775 .background-color-N7{background-color:#FFFFFF;}
-		.d2-3562348775 .background-color-B1{background-color:#0D32B2;}
-		.d2-3562348775 .background-color-B2{background-color:#0D32B2;}
-		.d2-3562348775 .background-color-B3{background-color:#E3E9FD;}
-		.d2-3562348775 .background-color-B4{background-color:#E3E9FD;}
-		.d2-3562348775 .background-color-B5{background-color:#EDF0FD;}
-		.d2-3562348775 .background-color-B6{background-color:#F7F8FE;}
-		.d2-3562348775 .background-color-AA2{background-color:#4A6FF3;}
-		.d2-3562348775 .background-color-AA4{background-color:#EDF0FD;}
-		.d2-3562348775 .background-color-AA5{background-color:#F7F8FE;}
-		.d2-3562348775 .background-color-AB4{background-color:#EDF0FD;}
-		.d2-3562348775 .background-color-AB5{background-color:#F7F8FE;}
-		.d2-3562348775 .color-N1{color:#0A0F25;}
-		.d2-3562348775 .color-N2{color:#676C7E;}
-		.d2-3562348775 .color-N3{color:#9499AB;}
-		.d2-3562348775 .color-N4{color:#CFD2DD;}
-		.d2-3562348775 .color-N5{color:#DEE1EB;}
-		.d2-3562348775 .color-N6{color:#EEF1F8;}
-		.d2-3562348775 .color-N7{color:#FFFFFF;}
-		.d2-3562348775 .color-B1{color:#0D32B2;}
-		.d2-3562348775 .color-B2{color:#0D32B2;}
-		.d2-3562348775 .color-B3{color:#E3E9FD;}
-		.d2-3562348775 .color-B4{color:#E3E9FD;}
-		.d2-3562348775 .color-B5{color:#EDF0FD;}
-		.d2-3562348775 .color-B6{color:#F7F8FE;}
-		.d2-3562348775 .color-AA2{color:#4A6FF3;}
-		.d2-3562348775 .color-AA4{color:#EDF0FD;}
-		.d2-3562348775 .color-AA5{color:#F7F8FE;}
-		.d2-3562348775 .color-AB4{color:#EDF0FD;}
-		.d2-3562348775 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]></style><g id="x"><g class="shape" ><ellipse rx="38.500000" ry="38.500000" cx="38.500000" cy="38.500000" class="shape stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="38.500000" y="44.000000" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">x</text></g><g id="y"><g class="shape" ><rect x="6.000000" y="177.000000" width="66.000000" height="66.000000" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="39.000000" y="215.500000" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">y</text></g><g id="(x -&gt; y)[0]"><marker id="mk-3488378134" markerWidth="10.000000" markerHeight="12.000000" refX="7.000000" refY="6.000000" viewBox="0.000000 0.000000 10.000000 12.000000" orient="auto" markerUnits="userSpaceOnUse"> <polygon points="0.000000,0.000000 10.000000,6.000000 0.000000,12.000000" class="connection fill-B1" stroke-width="2" /> </marker><path d="M 38.980001 78.999900 C 38.599998 117.000000 38.500000 137.000000 38.500000 173.000000" fill="none" class="connection stroke-B1" style="stroke-width:2;" marker-end="url(#mk-3488378134)" mask="url(#d2-3562348775)" /></g><mask id="d2-3562348775" maskUnits="userSpaceOnUse" x="-101" y="-101" width="279" height="445">
-=======
 		.d2-4289526217 .fill-N1{fill:#0A0F25;}
 		.d2-4289526217 .fill-N2{fill:#676C7E;}
 		.d2-4289526217 .fill-N3{fill:#9499AB;}
@@ -258,8 +89,7 @@
 		.d2-4289526217 .color-AA4{color:#EDF0FD;}
 		.d2-4289526217 .color-AA5{color:#F7F8FE;}
 		.d2-4289526217 .color-AB4{color:#EDF0FD;}
-		.d2-4289526217 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]></style><g id="x"><g class="shape" ><ellipse rx="38.500000" ry="38.500000" cx="38.500000" cy="38.500000" class="shape stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="38.500000" y="44.000000" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">x</text></g><g id="y"><g class="shape" ><rect x="6.000000" y="177.000000" width="66.000000" height="66.000000" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="39.000000" y="215.500000" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">y</text></g><g id="(x -&gt; y)[0]"><marker id="mk-3488378134" markerWidth="10.000000" markerHeight="12.000000" refX="7.000000" refY="6.000000" viewBox="0.000000 0.000000 10.000000 12.000000" orient="auto" markerUnits="userSpaceOnUse"> <polygon points="0.000000,0.000000 10.000000,6.000000 0.000000,12.000000" class="connection fill-B1" stroke-width="2" /> </marker><path d="M 38.980001 78.999900 C 38.599998 117.000000 38.500000 137.000000 38.500000 173.000000" fill="none" class="connection stroke-B1" style="stroke-width:2;" marker-end="url(#mk-3488378134)" mask="url(#d2-4289526217)" /></g><mask id="d2-4289526217" maskUnits="userSpaceOnUse" x="-101" y="-101" width="279" height="445">
+		.d2-4289526217 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]></style><g id="x"><g class="shape" ><ellipse rx="38.500000" ry="38.500000" cx="38.500000" cy="38.500000" stroke="#0D32B2" fill="#F7F8FE" class="shape stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="38.500000" y="44.000000" fill="#0A0F25" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">x</text></g><g id="y"><g class="shape" ><rect x="6.000000" y="177.000000" width="66.000000" height="66.000000" stroke="#0D32B2" fill="#F7F8FE" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="39.000000" y="215.500000" fill="#0A0F25" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">y</text></g><g id="(x -&gt; y)[0]"><marker id="mk-3488378134" markerWidth="10.000000" markerHeight="12.000000" refX="7.000000" refY="6.000000" viewBox="0.000000 0.000000 10.000000 12.000000" orient="auto" markerUnits="userSpaceOnUse"> <polygon points="0.000000,0.000000 10.000000,6.000000 0.000000,12.000000" fill="#0D32B2" class="connection fill-B1" stroke-width="2" /> </marker><path d="M 38.980001 78.999900 C 38.599998 117.000000 38.500000 137.000000 38.500000 173.000000" stroke="#0D32B2" fill="none" class="connection stroke-B1" style="stroke-width:2;" marker-end="url(#mk-3488378134)" mask="url(#d2-4289526217)" /></g><mask id="d2-4289526217" maskUnits="userSpaceOnUse" x="-101" y="-101" width="279" height="445">
->>>>>>> 33280fed5 (fixed e2e tests)
 <rect x="-101" y="-101" width="279" height="445" fill="white"></rect>
 <rect x="34.500000" y="28.000000" width="8" height="21" fill="rgba(0,0,0,0.75)"></rect>
 <rect x="34.500000" y="199.500000" width="9" height="21" fill="rgba(0,0,0,0.75)"></rect>

e2etests-cli/testdata/TestCLI_E2E/import_vars.exp.svg

@@ -1,26 +1,4 @@
-<<<<<<< HEAD
+<?xml version="1.0" encoding="utf-8"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" d2Version="v0.6.8-HEAD" preserveAspectRatio="xMinYMin meet" viewBox="0 0 256 434"><svg id="d2-svg" class="d2-2746395997" width="256" height="434" viewBox="-101 -101 256 434"><rect x="-101.000000" y="-101.000000" width="256.000000" height="434.000000" rx="0.000000" fill="#1E1E2E" class=" fill-N7" stroke-width="0" /><style type="text/css"><![CDATA[
-<<<<<<< HEAD
-<?xml version="1.0" encoding="utf-8"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" d2Version="v0.6.8-HEAD" preserveAspectRatio="xMinYMin meet" viewBox="0 0 256 434"><svg id="d2-svg" class="d2-2712468095" width="256" height="434" viewBox="-101 -101 256 434"><rect x="-101.000000" y="-101.000000" width="256.000000" height="434.000000" rx="0.000000" fill="#1E1E2E" class=" fill-N7" stroke-width="0" /><style type="text/css"><![CDATA[
-||||||| parent of 33280fed5 (fixed e2e tests)
-<?xml version="1.0" encoding="utf-8"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" d2Version="v0.6.6-HEAD" preserveAspectRatio="xMinYMin meet" viewBox="0 0 256 434"><svg id="d2-svg" class="d2-2712468095" width="256" height="434" viewBox="-101 -101 256 434"><rect x="-101.000000" y="-101.000000" width="256.000000" height="434.000000" rx="0.000000" class=" fill-N7" stroke-width="0" /><style type="text/css"><![CDATA[
-=======
-<<<<<<< HEAD
-<?xml version="1.0" encoding="utf-8"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" d2Version="v0.6.6-HEAD" preserveAspectRatio="xMinYMin meet" viewBox="0 0 256 434"><svg id="d2-svg" class="d2-2712468095" width="256" height="434" viewBox="-101 -101 256 434"><rect x="-101.000000" y="-101.000000" width="256.000000" height="434.000000" rx="0.000000" class=" fill-N7" stroke-width="0" /><style type="text/css"><![CDATA[
->>>>>>> 33280fed5 (fixed e2e tests)
-.d2-2712468095 .text-bold {
-	font-family: "d2-2712468095-font-bold";
-=======
-<?xml version="1.0" encoding="utf-8"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" d2Version="v0.6.5-HEAD" preserveAspectRatio="xMinYMin meet" viewBox="0 0 256 434"><svg id="d2-svg" class="d2-2746395997" width="256" height="434" viewBox="-101 -101 256 434"><rect x="-101.000000" y="-101.000000" width="256.000000" height="434.000000" rx="0.000000" class=" fill-N7" stroke-width="0" /><style type="text/css"><![CDATA[
-||||||| parent of cb2f2823c (Fix changes)
-<<<<<<< HEAD
-<?xml version="1.0" encoding="utf-8"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" d2Version="v0.6.6-HEAD" preserveAspectRatio="xMinYMin meet" viewBox="0 0 256 434"><svg id="d2-svg" class="d2-2712468095" width="256" height="434" viewBox="-101 -101 256 434"><rect x="-101.000000" y="-101.000000" width="256.000000" height="434.000000" rx="0.000000" class=" fill-N7" stroke-width="0" /><style type="text/css"><![CDATA[
-.d2-2712468095 .text-bold {
-	font-family: "d2-2712468095-font-bold";
-=======
-<?xml version="1.0" encoding="utf-8"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" d2Version="v0.6.5-HEAD" preserveAspectRatio="xMinYMin meet" viewBox="0 0 256 434"><svg id="d2-svg" class="d2-2746395997" width="256" height="434" viewBox="-101 -101 256 434"><rect x="-101.000000" y="-101.000000" width="256.000000" height="434.000000" rx="0.000000" class=" fill-N7" stroke-width="0" /><style type="text/css"><![CDATA[
-=======
-<?xml version="1.0" encoding="utf-8"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" d2Version="v0.6.6-HEAD" preserveAspectRatio="xMinYMin meet" viewBox="0 0 256 434"><svg id="d2-svg" class="d2-2746395997" width="256" height="434" viewBox="-101 -101 256 434"><rect x="-101.000000" y="-101.000000" width="256.000000" height="434.000000" rx="0.000000" class=" fill-N7" stroke-width="0" /><style type="text/css"><![CDATA[
->>>>>>> cb2f2823c (Fix changes)
 .d2-2746395997 .text-bold {
 	font-family: "d2-2746395997-font-bold";
 }
@@ -40,153 +18,6 @@
   opacity: 0.5;
 }
 
-<<<<<<< HEAD
-		.d2-2712468095 .fill-N1{fill:#CDD6F4;}
-		.d2-2712468095 .fill-N2{fill:#BAC2DE;}
-		.d2-2712468095 .fill-N3{fill:#A6ADC8;}
-		.d2-2712468095 .fill-N4{fill:#585B70;}
-		.d2-2712468095 .fill-N5{fill:#45475A;}
-		.d2-2712468095 .fill-N6{fill:#313244;}
-		.d2-2712468095 .fill-N7{fill:#1E1E2E;}
-		.d2-2712468095 .fill-B1{fill:#CBA6f7;}
-		.d2-2712468095 .fill-B2{fill:#CBA6f7;}
-		.d2-2712468095 .fill-B3{fill:#6C7086;}
-		.d2-2712468095 .fill-B4{fill:#585B70;}
-		.d2-2712468095 .fill-B5{fill:#45475A;}
-		.d2-2712468095 .fill-B6{fill:#313244;}
-		.d2-2712468095 .fill-AA2{fill:#f38BA8;}
-		.d2-2712468095 .fill-AA4{fill:#45475A;}
-		.d2-2712468095 .fill-AA5{fill:#313244;}
-		.d2-2712468095 .fill-AB4{fill:#45475A;}
-		.d2-2712468095 .fill-AB5{fill:#313244;}
-		.d2-2712468095 .stroke-N1{stroke:#CDD6F4;}
-		.d2-2712468095 .stroke-N2{stroke:#BAC2DE;}
-		.d2-2712468095 .stroke-N3{stroke:#A6ADC8;}
-		.d2-2712468095 .stroke-N4{stroke:#585B70;}
-		.d2-2712468095 .stroke-N5{stroke:#45475A;}
-		.d2-2712468095 .stroke-N6{stroke:#313244;}
-		.d2-2712468095 .stroke-N7{stroke:#1E1E2E;}
-		.d2-2712468095 .stroke-B1{stroke:#CBA6f7;}
-		.d2-2712468095 .stroke-B2{stroke:#CBA6f7;}
-		.d2-2712468095 .stroke-B3{stroke:#6C7086;}
-		.d2-2712468095 .stroke-B4{stroke:#585B70;}
-		.d2-2712468095 .stroke-B5{stroke:#45475A;}
-		.d2-2712468095 .stroke-B6{stroke:#313244;}
-		.d2-2712468095 .stroke-AA2{stroke:#f38BA8;}
-		.d2-2712468095 .stroke-AA4{stroke:#45475A;}
-		.d2-2712468095 .stroke-AA5{stroke:#313244;}
-		.d2-2712468095 .stroke-AB4{stroke:#45475A;}
-		.d2-2712468095 .stroke-AB5{stroke:#313244;}
-		.d2-2712468095 .background-color-N1{background-color:#CDD6F4;}
-		.d2-2712468095 .background-color-N2{background-color:#BAC2DE;}
-		.d2-2712468095 .background-color-N3{background-color:#A6ADC8;}
-		.d2-2712468095 .background-color-N4{background-color:#585B70;}
-		.d2-2712468095 .background-color-N5{background-color:#45475A;}
-		.d2-2712468095 .background-color-N6{background-color:#313244;}
-		.d2-2712468095 .background-color-N7{background-color:#1E1E2E;}
-		.d2-2712468095 .background-color-B1{background-color:#CBA6f7;}
-		.d2-2712468095 .background-color-B2{background-color:#CBA6f7;}
-		.d2-2712468095 .background-color-B3{background-color:#6C7086;}
-		.d2-2712468095 .background-color-B4{background-color:#585B70;}
-		.d2-2712468095 .background-color-B5{background-color:#45475A;}
-		.d2-2712468095 .background-color-B6{background-color:#313244;}
-		.d2-2712468095 .background-color-AA2{background-color:#f38BA8;}
-		.d2-2712468095 .background-color-AA4{background-color:#45475A;}
-		.d2-2712468095 .background-color-AA5{background-color:#313244;}
-		.d2-2712468095 .background-color-AB4{background-color:#45475A;}
-		.d2-2712468095 .background-color-AB5{background-color:#313244;}
-		.d2-2712468095 .color-N1{color:#CDD6F4;}
-		.d2-2712468095 .color-N2{color:#BAC2DE;}
-		.d2-2712468095 .color-N3{color:#A6ADC8;}
-		.d2-2712468095 .color-N4{color:#585B70;}
-		.d2-2712468095 .color-N5{color:#45475A;}
-		.d2-2712468095 .color-N6{color:#313244;}
-		.d2-2712468095 .color-N7{color:#1E1E2E;}
-		.d2-2712468095 .color-B1{color:#CBA6f7;}
-		.d2-2712468095 .color-B2{color:#CBA6f7;}
-		.d2-2712468095 .color-B3{color:#6C7086;}
-		.d2-2712468095 .color-B4{color:#585B70;}
-		.d2-2712468095 .color-B5{color:#45475A;}
-		.d2-2712468095 .color-B6{color:#313244;}
-		.d2-2712468095 .color-AA2{color:#f38BA8;}
-		.d2-2712468095 .color-AA4{color:#45475A;}
-		.d2-2712468095 .color-AA5{color:#313244;}
-		.d2-2712468095 .color-AB4{color:#45475A;}
-		.d2-2712468095 .color-AB5{color:#313244;}.appendix text.text{fill:#CDD6F4}.md{--color-fg-default:#CDD6F4;--color-fg-muted:#BAC2DE;--color-fg-subtle:#A6ADC8;--color-canvas-default:#1E1E2E;--color-canvas-subtle:#313244;--color-border-default:#CBA6f7;--color-border-muted:#CBA6f7;--color-neutral-muted:#313244;--color-accent-fg:#CBA6f7;--color-accent-emphasis:#CBA6f7;--color-attention-subtle:#BAC2DE;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-B2{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-B3{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-B4{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-B5{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B6{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-AA2{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-AA4{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-AA5{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-AB4{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-AB5{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N1{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N2{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N5{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N6{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N7{fill:url(#streaks-darker);mix-blend-mode:lighten}.light-code{display: none}.dark-code{display: block}]]></style><g id="x"><g class="shape" ><rect x="1.000000" y="0.000000" width="53.000000" height="66.000000" stroke="#CBA6f7" fill="#313244" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="27.500000" y="38.500000" fill="#CDD6F4" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">x</text></g><g id="y"><g class="shape" ><rect x="0.000000" y="166.000000" width="54.000000" height="66.000000" stroke="#CBA6f7" fill="#313244" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="27.000000" y="204.500000" fill="#CDD6F4" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">y</text></g><g id="(x -&gt; y)[0]"><marker id="mk-3488378134" markerWidth="10.000000" markerHeight="12.000000" refX="7.000000" refY="6.000000" viewBox="0.000000 0.000000 10.000000 12.000000" orient="auto" markerUnits="userSpaceOnUse"> <polygon points="0.000000,0.000000 10.000000,6.000000 0.000000,12.000000" fill="#CBA6f7" class="connection fill-B1" stroke-width="2" /> </marker><path d="M 27.000000 68.000000 C 27.000000 106.000000 27.000000 126.000000 27.000000 162.000000" stroke="#CBA6f7" fill="none" class="connection stroke-B1" style="stroke-width:2;" marker-end="url(#mk-3488378134)" mask="url(#d2-2712468095)" /></g><mask id="d2-2712468095" maskUnits="userSpaceOnUse" x="-101" y="-101" width="256" height="434">
-||||||| parent of 33280fed5 (fixed e2e tests)
-		.d2-2712468095 .fill-N1{fill:#CDD6F4;}
-		.d2-2712468095 .fill-N2{fill:#BAC2DE;}
-		.d2-2712468095 .fill-N3{fill:#A6ADC8;}
-		.d2-2712468095 .fill-N4{fill:#585B70;}
-		.d2-2712468095 .fill-N5{fill:#45475A;}
-		.d2-2712468095 .fill-N6{fill:#313244;}
-		.d2-2712468095 .fill-N7{fill:#1E1E2E;}
-		.d2-2712468095 .fill-B1{fill:#CBA6f7;}
-		.d2-2712468095 .fill-B2{fill:#CBA6f7;}
-		.d2-2712468095 .fill-B3{fill:#6C7086;}
-		.d2-2712468095 .fill-B4{fill:#585B70;}
-		.d2-2712468095 .fill-B5{fill:#45475A;}
-		.d2-2712468095 .fill-B6{fill:#313244;}
-		.d2-2712468095 .fill-AA2{fill:#f38BA8;}
-		.d2-2712468095 .fill-AA4{fill:#45475A;}
-		.d2-2712468095 .fill-AA5{fill:#313244;}
-		.d2-2712468095 .fill-AB4{fill:#45475A;}
-		.d2-2712468095 .fill-AB5{fill:#313244;}
-		.d2-2712468095 .stroke-N1{stroke:#CDD6F4;}
-		.d2-2712468095 .stroke-N2{stroke:#BAC2DE;}
-		.d2-2712468095 .stroke-N3{stroke:#A6ADC8;}
-		.d2-2712468095 .stroke-N4{stroke:#585B70;}
-		.d2-2712468095 .stroke-N5{stroke:#45475A;}
-		.d2-2712468095 .stroke-N6{stroke:#313244;}
-		.d2-2712468095 .stroke-N7{stroke:#1E1E2E;}
-		.d2-2712468095 .stroke-B1{stroke:#CBA6f7;}
-		.d2-2712468095 .stroke-B2{stroke:#CBA6f7;}
-		.d2-2712468095 .stroke-B3{stroke:#6C7086;}
-		.d2-2712468095 .stroke-B4{stroke:#585B70;}
-		.d2-2712468095 .stroke-B5{stroke:#45475A;}
-		.d2-2712468095 .stroke-B6{stroke:#313244;}
-		.d2-2712468095 .stroke-AA2{stroke:#f38BA8;}
-		.d2-2712468095 .stroke-AA4{stroke:#45475A;}
-		.d2-2712468095 .stroke-AA5{stroke:#313244;}
-		.d2-2712468095 .stroke-AB4{stroke:#45475A;}
-		.d2-2712468095 .stroke-AB5{stroke:#313244;}
-		.d2-2712468095 .background-color-N1{background-color:#CDD6F4;}
-		.d2-2712468095 .background-color-N2{background-color:#BAC2DE;}
-		.d2-2712468095 .background-color-N3{background-color:#A6ADC8;}
-		.d2-2712468095 .background-color-N4{background-color:#585B70;}
-		.d2-2712468095 .background-color-N5{background-color:#45475A;}
-		.d2-2712468095 .background-color-N6{background-color:#313244;}
-		.d2-2712468095 .background-color-N7{background-color:#1E1E2E;}
-		.d2-2712468095 .background-color-B1{background-color:#CBA6f7;}
-		.d2-2712468095 .background-color-B2{background-color:#CBA6f7;}
-		.d2-2712468095 .background-color-B3{background-color:#6C7086;}
-		.d2-2712468095 .background-color-B4{background-color:#585B70;}
-		.d2-2712468095 .background-color-B5{background-color:#45475A;}
-		.d2-2712468095 .background-color-B6{background-color:#313244;}
-		.d2-2712468095 .background-color-AA2{background-color:#f38BA8;}
-		.d2-2712468095 .background-color-AA4{background-color:#45475A;}
-		.d2-2712468095 .background-color-AA5{background-color:#313244;}
-		.d2-2712468095 .background-color-AB4{background-color:#45475A;}
-		.d2-2712468095 .background-color-AB5{background-color:#313244;}
-		.d2-2712468095 .color-N1{color:#CDD6F4;}
-		.d2-2712468095 .color-N2{color:#BAC2DE;}
-		.d2-2712468095 .color-N3{color:#A6ADC8;}
-		.d2-2712468095 .color-N4{color:#585B70;}
-		.d2-2712468095 .color-N5{color:#45475A;}
-		.d2-2712468095 .color-N6{color:#313244;}
-		.d2-2712468095 .color-N7{color:#1E1E2E;}
-		.d2-2712468095 .color-B1{color:#CBA6f7;}
-		.d2-2712468095 .color-B2{color:#CBA6f7;}
-		.d2-2712468095 .color-B3{color:#6C7086;}
-		.d2-2712468095 .color-B4{color:#585B70;}
-		.d2-2712468095 .color-B5{color:#45475A;}
-		.d2-2712468095 .color-B6{color:#313244;}
-		.d2-2712468095 .color-AA2{color:#f38BA8;}
-		.d2-2712468095 .color-AA4{color:#45475A;}
-		.d2-2712468095 .color-AA5{color:#313244;}
-		.d2-2712468095 .color-AB4{color:#45475A;}
-		.d2-2712468095 .color-AB5{color:#313244;}.appendix text.text{fill:#CDD6F4}.md{--color-fg-default:#CDD6F4;--color-fg-muted:#BAC2DE;--color-fg-subtle:#A6ADC8;--color-canvas-default:#1E1E2E;--color-canvas-subtle:#313244;--color-border-default:#CBA6f7;--color-border-muted:#CBA6f7;--color-neutral-muted:#313244;--color-accent-fg:#CBA6f7;--color-accent-emphasis:#CBA6f7;--color-attention-subtle:#BAC2DE;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-B2{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-B3{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-B4{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-B5{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B6{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-AA2{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-AA4{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-AA5{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-AB4{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-AB5{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N1{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N2{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N5{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N6{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N7{fill:url(#streaks-darker);mix-blend-mode:lighten}.light-code{display: none}.dark-code{display: block}]]></style><g id="x"><g class="shape" ><rect x="1.000000" y="0.000000" width="53.000000" height="66.000000" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="27.500000" y="38.500000" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">x</text></g><g id="y"><g class="shape" ><rect x="0.000000" y="166.000000" width="54.000000" height="66.000000" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="27.000000" y="204.500000" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">y</text></g><g id="(x -&gt; y)[0]"><marker id="mk-3488378134" markerWidth="10.000000" markerHeight="12.000000" refX="7.000000" refY="6.000000" viewBox="0.000000 0.000000 10.000000 12.000000" orient="auto" markerUnits="userSpaceOnUse"> <polygon points="0.000000,0.000000 10.000000,6.000000 0.000000,12.000000" class="connection fill-B1" stroke-width="2" /> </marker><path d="M 27.000000 68.000000 C 27.000000 106.000000 27.000000 126.000000 27.000000 162.000000" fill="none" class="connection stroke-B1" style="stroke-width:2;" marker-end="url(#mk-3488378134)" mask="url(#d2-2712468095)" /></g><mask id="d2-2712468095" maskUnits="userSpaceOnUse" x="-101" y="-101" width="256" height="434">
-=======
 		.d2-2746395997 .fill-N1{fill:#CDD6F4;}
 		.d2-2746395997 .fill-N2{fill:#BAC2DE;}
 		.d2-2746395997 .fill-N3{fill:#A6ADC8;}
@@ -258,8 +89,7 @@
 		.d2-2746395997 .color-AA4{color:#45475A;}
 		.d2-2746395997 .color-AA5{color:#313244;}
 		.d2-2746395997 .color-AB4{color:#45475A;}
-		.d2-2746395997 .color-AB5{color:#313244;}.appendix text.text{fill:#CDD6F4}.md{--color-fg-default:#CDD6F4;--color-fg-muted:#BAC2DE;--color-fg-subtle:#A6ADC8;--color-canvas-default:#1E1E2E;--color-canvas-subtle:#313244;--color-border-default:#CBA6f7;--color-border-muted:#CBA6f7;--color-neutral-muted:#313244;--color-accent-fg:#CBA6f7;--color-accent-emphasis:#CBA6f7;--color-attention-subtle:#BAC2DE;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-B2{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-B3{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-B4{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-B5{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B6{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-AA2{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-AA4{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-AA5{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-AB4{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-AB5{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N1{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N2{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N5{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N6{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N7{fill:url(#streaks-darker);mix-blend-mode:lighten}.light-code{display: none}.dark-code{display: block}]]></style><g id="x"><g class="shape" ><rect x="1.000000" y="0.000000" width="53.000000" height="66.000000" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="27.500000" y="38.500000" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">x</text></g><g id="y"><g class="shape" ><rect x="0.000000" y="166.000000" width="54.000000" height="66.000000" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="27.000000" y="204.500000" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">y</text></g><g id="(x -&gt; y)[0]"><marker id="mk-3488378134" markerWidth="10.000000" markerHeight="12.000000" refX="7.000000" refY="6.000000" viewBox="0.000000 0.000000 10.000000 12.000000" orient="auto" markerUnits="userSpaceOnUse"> <polygon points="0.000000,0.000000 10.000000,6.000000 0.000000,12.000000" class="connection fill-B1" stroke-width="2" /> </marker><path d="M 27.000000 68.000000 C 27.000000 106.000000 27.000000 126.000000 27.000000 162.000000" fill="none" class="connection stroke-B1" style="stroke-width:2;" marker-end="url(#mk-3488378134)" mask="url(#d2-2746395997)" /></g><mask id="d2-2746395997" maskUnits="userSpaceOnUse" x="-101" y="-101" width="256" height="434">
+		.d2-2746395997 .color-AB5{color:#313244;}.appendix text.text{fill:#CDD6F4}.md{--color-fg-default:#CDD6F4;--color-fg-muted:#BAC2DE;--color-fg-subtle:#A6ADC8;--color-canvas-default:#1E1E2E;--color-canvas-subtle:#313244;--color-border-default:#CBA6f7;--color-border-muted:#CBA6f7;--color-neutral-muted:#313244;--color-accent-fg:#CBA6f7;--color-accent-emphasis:#CBA6f7;--color-attention-subtle:#BAC2DE;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-B2{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-B3{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-B4{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-B5{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B6{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-AA2{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-AA4{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-AA5{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-AB4{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-AB5{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N1{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N2{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N5{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N6{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N7{fill:url(#streaks-darker);mix-blend-mode:lighten}.light-code{display: none}.dark-code{display: block}]]></style><g id="x"><g class="shape" ><rect x="1.000000" y="0.000000" width="53.000000" height="66.000000" stroke="#CBA6f7" fill="#313244" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="27.500000" y="38.500000" fill="#CDD6F4" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">x</text></g><g id="y"><g class="shape" ><rect x="0.000000" y="166.000000" width="54.000000" height="66.000000" stroke="#CBA6f7" fill="#313244" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="27.000000" y="204.500000" fill="#CDD6F4" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">y</text></g><g id="(x -&gt; y)[0]"><marker id="mk-3488378134" markerWidth="10.000000" markerHeight="12.000000" refX="7.000000" refY="6.000000" viewBox="0.000000 0.000000 10.000000 12.000000" orient="auto" markerUnits="userSpaceOnUse"> <polygon points="0.000000,0.000000 10.000000,6.000000 0.000000,12.000000" fill="#CBA6f7" class="connection fill-B1" stroke-width="2" /> </marker><path d="M 27.000000 68.000000 C 27.000000 106.000000 27.000000 126.000000 27.000000 162.000000" stroke="#CBA6f7" fill="none" class="connection stroke-B1" style="stroke-width:2;" marker-end="url(#mk-3488378134)" mask="url(#d2-2746395997)" /></g><mask id="d2-2746395997" maskUnits="userSpaceOnUse" x="-101" y="-101" width="256" height="434">
->>>>>>> 33280fed5 (fixed e2e tests)
 <rect x="-101" y="-101" width="256" height="434" fill="white"></rect>
 <rect x="23.500000" y="22.500000" width="8" height="21" fill="rgba(0,0,0,0.75)"></rect>
 <rect x="22.500000" y="188.500000" width="9" height="21" fill="rgba(0,0,0,0.75)"></rect>

e2etests-cli/testdata/TestCLI_E2E/multiboard/life/index.exp.svg

@@ -1,26 +1,4 @@
-<<<<<<< HEAD
+<?xml version="1.0" encoding="utf-8"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" d2Version="v0.6.8-HEAD" preserveAspectRatio="xMinYMin meet" viewBox="0 0 256 434"><svg id="d2-svg" class="d2-1250993138" width="256" height="434" viewBox="-101 -101 256 434"><rect x="-101.000000" y="-101.000000" width="256.000000" height="434.000000" rx="0.000000" fill="#FFFFFF" class=" fill-N7" stroke-width="0" /><style type="text/css"><![CDATA[
-<<<<<<< HEAD
-<?xml version="1.0" encoding="utf-8"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" d2Version="v0.6.8-HEAD" preserveAspectRatio="xMinYMin meet" viewBox="0 0 256 434"><svg id="d2-svg" class="d2-3748359424" width="256" height="434" viewBox="-101 -101 256 434"><rect x="-101.000000" y="-101.000000" width="256.000000" height="434.000000" rx="0.000000" fill="#FFFFFF" class=" fill-N7" stroke-width="0" /><style type="text/css"><![CDATA[
-||||||| parent of 33280fed5 (fixed e2e tests)
-<?xml version="1.0" encoding="utf-8"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" d2Version="v0.6.6-HEAD" preserveAspectRatio="xMinYMin meet" viewBox="0 0 256 434"><svg id="d2-svg" class="d2-3748359424" width="256" height="434" viewBox="-101 -101 256 434"><rect x="-101.000000" y="-101.000000" width="256.000000" height="434.000000" rx="0.000000" class=" fill-N7" stroke-width="0" /><style type="text/css"><![CDATA[
-=======
-<<<<<<< HEAD
-<?xml version="1.0" encoding="utf-8"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" d2Version="v0.6.6-HEAD" preserveAspectRatio="xMinYMin meet" viewBox="0 0 256 434"><svg id="d2-svg" class="d2-3748359424" width="256" height="434" viewBox="-101 -101 256 434"><rect x="-101.000000" y="-101.000000" width="256.000000" height="434.000000" rx="0.000000" class=" fill-N7" stroke-width="0" /><style type="text/css"><![CDATA[
->>>>>>> 33280fed5 (fixed e2e tests)
-.d2-3748359424 .text-bold {
-	font-family: "d2-3748359424-font-bold";
-=======
-<?xml version="1.0" encoding="utf-8"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" d2Version="v0.6.5-HEAD" preserveAspectRatio="xMinYMin meet" viewBox="0 0 256 434"><svg id="d2-svg" class="d2-1250993138" width="256" height="434" viewBox="-101 -101 256 434"><rect x="-101.000000" y="-101.000000" width="256.000000" height="434.000000" rx="0.000000" class=" fill-N7" stroke-width="0" /><style type="text/css"><![CDATA[
-||||||| parent of cb2f2823c (Fix changes)
-<<<<<<< HEAD
-<?xml version="1.0" encoding="utf-8"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" d2Version="v0.6.6-HEAD" preserveAspectRatio="xMinYMin meet" viewBox="0 0 256 434"><svg id="d2-svg" class="d2-3748359424" width="256" height="434" viewBox="-101 -101 256 434"><rect x="-101.000000" y="-101.000000" width="256.000000" height="434.000000" rx="0.000000" class=" fill-N7" stroke-width="0" /><style type="text/css"><![CDATA[
-.d2-3748359424 .text-bold {
-	font-family: "d2-3748359424-font-bold";
-=======
-<?xml version="1.0" encoding="utf-8"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" d2Version="v0.6.5-HEAD" preserveAspectRatio="xMinYMin meet" viewBox="0 0 256 434"><svg id="d2-svg" class="d2-1250993138" width="256" height="434" viewBox="-101 -101 256 434"><rect x="-101.000000" y="-101.000000" width="256.000000" height="434.000000" rx="0.000000" class=" fill-N7" stroke-width="0" /><style type="text/css"><![CDATA[
-=======
-<?xml version="1.0" encoding="utf-8"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" d2Version="v0.6.6-HEAD" preserveAspectRatio="xMinYMin meet" viewBox="0 0 256 434"><svg id="d2-svg" class="d2-1250993138" width="256" height="434" viewBox="-101 -101 256 434"><rect x="-101.000000" y="-101.000000" width="256.000000" height="434.000000" rx="0.000000" class=" fill-N7" stroke-width="0" /><style type="text/css"><![CDATA[
->>>>>>> cb2f2823c (Fix changes)
 .d2-1250993138 .text-bold {
 	font-family: "d2-1250993138-font-bold";
 }
@@ -40,153 +18,6 @@
   opacity: 0.5;
 }
 
-<<<<<<< HEAD
-		.d2-3748359424 .fill-N1{fill:#0A0F25;}
-		.d2-3748359424 .fill-N2{fill:#676C7E;}
-		.d2-3748359424 .fill-N3{fill:#9499AB;}
-		.d2-3748359424 .fill-N4{fill:#CFD2DD;}
-		.d2-3748359424 .fill-N5{fill:#DEE1EB;}
-		.d2-3748359424 .fill-N6{fill:#EEF1F8;}
-		.d2-3748359424 .fill-N7{fill:#FFFFFF;}
-		.d2-3748359424 .fill-B1{fill:#0D32B2;}
-		.d2-3748359424 .fill-B2{fill:#0D32B2;}
-		.d2-3748359424 .fill-B3{fill:#E3E9FD;}
-		.d2-3748359424 .fill-B4{fill:#E3E9FD;}
-		.d2-3748359424 .fill-B5{fill:#EDF0FD;}
-		.d2-3748359424 .fill-B6{fill:#F7F8FE;}
-		.d2-3748359424 .fill-AA2{fill:#4A6FF3;}
-		.d2-3748359424 .fill-AA4{fill:#EDF0FD;}
-		.d2-3748359424 .fill-AA5{fill:#F7F8FE;}
-		.d2-3748359424 .fill-AB4{fill:#EDF0FD;}
-		.d2-3748359424 .fill-AB5{fill:#F7F8FE;}
-		.d2-3748359424 .stroke-N1{stroke:#0A0F25;}
-		.d2-3748359424 .stroke-N2{stroke:#676C7E;}
-		.d2-3748359424 .stroke-N3{stroke:#9499AB;}
-		.d2-3748359424 .stroke-N4{stroke:#CFD2DD;}
-		.d2-3748359424 .stroke-N5{stroke:#DEE1EB;}
-		.d2-3748359424 .stroke-N6{stroke:#EEF1F8;}
-		.d2-3748359424 .stroke-N7{stroke:#FFFFFF;}
-		.d2-3748359424 .stroke-B1{stroke:#0D32B2;}
-		.d2-3748359424 .stroke-B2{stroke:#0D32B2;}
-		.d2-3748359424 .stroke-B3{stroke:#E3E9FD;}
-		.d2-3748359424 .stroke-B4{stroke:#E3E9FD;}
-		.d2-3748359424 .stroke-B5{stroke:#EDF0FD;}
-		.d2-3748359424 .stroke-B6{stroke:#F7F8FE;}
-		.d2-3748359424 .stroke-AA2{stroke:#4A6FF3;}
-		.d2-3748359424 .stroke-AA4{stroke:#EDF0FD;}
-		.d2-3748359424 .stroke-AA5{stroke:#F7F8FE;}
-		.d2-3748359424 .stroke-AB4{stroke:#EDF0FD;}
-		.d2-3748359424 .stroke-AB5{stroke:#F7F8FE;}
-		.d2-3748359424 .background-color-N1{background-color:#0A0F25;}
-		.d2-3748359424 .background-color-N2{background-color:#676C7E;}
-		.d2-3748359424 .background-color-N3{background-color:#9499AB;}
-		.d2-3748359424 .background-color-N4{background-color:#CFD2DD;}
-		.d2-3748359424 .background-color-N5{background-color:#DEE1EB;}
-		.d2-3748359424 .background-color-N6{background-color:#EEF1F8;}
-		.d2-3748359424 .background-color-N7{background-color:#FFFFFF;}
-		.d2-3748359424 .background-color-B1{background-color:#0D32B2;}
-		.d2-3748359424 .background-color-B2{background-color:#0D32B2;}
-		.d2-3748359424 .background-color-B3{background-color:#E3E9FD;}
-		.d2-3748359424 .background-color-B4{background-color:#E3E9FD;}
-		.d2-3748359424 .background-color-B5{background-color:#EDF0FD;}
-		.d2-3748359424 .background-color-B6{background-color:#F7F8FE;}
-		.d2-3748359424 .background-color-AA2{background-color:#4A6FF3;}
-		.d2-3748359424 .background-color-AA4{background-color:#EDF0FD;}
-		.d2-3748359424 .background-color-AA5{background-color:#F7F8FE;}
-		.d2-3748359424 .background-color-AB4{background-color:#EDF0FD;}
-		.d2-3748359424 .background-color-AB5{background-color:#F7F8FE;}
-		.d2-3748359424 .color-N1{color:#0A0F25;}
-		.d2-3748359424 .color-N2{color:#676C7E;}
-		.d2-3748359424 .color-N3{color:#9499AB;}
-		.d2-3748359424 .color-N4{color:#CFD2DD;}
-		.d2-3748359424 .color-N5{color:#DEE1EB;}
-		.d2-3748359424 .color-N6{color:#EEF1F8;}
-		.d2-3748359424 .color-N7{color:#FFFFFF;}
-		.d2-3748359424 .color-B1{color:#0D32B2;}
-		.d2-3748359424 .color-B2{color:#0D32B2;}
-		.d2-3748359424 .color-B3{color:#E3E9FD;}
-		.d2-3748359424 .color-B4{color:#E3E9FD;}
-		.d2-3748359424 .color-B5{color:#EDF0FD;}
-		.d2-3748359424 .color-B6{color:#F7F8FE;}
-		.d2-3748359424 .color-AA2{color:#4A6FF3;}
-		.d2-3748359424 .color-AA4{color:#EDF0FD;}
-		.d2-3748359424 .color-AA5{color:#F7F8FE;}
-		.d2-3748359424 .color-AB4{color:#EDF0FD;}
-		.d2-3748359424 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]></style><g id="x"><g class="shape" ><rect x="1.000000" y="0.000000" width="53.000000" height="66.000000" stroke="#0D32B2" fill="#F7F8FE" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="27.500000" y="38.500000" fill="#0A0F25" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">x</text></g><g id="y"><g class="shape" ><rect x="0.000000" y="166.000000" width="54.000000" height="66.000000" stroke="#0D32B2" fill="#F7F8FE" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="27.000000" y="204.500000" fill="#0A0F25" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">y</text></g><g id="(x -&gt; y)[0]"><marker id="mk-3488378134" markerWidth="10.000000" markerHeight="12.000000" refX="7.000000" refY="6.000000" viewBox="0.000000 0.000000 10.000000 12.000000" orient="auto" markerUnits="userSpaceOnUse"> <polygon points="0.000000,0.000000 10.000000,6.000000 0.000000,12.000000" fill="#0D32B2" class="connection fill-B1" stroke-width="2" /> </marker><path d="M 27.000000 68.000000 C 27.000000 106.000000 27.000000 126.000000 27.000000 162.000000" stroke="#0D32B2" fill="none" class="connection stroke-B1" style="stroke-width:2;" marker-end="url(#mk-3488378134)" mask="url(#d2-3748359424)" /></g><mask id="d2-3748359424" maskUnits="userSpaceOnUse" x="-101" y="-101" width="256" height="434">
-||||||| parent of 33280fed5 (fixed e2e tests)
-		.d2-3748359424 .fill-N1{fill:#0A0F25;}
-		.d2-3748359424 .fill-N2{fill:#676C7E;}
-		.d2-3748359424 .fill-N3{fill:#9499AB;}
-		.d2-3748359424 .fill-N4{fill:#CFD2DD;}
-		.d2-3748359424 .fill-N5{fill:#DEE1EB;}
-		.d2-3748359424 .fill-N6{fill:#EEF1F8;}
-		.d2-3748359424 .fill-N7{fill:#FFFFFF;}
-		.d2-3748359424 .fill-B1{fill:#0D32B2;}
-		.d2-3748359424 .fill-B2{fill:#0D32B2;}
-		.d2-3748359424 .fill-B3{fill:#E3E9FD;}
-		.d2-3748359424 .fill-B4{fill:#E3E9FD;}
-		.d2-3748359424 .fill-B5{fill:#EDF0FD;}
-		.d2-3748359424 .fill-B6{fill:#F7F8FE;}
-		.d2-3748359424 .fill-AA2{fill:#4A6FF3;}
-		.d2-3748359424 .fill-AA4{fill:#EDF0FD;}
-		.d2-3748359424 .fill-AA5{fill:#F7F8FE;}
-		.d2-3748359424 .fill-AB4{fill:#EDF0FD;}
-		.d2-3748359424 .fill-AB5{fill:#F7F8FE;}
-		.d2-3748359424 .stroke-N1{stroke:#0A0F25;}
-		.d2-3748359424 .stroke-N2{stroke:#676C7E;}
-		.d2-3748359424 .stroke-N3{stroke:#9499AB;}
-		.d2-3748359424 .stroke-N4{stroke:#CFD2DD;}
-		.d2-3748359424 .stroke-N5{stroke:#DEE1EB;}
-		.d2-3748359424 .stroke-N6{stroke:#EEF1F8;}
-		.d2-3748359424 .stroke-N7{stroke:#FFFFFF;}
-		.d2-3748359424 .stroke-B1{stroke:#0D32B2;}
-		.d2-3748359424 .stroke-B2{stroke:#0D32B2;}
-		.d2-3748359424 .stroke-B3{stroke:#E3E9FD;}
-		.d2-3748359424 .stroke-B4{stroke:#E3E9FD;}
-		.d2-3748359424 .stroke-B5{stroke:#EDF0FD;}
-		.d2-3748359424 .stroke-B6{stroke:#F7F8FE;}
-		.d2-3748359424 .stroke-AA2{stroke:#4A6FF3;}
-		.d2-3748359424 .stroke-AA4{stroke:#EDF0FD;}
-		.d2-3748359424 .stroke-AA5{stroke:#F7F8FE;}
-		.d2-3748359424 .stroke-AB4{stroke:#EDF0FD;}
-		.d2-3748359424 .stroke-AB5{stroke:#F7F8FE;}
-		.d2-3748359424 .background-color-N1{background-color:#0A0F25;}
-		.d2-3748359424 .background-color-N2{background-color:#676C7E;}
-		.d2-3748359424 .background-color-N3{background-color:#9499AB;}
-		.d2-3748359424 .background-color-N4{background-color:#CFD2DD;}
-		.d2-3748359424 .background-color-N5{background-color:#DEE1EB;}
-		.d2-3748359424 .background-color-N6{background-color:#EEF1F8;}
-		.d2-3748359424 .background-color-N7{background-color:#FFFFFF;}
-		.d2-3748359424 .background-color-B1{background-color:#0D32B2;}
-		.d2-3748359424 .background-color-B2{background-color:#0D32B2;}
-		.d2-3748359424 .background-color-B3{background-color:#E3E9FD;}
-		.d2-3748359424 .background-color-B4{background-color:#E3E9FD;}
-		.d2-3748359424 .background-color-B5{background-color:#EDF0FD;}
-		.d2-3748359424 .background-color-B6{background-color:#F7F8FE;}
-		.d2-3748359424 .background-color-AA2{background-color:#4A6FF3;}
-		.d2-3748359424 .background-color-AA4{background-color:#EDF0FD;}
-		.d2-3748359424 .background-color-AA5{background-color:#F7F8FE;}
-		.d2-3748359424 .background-color-AB4{background-color:#EDF0FD;}
-		.d2-3748359424 .background-color-AB5{background-color:#F7F8FE;}
-		.d2-3748359424 .color-N1{color:#0A0F25;}
-		.d2-3748359424 .color-N2{color:#676C7E;}
-		.d2-3748359424 .color-N3{color:#9499AB;}
-		.d2-3748359424 .color-N4{color:#CFD2DD;}
-		.d2-3748359424 .color-N5{color:#DEE1EB;}
-		.d2-3748359424 .color-N6{color:#EEF1F8;}
-		.d2-3748359424 .color-N7{color:#FFFFFF;}
-		.d2-3748359424 .color-B1{color:#0D32B2;}
-		.d2-3748359424 .color-B2{color:#0D32B2;}
-		.d2-3748359424 .color-B3{color:#E3E9FD;}
-		.d2-3748359424 .color-B4{color:#E3E9FD;}
-		.d2-3748359424 .color-B5{color:#EDF0FD;}
-		.d2-3748359424 .color-B6{color:#F7F8FE;}
-		.d2-3748359424 .color-AA2{color:#4A6FF3;}
-		.d2-3748359424 .color-AA4{color:#EDF0FD;}
-		.d2-3748359424 .color-AA5{color:#F7F8FE;}
-		.d2-3748359424 .color-AB4{color:#EDF0FD;}
-		.d2-3748359424 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]></style><g id="x"><g class="shape" ><rect x="1.000000" y="0.000000" width="53.000000" height="66.000000" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="27.500000" y="38.500000" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">x</text></g><g id="y"><g class="shape" ><rect x="0.000000" y="166.000000" width="54.000000" height="66.000000" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="27.000000" y="204.500000" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">y</text></g><g id="(x -&gt; y)[0]"><marker id="mk-3488378134" markerWidth="10.000000" markerHeight="12.000000" refX="7.000000" refY="6.000000" viewBox="0.000000 0.000000 10.000000 12.000000" orient="auto" markerUnits="userSpaceOnUse"> <polygon points="0.000000,0.000000 10.000000,6.000000 0.000000,12.000000" class="connection fill-B1" stroke-width="2" /> </marker><path d="M 27.000000 68.000000 C 27.000000 106.000000 27.000000 126.000000 27.000000 162.000000" fill="none" class="connection stroke-B1" style="stroke-width:2;" marker-end="url(#mk-3488378134)" mask="url(#d2-3748359424)" /></g><mask id="d2-3748359424" maskUnits="userSpaceOnUse" x="-101" y="-101" width="256" height="434">
-=======
 		.d2-1250993138 .fill-N1{fill:#0A0F25;}
 		.d2-1250993138 .fill-N2{fill:#676C7E;}
 		.d2-1250993138 .fill-N3{fill:#9499AB;}
@@ -258,8 +89,7 @@
 		.d2-1250993138 .color-AA4{color:#EDF0FD;}
 		.d2-1250993138 .color-AA5{color:#F7F8FE;}
 		.d2-1250993138 .color-AB4{color:#EDF0FD;}
-		.d2-1250993138 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]></style><g id="x"><g class="shape" ><rect x="1.000000" y="0.000000" width="53.000000" height="66.000000" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="27.500000" y="38.500000" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">x</text></g><g id="y"><g class="shape" ><rect x="0.000000" y="166.000000" width="54.000000" height="66.000000" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="27.000000" y="204.500000" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">y</text></g><g id="(x -&gt; y)[0]"><marker id="mk-3488378134" markerWidth="10.000000" markerHeight="12.000000" refX="7.000000" refY="6.000000" viewBox="0.000000 0.000000 10.000000 12.000000" orient="auto" markerUnits="userSpaceOnUse"> <polygon points="0.000000,0.000000 10.000000,6.000000 0.000000,12.000000" class="connection fill-B1" stroke-width="2" /> </marker><path d="M 27.000000 68.000000 C 27.000000 106.000000 27.000000 126.000000 27.000000 162.000000" fill="none" class="connection stroke-B1" style="stroke-width:2;" marker-end="url(#mk-3488378134)" mask="url(#d2-1250993138)" /></g><mask id="d2-1250993138" maskUnits="userSpaceOnUse" x="-101" y="-101" width="256" height="434">
+		.d2-1250993138 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]></style><g id="x"><g class="shape" ><rect x="1.000000" y="0.000000" width="53.000000" height="66.000000" stroke="#0D32B2" fill="#F7F8FE" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="27.500000" y="38.500000" fill="#0A0F25" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">x</text></g><g id="y"><g class="shape" ><rect x="0.000000" y="166.000000" width="54.000000" height="66.000000" stroke="#0D32B2" fill="#F7F8FE" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="27.000000" y="204.500000" fill="#0A0F25" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">y</text></g><g id="(x -&gt; y)[0]"><marker id="mk-3488378134" markerWidth="10.000000" markerHeight="12.000000" refX="7.000000" refY="6.000000" viewBox="0.000000 0.000000 10.000000 12.000000" orient="auto" markerUnits="userSpaceOnUse"> <polygon points="0.000000,0.000000 10.000000,6.000000 0.000000,12.000000" fill="#0D32B2" class="connection fill-B1" stroke-width="2" /> </marker><path d="M 27.000000 68.000000 C 27.000000 106.000000 27.000000 126.000000 27.000000 162.000000" stroke="#0D32B2" fill="none" class="connection stroke-B1" style="stroke-width:2;" marker-end="url(#mk-3488378134)" mask="url(#d2-1250993138)" /></g><mask id="d2-1250993138" maskUnits="userSpaceOnUse" x="-101" y="-101" width="256" height="434">
->>>>>>> 33280fed5 (fixed e2e tests)
 <rect x="-101" y="-101" width="256" height="434" fill="white"></rect>
 <rect x="23.500000" y="22.500000" width="8" height="21" fill="rgba(0,0,0,0.75)"></rect>
 <rect x="22.500000" y="188.500000" width="9" height="21" fill="rgba(0,0,0,0.75)"></rect>

e2etests-cli/testdata/TestCLI_E2E/multiboard/life/scenarios/why.exp.svg

@@ -1,26 +1,4 @@
-<<<<<<< HEAD
+<?xml version="1.0" encoding="utf-8"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" d2Version="v0.6.8-HEAD" preserveAspectRatio="xMinYMin meet" viewBox="0 0 256 434"><svg id="d2-svg" class="d2-2808374517" width="256" height="434" viewBox="-101 -101 256 434"><rect x="-101.000000" y="-101.000000" width="256.000000" height="434.000000" rx="0.000000" fill="#FFFFFF" class=" fill-N7" stroke-width="0" /><style type="text/css"><![CDATA[
-<<<<<<< HEAD
-<?xml version="1.0" encoding="utf-8"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" d2Version="v0.6.8-HEAD" preserveAspectRatio="xMinYMin meet" viewBox="0 0 256 434"><svg id="d2-svg" class="d2-2626224973" width="256" height="434" viewBox="-101 -101 256 434"><rect x="-101.000000" y="-101.000000" width="256.000000" height="434.000000" rx="0.000000" fill="#FFFFFF" class=" fill-N7" stroke-width="0" /><style type="text/css"><![CDATA[
-||||||| parent of 33280fed5 (fixed e2e tests)
-<?xml version="1.0" encoding="utf-8"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" d2Version="v0.6.6-HEAD" preserveAspectRatio="xMinYMin meet" viewBox="0 0 256 434"><svg id="d2-svg" class="d2-2626224973" width="256" height="434" viewBox="-101 -101 256 434"><rect x="-101.000000" y="-101.000000" width="256.000000" height="434.000000" rx="0.000000" class=" fill-N7" stroke-width="0" /><style type="text/css"><![CDATA[
-=======
-<<<<<<< HEAD
-<?xml version="1.0" encoding="utf-8"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" d2Version="v0.6.6-HEAD" preserveAspectRatio="xMinYMin meet" viewBox="0 0 256 434"><svg id="d2-svg" class="d2-2626224973" width="256" height="434" viewBox="-101 -101 256 434"><rect x="-101.000000" y="-101.000000" width="256.000000" height="434.000000" rx="0.000000" class=" fill-N7" stroke-width="0" /><style type="text/css"><![CDATA[
->>>>>>> 33280fed5 (fixed e2e tests)
-.d2-2626224973 .text-bold {
-	font-family: "d2-2626224973-font-bold";
-=======
-<?xml version="1.0" encoding="utf-8"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" d2Version="v0.6.5-HEAD" preserveAspectRatio="xMinYMin meet" viewBox="0 0 256 434"><svg id="d2-svg" class="d2-2808374517" width="256" height="434" viewBox="-101 -101 256 434"><rect x="-101.000000" y="-101.000000" width="256.000000" height="434.000000" rx="0.000000" class=" fill-N7" stroke-width="0" /><style type="text/css"><![CDATA[
-||||||| parent of cb2f2823c (Fix changes)
-<<<<<<< HEAD
-<?xml version="1.0" encoding="utf-8"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" d2Version="v0.6.6-HEAD" preserveAspectRatio="xMinYMin meet" viewBox="0 0 256 434"><svg id="d2-svg" class="d2-2626224973" width="256" height="434" viewBox="-101 -101 256 434"><rect x="-101.000000" y="-101.000000" width="256.000000" height="434.000000" rx="0.000000" class=" fill-N7" stroke-width="0" /><style type="text/css"><![CDATA[
-.d2-2626224973 .text-bold {
-	font-family: "d2-2626224973-font-bold";
-=======
-<?xml version="1.0" encoding="utf-8"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" d2Version="v0.6.5-HEAD" preserveAspectRatio="xMinYMin meet" viewBox="0 0 256 434"><svg id="d2-svg" class="d2-2808374517" width="256" height="434" viewBox="-101 -101 256 434"><rect x="-101.000000" y="-101.000000" width="256.000000" height="434.000000" rx="0.000000" class=" fill-N7" stroke-width="0" /><style type="text/css"><![CDATA[
-=======
-<?xml version="1.0" encoding="utf-8"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" d2Version="v0.6.6-HEAD" preserveAspectRatio="xMinYMin meet" viewBox="0 0 256 434"><svg id="d2-svg" class="d2-2808374517" width="256" height="434" viewBox="-101 -101 256 434"><rect x="-101.000000" y="-101.000000" width="256.000000" height="434.000000" rx="0.000000" class=" fill-N7" stroke-width="0" /><style type="text/css"><![CDATA[
->>>>>>> cb2f2823c (Fix changes)
 .d2-2808374517 .text-bold {
 	font-family: "d2-2808374517-font-bold";
 }
@@ -40,153 +18,6 @@
   opacity: 0.5;
 }
 
-<<<<<<< HEAD
-		.d2-2626224973 .fill-N1{fill:#0A0F25;}
-		.d2-2626224973 .fill-N2{fill:#676C7E;}
-		.d2-2626224973 .fill-N3{fill:#9499AB;}
-		.d2-2626224973 .fill-N4{fill:#CFD2DD;}
-		.d2-2626224973 .fill-N5{fill:#DEE1EB;}
-		.d2-2626224973 .fill-N6{fill:#EEF1F8;}
-		.d2-2626224973 .fill-N7{fill:#FFFFFF;}
-		.d2-2626224973 .fill-B1{fill:#0D32B2;}
-		.d2-2626224973 .fill-B2{fill:#0D32B2;}
-		.d2-2626224973 .fill-B3{fill:#E3E9FD;}
-		.d2-2626224973 .fill-B4{fill:#E3E9FD;}
-		.d2-2626224973 .fill-B5{fill:#EDF0FD;}
-		.d2-2626224973 .fill-B6{fill:#F7F8FE;}
-		.d2-2626224973 .fill-AA2{fill:#4A6FF3;}
-		.d2-2626224973 .fill-AA4{fill:#EDF0FD;}
-		.d2-2626224973 .fill-AA5{fill:#F7F8FE;}
-		.d2-2626224973 .fill-AB4{fill:#EDF0FD;}
-		.d2-2626224973 .fill-AB5{fill:#F7F8FE;}
-		.d2-2626224973 .stroke-N1{stroke:#0A0F25;}
-		.d2-2626224973 .stroke-N2{stroke:#676C7E;}
-		.d2-2626224973 .stroke-N3{stroke:#9499AB;}
-		.d2-2626224973 .stroke-N4{stroke:#CFD2DD;}
-		.d2-2626224973 .stroke-N5{stroke:#DEE1EB;}
-		.d2-2626224973 .stroke-N6{stroke:#EEF1F8;}
-		.d2-2626224973 .stroke-N7{stroke:#FFFFFF;}
-		.d2-2626224973 .stroke-B1{stroke:#0D32B2;}
-		.d2-2626224973 .stroke-B2{stroke:#0D32B2;}
-		.d2-2626224973 .stroke-B3{stroke:#E3E9FD;}
-		.d2-2626224973 .stroke-B4{stroke:#E3E9FD;}
-		.d2-2626224973 .stroke-B5{stroke:#EDF0FD;}
-		.d2-2626224973 .stroke-B6{stroke:#F7F8FE;}
-		.d2-2626224973 .stroke-AA2{stroke:#4A6FF3;}
-		.d2-2626224973 .stroke-AA4{stroke:#EDF0FD;}
-		.d2-2626224973 .stroke-AA5{stroke:#F7F8FE;}
-		.d2-2626224973 .stroke-AB4{stroke:#EDF0FD;}
-		.d2-2626224973 .stroke-AB5{stroke:#F7F8FE;}
-		.d2-2626224973 .background-color-N1{background-color:#0A0F25;}
-		.d2-2626224973 .background-color-N2{background-color:#676C7E;}
-		.d2-2626224973 .background-color-N3{background-color:#9499AB;}
-		.d2-2626224973 .background-color-N4{background-color:#CFD2DD;}
-		.d2-2626224973 .background-color-N5{background-color:#DEE1EB;}
-		.d2-2626224973 .background-color-N6{background-color:#EEF1F8;}
-		.d2-2626224973 .background-color-N7{background-color:#FFFFFF;}
-		.d2-2626224973 .background-color-B1{background-color:#0D32B2;}
-		.d2-2626224973 .background-color-B2{background-color:#0D32B2;}
-		.d2-2626224973 .background-color-B3{background-color:#E3E9FD;}
-		.d2-2626224973 .background-color-B4{background-color:#E3E9FD;}
-		.d2-2626224973 .background-color-B5{background-color:#EDF0FD;}
-		.d2-2626224973 .background-color-B6{background-color:#F7F8FE;}
-		.d2-2626224973 .background-color-AA2{background-color:#4A6FF3;}
-		.d2-2626224973 .background-color-AA4{background-color:#EDF0FD;}
-		.d2-2626224973 .background-color-AA5{background-color:#F7F8FE;}
-		.d2-2626224973 .background-color-AB4{background-color:#EDF0FD;}
-		.d2-2626224973 .background-color-AB5{background-color:#F7F8FE;}
-		.d2-2626224973 .color-N1{color:#0A0F25;}
-		.d2-2626224973 .color-N2{color:#676C7E;}
-		.d2-2626224973 .color-N3{color:#9499AB;}
-		.d2-2626224973 .color-N4{color:#CFD2DD;}
-		.d2-2626224973 .color-N5{color:#DEE1EB;}
-		.d2-2626224973 .color-N6{color:#EEF1F8;}
-		.d2-2626224973 .color-N7{color:#FFFFFF;}
-		.d2-2626224973 .color-B1{color:#0D32B2;}
-		.d2-2626224973 .color-B2{color:#0D32B2;}
-		.d2-2626224973 .color-B3{color:#E3E9FD;}
-		.d2-2626224973 .color-B4{color:#E3E9FD;}
-		.d2-2626224973 .color-B5{color:#EDF0FD;}
-		.d2-2626224973 .color-B6{color:#F7F8FE;}
-		.d2-2626224973 .color-AA2{color:#4A6FF3;}
-		.d2-2626224973 .color-AA4{color:#EDF0FD;}
-		.d2-2626224973 .color-AA5{color:#F7F8FE;}
-		.d2-2626224973 .color-AB4{color:#EDF0FD;}
-		.d2-2626224973 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]></style><g id="x"><g class="shape" ><rect x="1.000000" y="0.000000" width="53.000000" height="66.000000" stroke="#0D32B2" fill="#F7F8FE" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="27.500000" y="38.500000" fill="#0A0F25" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">x</text></g><g id="y"><g class="shape" ><rect x="0.000000" y="166.000000" width="54.000000" height="66.000000" stroke="#0D32B2" fill="#F7F8FE" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="27.000000" y="204.500000" fill="#0A0F25" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">y</text></g><g id="(x -&gt; y)[0]"><marker id="mk-3488378134" markerWidth="10.000000" markerHeight="12.000000" refX="7.000000" refY="6.000000" viewBox="0.000000 0.000000 10.000000 12.000000" orient="auto" markerUnits="userSpaceOnUse"> <polygon points="0.000000,0.000000 10.000000,6.000000 0.000000,12.000000" fill="#0D32B2" class="connection fill-B1" stroke-width="2" /> </marker><path d="M 22.761710 67.985754 C 18.200001 106.000000 18.200001 126.000000 22.523419 162.028493" stroke="#0D32B2" fill="none" class="connection stroke-B1" style="stroke-width:2;" marker-end="url(#mk-3488378134)" mask="url(#d2-2626224973)" /></g><g id="(y -&gt; x)[0]"><path d="M 31.238290 164.014246 C 35.799999 126.000000 35.799999 106.000000 31.476581 69.971507" stroke="#0D32B2" fill="none" class="connection stroke-B1" style="stroke-width:2;" marker-end="url(#mk-3488378134)" mask="url(#d2-2626224973)" /></g><mask id="d2-2626224973" maskUnits="userSpaceOnUse" x="-101" y="-101" width="256" height="434">
-||||||| parent of 33280fed5 (fixed e2e tests)
-		.d2-2626224973 .fill-N1{fill:#0A0F25;}
-		.d2-2626224973 .fill-N2{fill:#676C7E;}
-		.d2-2626224973 .fill-N3{fill:#9499AB;}
-		.d2-2626224973 .fill-N4{fill:#CFD2DD;}
-		.d2-2626224973 .fill-N5{fill:#DEE1EB;}
-		.d2-2626224973 .fill-N6{fill:#EEF1F8;}
-		.d2-2626224973 .fill-N7{fill:#FFFFFF;}
-		.d2-2626224973 .fill-B1{fill:#0D32B2;}
-		.d2-2626224973 .fill-B2{fill:#0D32B2;}
-		.d2-2626224973 .fill-B3{fill:#E3E9FD;}
-		.d2-2626224973 .fill-B4{fill:#E3E9FD;}
-		.d2-2626224973 .fill-B5{fill:#EDF0FD;}
-		.d2-2626224973 .fill-B6{fill:#F7F8FE;}
-		.d2-2626224973 .fill-AA2{fill:#4A6FF3;}
-		.d2-2626224973 .fill-AA4{fill:#EDF0FD;}
-		.d2-2626224973 .fill-AA5{fill:#F7F8FE;}
-		.d2-2626224973 .fill-AB4{fill:#EDF0FD;}
-		.d2-2626224973 .fill-AB5{fill:#F7F8FE;}
-		.d2-2626224973 .stroke-N1{stroke:#0A0F25;}
-		.d2-2626224973 .stroke-N2{stroke:#676C7E;}
-		.d2-2626224973 .stroke-N3{stroke:#9499AB;}
-		.d2-2626224973 .stroke-N4{stroke:#CFD2DD;}
-		.d2-2626224973 .stroke-N5{stroke:#DEE1EB;}
-		.d2-2626224973 .stroke-N6{stroke:#EEF1F8;}
-		.d2-2626224973 .stroke-N7{stroke:#FFFFFF;}
-		.d2-2626224973 .stroke-B1{stroke:#0D32B2;}
-		.d2-2626224973 .stroke-B2{stroke:#0D32B2;}
-		.d2-2626224973 .stroke-B3{stroke:#E3E9FD;}
-		.d2-2626224973 .stroke-B4{stroke:#E3E9FD;}
-		.d2-2626224973 .stroke-B5{stroke:#EDF0FD;}
-		.d2-2626224973 .stroke-B6{stroke:#F7F8FE;}
-		.d2-2626224973 .stroke-AA2{stroke:#4A6FF3;}
-		.d2-2626224973 .stroke-AA4{stroke:#EDF0FD;}
-		.d2-2626224973 .stroke-AA5{stroke:#F7F8FE;}
-		.d2-2626224973 .stroke-AB4{stroke:#EDF0FD;}
-		.d2-2626224973 .stroke-AB5{stroke:#F7F8FE;}
-		.d2-2626224973 .background-color-N1{background-color:#0A0F25;}
-		.d2-2626224973 .background-color-N2{background-color:#676C7E;}
-		.d2-2626224973 .background-color-N3{background-color:#9499AB;}
-		.d2-2626224973 .background-color-N4{background-color:#CFD2DD;}
-		.d2-2626224973 .background-color-N5{background-color:#DEE1EB;}
-		.d2-2626224973 .background-color-N6{background-color:#EEF1F8;}
-		.d2-2626224973 .background-color-N7{background-color:#FFFFFF;}
-		.d2-2626224973 .background-color-B1{background-color:#0D32B2;}
-		.d2-2626224973 .background-color-B2{background-color:#0D32B2;}
-		.d2-2626224973 .background-color-B3{background-color:#E3E9FD;}
-		.d2-2626224973 .background-color-B4{background-color:#E3E9FD;}
-		.d2-2626224973 .background-color-B5{background-color:#EDF0FD;}
-		.d2-2626224973 .background-color-B6{background-color:#F7F8FE;}
-		.d2-2626224973 .background-color-AA2{background-color:#4A6FF3;}
-		.d2-2626224973 .background-color-AA4{background-color:#EDF0FD;}
-		.d2-2626224973 .background-color-AA5{background-color:#F7F8FE;}
-		.d2-2626224973 .background-color-AB4{background-color:#EDF0FD;}
-		.d2-2626224973 .background-color-AB5{background-color:#F7F8FE;}
-		.d2-2626224973 .color-N1{color:#0A0F25;}
-		.d2-2626224973 .color-N2{color:#676C7E;}
-		.d2-2626224973 .color-N3{color:#9499AB;}
-		.d2-2626224973 .color-N4{color:#CFD2DD;}
-		.d2-2626224973 .color-N5{color:#DEE1EB;}
-		.d2-2626224973 .color-N6{color:#EEF1F8;}
-		.d2-2626224973 .color-N7{color:#FFFFFF;}
-		.d2-2626224973 .color-B1{color:#0D32B2;}
-		.d2-2626224973 .color-B2{color:#0D32B2;}
-		.d2-2626224973 .color-B3{color:#E3E9FD;}
-		.d2-2626224973 .color-B4{color:#E3E9FD;}
-		.d2-2626224973 .color-B5{color:#EDF0FD;}
-		.d2-2626224973 .color-B6{color:#F7F8FE;}
-		.d2-2626224973 .color-AA2{color:#4A6FF3;}
-		.d2-2626224973 .color-AA4{color:#EDF0FD;}
-		.d2-2626224973 .color-AA5{color:#F7F8FE;}
-		.d2-2626224973 .color-AB4{color:#EDF0FD;}
-		.d2-2626224973 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]></style><g id="x"><g class="shape" ><rect x="1.000000" y="0.000000" width="53.000000" height="66.000000" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="27.500000" y="38.500000" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">x</text></g><g id="y"><g class="shape" ><rect x="0.000000" y="166.000000" width="54.000000" height="66.000000" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="27.000000" y="204.500000" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">y</text></g><g id="(x -&gt; y)[0]"><marker id="mk-3488378134" markerWidth="10.000000" markerHeight="12.000000" refX="7.000000" refY="6.000000" viewBox="0.000000 0.000000 10.000000 12.000000" orient="auto" markerUnits="userSpaceOnUse"> <polygon points="0.000000,0.000000 10.000000,6.000000 0.000000,12.000000" class="connection fill-B1" stroke-width="2" /> </marker><path d="M 22.761710 67.985754 C 18.200001 106.000000 18.200001 126.000000 22.523419 162.028493" fill="none" class="connection stroke-B1" style="stroke-width:2;" marker-end="url(#mk-3488378134)" mask="url(#d2-2626224973)" /></g><g id="(y -&gt; x)[0]"><path d="M 31.238290 164.014246 C 35.799999 126.000000 35.799999 106.000000 31.476581 69.971507" fill="none" class="connection stroke-B1" style="stroke-width:2;" marker-end="url(#mk-3488378134)" mask="url(#d2-2626224973)" /></g><mask id="d2-2626224973" maskUnits="userSpaceOnUse" x="-101" y="-101" width="256" height="434">
-=======
 		.d2-2808374517 .fill-N1{fill:#0A0F25;}
 		.d2-2808374517 .fill-N2{fill:#676C7E;}
 		.d2-2808374517 .fill-N3{fill:#9499AB;}
@@ -258,8 +89,7 @@
 		.d2-2808374517 .color-AA4{color:#EDF0FD;}
 		.d2-2808374517 .color-AA5{color:#F7F8FE;}
 		.d2-2808374517 .color-AB4{color:#EDF0FD;}
-		.d2-2808374517 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]></style><g id="x"><g class="shape" ><rect x="1.000000" y="0.000000" width="53.000000" height="66.000000" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="27.500000" y="38.500000" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">x</text></g><g id="y"><g class="shape" ><rect x="0.000000" y="166.000000" width="54.000000" height="66.000000" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="27.000000" y="204.500000" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">y</text></g><g id="(x -&gt; y)[0]"><marker id="mk-3488378134" markerWidth="10.000000" markerHeight="12.000000" refX="7.000000" refY="6.000000" viewBox="0.000000 0.000000 10.000000 12.000000" orient="auto" markerUnits="userSpaceOnUse"> <polygon points="0.000000,0.000000 10.000000,6.000000 0.000000,12.000000" class="connection fill-B1" stroke-width="2" /> </marker><path d="M 22.761710 67.985754 C 18.200001 106.000000 18.200001 126.000000 22.523419 162.028493" fill="none" class="connection stroke-B1" style="stroke-width:2;" marker-end="url(#mk-3488378134)" mask="url(#d2-2808374517)" /></g><g id="(y -&gt; x)[0]"><path d="M 31.238290 164.014246 C 35.799999 126.000000 35.799999 106.000000 31.476581 69.971507" fill="none" class="connection stroke-B1" style="stroke-width:2;" marker-end="url(#mk-3488378134)" mask="url(#d2-2808374517)" /></g><mask id="d2-2808374517" maskUnits="userSpaceOnUse" x="-101" y="-101" width="256" height="434">
+		.d2-2808374517 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]></style><g id="x"><g class="shape" ><rect x="1.000000" y="0.000000" width="53.000000" height="66.000000" stroke="#0D32B2" fill="#F7F8FE" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="27.500000" y="38.500000" fill="#0A0F25" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">x</text></g><g id="y"><g class="shape" ><rect x="0.000000" y="166.000000" width="54.000000" height="66.000000" stroke="#0D32B2" fill="#F7F8FE" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="27.000000" y="204.500000" fill="#0A0F25" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">y</text></g><g id="(x -&gt; y)[0]"><marker id="mk-3488378134" markerWidth="10.000000" markerHeight="12.000000" refX="7.000000" refY="6.000000" viewBox="0.000000 0.000000 10.000000 12.000000" orient="auto" markerUnits="userSpaceOnUse"> <polygon points="0.000000,0.000000 10.000000,6.000000 0.000000,12.000000" fill="#0D32B2" class="connection fill-B1" stroke-width="2" /> </marker><path d="M 22.761710 67.985754 C 18.200001 106.000000 18.200001 126.000000 22.523419 162.028493" stroke="#0D32B2" fill="none" class="connection stroke-B1" style="stroke-width:2;" marker-end="url(#mk-3488378134)" mask="url(#d2-2808374517)" /></g><g id="(y -&gt; x)[0]"><path d="M 31.238290 164.014246 C 35.799999 126.000000 35.799999 106.000000 31.476581 69.971507" stroke="#0D32B2" fill="none" class="connection stroke-B1" style="stroke-width:2;" marker-end="url(#mk-3488378134)" mask="url(#d2-2808374517)" /></g><mask id="d2-2808374517" maskUnits="userSpaceOnUse" x="-101" y="-101" width="256" height="434">
->>>>>>> 33280fed5 (fixed e2e tests)
 <rect x="-101" y="-101" width="256" height="434" fill="white"></rect>
 <rect x="23.500000" y="22.500000" width="8" height="21" fill="rgba(0,0,0,0.75)"></rect>
 <rect x="22.500000" y="188.500000" width="9" height="21" fill="rgba(0,0,0,0.75)"></rect>

e2etests-cli/testdata/TestCLI_E2E/multiboard/life_index_d2/index.exp.svg

@@ -1,26 +1,4 @@
-<<<<<<< HEAD
+<?xml version="1.0" encoding="utf-8"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" d2Version="v0.6.8-HEAD" preserveAspectRatio="xMinYMin meet" viewBox="0 0 256 434"><svg id="d2-svg" class="d2-1250993138" width="256" height="434" viewBox="-101 -101 256 434"><rect x="-101.000000" y="-101.000000" width="256.000000" height="434.000000" rx="0.000000" fill="#FFFFFF" class=" fill-N7" stroke-width="0" /><style type="text/css"><![CDATA[
-<<<<<<< HEAD
-<?xml version="1.0" encoding="utf-8"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" d2Version="v0.6.8-HEAD" preserveAspectRatio="xMinYMin meet" viewBox="0 0 256 434"><svg id="d2-svg" class="d2-3748359424" width="256" height="434" viewBox="-101 -101 256 434"><rect x="-101.000000" y="-101.000000" width="256.000000" height="434.000000" rx="0.000000" fill="#FFFFFF" class=" fill-N7" stroke-width="0" /><style type="text/css"><![CDATA[
-||||||| parent of 33280fed5 (fixed e2e tests)
-<?xml version="1.0" encoding="utf-8"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" d2Version="v0.6.6-HEAD" preserveAspectRatio="xMinYMin meet" viewBox="0 0 256 434"><svg id="d2-svg" class="d2-3748359424" width="256" height="434" viewBox="-101 -101 256 434"><rect x="-101.000000" y="-101.000000" width="256.000000" height="434.000000" rx="0.000000" class=" fill-N7" stroke-width="0" /><style type="text/css"><![CDATA[
-=======
-<<<<<<< HEAD
-<?xml version="1.0" encoding="utf-8"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" d2Version="v0.6.6-HEAD" preserveAspectRatio="xMinYMin meet" viewBox="0 0 256 434"><svg id="d2-svg" class="d2-3748359424" width="256" height="434" viewBox="-101 -101 256 434"><rect x="-101.000000" y="-101.000000" width="256.000000" height="434.000000" rx="0.000000" class=" fill-N7" stroke-width="0" /><style type="text/css"><![CDATA[
->>>>>>> 33280fed5 (fixed e2e tests)
-.d2-3748359424 .text-bold {
-	font-family: "d2-3748359424-font-bold";
-=======
-<?xml version="1.0" encoding="utf-8"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" d2Version="v0.6.5-HEAD" preserveAspectRatio="xMinYMin meet" viewBox="0 0 256 434"><svg id="d2-svg" class="d2-1250993138" width="256" height="434" viewBox="-101 -101 256 434"><rect x="-101.000000" y="-101.000000" width="256.000000" height="434.000000" rx="0.000000" class=" fill-N7" stroke-width="0" /><style type="text/css"><![CDATA[
-||||||| parent of cb2f2823c (Fix changes)
-<<<<<<< HEAD
-<?xml version="1.0" encoding="utf-8"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" d2Version="v0.6.6-HEAD" preserveAspectRatio="xMinYMin meet" viewBox="0 0 256 434"><svg id="d2-svg" class="d2-3748359424" width="256" height="434" viewBox="-101 -101 256 434"><rect x="-101.000000" y="-101.000000" width="256.000000" height="434.000000" rx="0.000000" class=" fill-N7" stroke-width="0" /><style type="text/css"><![CDATA[
-.d2-3748359424 .text-bold {
-	font-family: "d2-3748359424-font-bold";
-=======
-<?xml version="1.0" encoding="utf-8"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" d2Version="v0.6.5-HEAD" preserveAspectRatio="xMinYMin meet" viewBox="0 0 256 434"><svg id="d2-svg" class="d2-1250993138" width="256" height="434" viewBox="-101 -101 256 434"><rect x="-101.000000" y="-101.000000" width="256.000000" height="434.000000" rx="0.000000" class=" fill-N7" stroke-width="0" /><style type="text/css"><![CDATA[
-=======
-<?xml version="1.0" encoding="utf-8"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" d2Version="v0.6.6-HEAD" preserveAspectRatio="xMinYMin meet" viewBox="0 0 256 434"><svg id="d2-svg" class="d2-1250993138" width="256" height="434" viewBox="-101 -101 256 434"><rect x="-101.000000" y="-101.000000" width="256.000000" height="434.000000" rx="0.000000" class=" fill-N7" stroke-width="0" /><style type="text/css"><![CDATA[
->>>>>>> cb2f2823c (Fix changes)
 .d2-1250993138 .text-bold {
 	font-family: "d2-1250993138-font-bold";
 }
@@ -40,153 +18,6 @@
   opacity: 0.5;
 }
 
-<<<<<<< HEAD
-		.d2-3748359424 .fill-N1{fill:#0A0F25;}
-		.d2-3748359424 .fill-N2{fill:#676C7E;}
-		.d2-3748359424 .fill-N3{fill:#9499AB;}
-		.d2-3748359424 .fill-N4{fill:#CFD2DD;}
-		.d2-3748359424 .fill-N5{fill:#DEE1EB;}
-		.d2-3748359424 .fill-N6{fill:#EEF1F8;}
-		.d2-3748359424 .fill-N7{fill:#FFFFFF;}
-		.d2-3748359424 .fill-B1{fill:#0D32B2;}
-		.d2-3748359424 .fill-B2{fill:#0D32B2;}
-		.d2-3748359424 .fill-B3{fill:#E3E9FD;}
-		.d2-3748359424 .fill-B4{fill:#E3E9FD;}
-		.d2-3748359424 .fill-B5{fill:#EDF0FD;}
-		.d2-3748359424 .fill-B6{fill:#F7F8FE;}
-		.d2-3748359424 .fill-AA2{fill:#4A6FF3;}
-		.d2-3748359424 .fill-AA4{fill:#EDF0FD;}
-		.d2-3748359424 .fill-AA5{fill:#F7F8FE;}
-		.d2-3748359424 .fill-AB4{fill:#EDF0FD;}
-		.d2-3748359424 .fill-AB5{fill:#F7F8FE;}
-		.d2-3748359424 .stroke-N1{stroke:#0A0F25;}
-		.d2-3748359424 .stroke-N2{stroke:#676C7E;}
-		.d2-3748359424 .stroke-N3{stroke:#9499AB;}
-		.d2-3748359424 .stroke-N4{stroke:#CFD2DD;}
-		.d2-3748359424 .stroke-N5{stroke:#DEE1EB;}
-		.d2-3748359424 .stroke-N6{stroke:#EEF1F8;}
-		.d2-3748359424 .stroke-N7{stroke:#FFFFFF;}
-		.d2-3748359424 .stroke-B1{stroke:#0D32B2;}
-		.d2-3748359424 .stroke-B2{stroke:#0D32B2;}
-		.d2-3748359424 .stroke-B3{stroke:#E3E9FD;}
-		.d2-3748359424 .stroke-B4{stroke:#E3E9FD;}
-		.d2-3748359424 .stroke-B5{stroke:#EDF0FD;}
-		.d2-3748359424 .stroke-B6{stroke:#F7F8FE;}
-		.d2-3748359424 .stroke-AA2{stroke:#4A6FF3;}
-		.d2-3748359424 .stroke-AA4{stroke:#EDF0FD;}
-		.d2-3748359424 .stroke-AA5{stroke:#F7F8FE;}
-		.d2-3748359424 .stroke-AB4{stroke:#EDF0FD;}
-		.d2-3748359424 .stroke-AB5{stroke:#F7F8FE;}
-		.d2-3748359424 .background-color-N1{background-color:#0A0F25;}
-		.d2-3748359424 .background-color-N2{background-color:#676C7E;}
-		.d2-3748359424 .background-color-N3{background-color:#9499AB;}
-		.d2-3748359424 .background-color-N4{background-color:#CFD2DD;}
-		.d2-3748359424 .background-color-N5{background-color:#DEE1EB;}
-		.d2-3748359424 .background-color-N6{background-color:#EEF1F8;}
-		.d2-3748359424 .background-color-N7{background-color:#FFFFFF;}
-		.d2-3748359424 .background-color-B1{background-color:#0D32B2;}
-		.d2-3748359424 .background-color-B2{background-color:#0D32B2;}
-		.d2-3748359424 .background-color-B3{background-color:#E3E9FD;}
-		.d2-3748359424 .background-color-B4{background-color:#E3E9FD;}
-		.d2-3748359424 .background-color-B5{background-color:#EDF0FD;}
-		.d2-3748359424 .background-color-B6{background-color:#F7F8FE;}
-		.d2-3748359424 .background-color-AA2{background-color:#4A6FF3;}
-		.d2-3748359424 .background-color-AA4{background-color:#EDF0FD;}
-		.d2-3748359424 .background-color-AA5{background-color:#F7F8FE;}
-		.d2-3748359424 .background-color-AB4{background-color:#EDF0FD;}
-		.d2-3748359424 .background-color-AB5{background-color:#F7F8FE;}
-		.d2-3748359424 .color-N1{color:#0A0F25;}
-		.d2-3748359424 .color-N2{color:#676C7E;}
-		.d2-3748359424 .color-N3{color:#9499AB;}
-		.d2-3748359424 .color-N4{color:#CFD2DD;}
-		.d2-3748359424 .color-N5{color:#DEE1EB;}
-		.d2-3748359424 .color-N6{color:#EEF1F8;}
-		.d2-3748359424 .color-N7{color:#FFFFFF;}
-		.d2-3748359424 .color-B1{color:#0D32B2;}
-		.d2-3748359424 .color-B2{color:#0D32B2;}
-		.d2-3748359424 .color-B3{color:#E3E9FD;}
-		.d2-3748359424 .color-B4{color:#E3E9FD;}
-		.d2-3748359424 .color-B5{color:#EDF0FD;}
-		.d2-3748359424 .color-B6{color:#F7F8FE;}
-		.d2-3748359424 .color-AA2{color:#4A6FF3;}
-		.d2-3748359424 .color-AA4{color:#EDF0FD;}
-		.d2-3748359424 .color-AA5{color:#F7F8FE;}
-		.d2-3748359424 .color-AB4{color:#EDF0FD;}
-		.d2-3748359424 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]></style><g id="x"><g class="shape" ><rect x="1.000000" y="0.000000" width="53.000000" height="66.000000" stroke="#0D32B2" fill="#F7F8FE" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="27.500000" y="38.500000" fill="#0A0F25" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">x</text></g><g id="y"><g class="shape" ><rect x="0.000000" y="166.000000" width="54.000000" height="66.000000" stroke="#0D32B2" fill="#F7F8FE" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="27.000000" y="204.500000" fill="#0A0F25" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">y</text></g><g id="(x -&gt; y)[0]"><marker id="mk-3488378134" markerWidth="10.000000" markerHeight="12.000000" refX="7.000000" refY="6.000000" viewBox="0.000000 0.000000 10.000000 12.000000" orient="auto" markerUnits="userSpaceOnUse"> <polygon points="0.000000,0.000000 10.000000,6.000000 0.000000,12.000000" fill="#0D32B2" class="connection fill-B1" stroke-width="2" /> </marker><path d="M 27.000000 68.000000 C 27.000000 106.000000 27.000000 126.000000 27.000000 162.000000" stroke="#0D32B2" fill="none" class="connection stroke-B1" style="stroke-width:2;" marker-end="url(#mk-3488378134)" mask="url(#d2-3748359424)" /></g><mask id="d2-3748359424" maskUnits="userSpaceOnUse" x="-101" y="-101" width="256" height="434">
-||||||| parent of 33280fed5 (fixed e2e tests)
-		.d2-3748359424 .fill-N1{fill:#0A0F25;}
-		.d2-3748359424 .fill-N2{fill:#676C7E;}
-		.d2-3748359424 .fill-N3{fill:#9499AB;}
-		.d2-3748359424 .fill-N4{fill:#CFD2DD;}
-		.d2-3748359424 .fill-N5{fill:#DEE1EB;}
-		.d2-3748359424 .fill-N6{fill:#EEF1F8;}
-		.d2-3748359424 .fill-N7{fill:#FFFFFF;}
-		.d2-3748359424 .fill-B1{fill:#0D32B2;}
-		.d2-3748359424 .fill-B2{fill:#0D32B2;}
-		.d2-3748359424 .fill-B3{fill:#E3E9FD;}
-		.d2-3748359424 .fill-B4{fill:#E3E9FD;}
-		.d2-3748359424 .fill-B5{fill:#EDF0FD;}
-		.d2-3748359424 .fill-B6{fill:#F7F8FE;}
-		.d2-3748359424 .fill-AA2{fill:#4A6FF3;}
-		.d2-3748359424 .fill-AA4{fill:#EDF0FD;}
-		.d2-3748359424 .fill-AA5{fill:#F7F8FE;}
-		.d2-3748359424 .fill-AB4{fill:#EDF0FD;}
-		.d2-3748359424 .fill-AB5{fill:#F7F8FE;}
-		.d2-3748359424 .stroke-N1{stroke:#0A0F25;}
-		.d2-3748359424 .stroke-N2{stroke:#676C7E;}
-		.d2-3748359424 .stroke-N3{stroke:#9499AB;}
-		.d2-3748359424 .stroke-N4{stroke:#CFD2DD;}
-		.d2-3748359424 .stroke-N5{stroke:#DEE1EB;}
-		.d2-3748359424 .stroke-N6{stroke:#EEF1F8;}
-		.d2-3748359424 .stroke-N7{stroke:#FFFFFF;}
-		.d2-3748359424 .stroke-B1{stroke:#0D32B2;}
-		.d2-3748359424 .stroke-B2{stroke:#0D32B2;}
-		.d2-3748359424 .stroke-B3{stroke:#E3E9FD;}
-		.d2-3748359424 .stroke-B4{stroke:#E3E9FD;}
-		.d2-3748359424 .stroke-B5{stroke:#EDF0FD;}
-		.d2-3748359424 .stroke-B6{stroke:#F7F8FE;}
-		.d2-3748359424 .stroke-AA2{stroke:#4A6FF3;}
-		.d2-3748359424 .stroke-AA4{stroke:#EDF0FD;}
-		.d2-3748359424 .stroke-AA5{stroke:#F7F8FE;}
-		.d2-3748359424 .stroke-AB4{stroke:#EDF0FD;}
-		.d2-3748359424 .stroke-AB5{stroke:#F7F8FE;}
-		.d2-3748359424 .background-color-N1{background-color:#0A0F25;}
-		.d2-3748359424 .background-color-N2{background-color:#676C7E;}
-		.d2-3748359424 .background-color-N3{background-color:#9499AB;}
-		.d2-3748359424 .background-color-N4{background-color:#CFD2DD;}
-		.d2-3748359424 .background-color-N5{background-color:#DEE1EB;}
-		.d2-3748359424 .background-color-N6{background-color:#EEF1F8;}
-		.d2-3748359424 .background-color-N7{background-color:#FFFFFF;}
-		.d2-3748359424 .background-color-B1{background-color:#0D32B2;}
-		.d2-3748359424 .background-color-B2{background-color:#0D32B2;}
-		.d2-3748359424 .background-color-B3{background-color:#E3E9FD;}
-		.d2-3748359424 .background-color-B4{background-color:#E3E9FD;}
-		.d2-3748359424 .background-color-B5{background-color:#EDF0FD;}
-		.d2-3748359424 .background-color-B6{background-color:#F7F8FE;}
-		.d2-3748359424 .background-color-AA2{background-color:#4A6FF3;}
-		.d2-3748359424 .background-color-AA4{background-color:#EDF0FD;}
-		.d2-3748359424 .background-color-AA5{background-color:#F7F8FE;}
-		.d2-3748359424 .background-color-AB4{background-color:#EDF0FD;}
-		.d2-3748359424 .background-color-AB5{background-color:#F7F8FE;}
-		.d2-3748359424 .color-N1{color:#0A0F25;}
-		.d2-3748359424 .color-N2{color:#676C7E;}
-		.d2-3748359424 .color-N3{color:#9499AB;}
-		.d2-3748359424 .color-N4{color:#CFD2DD;}
-		.d2-3748359424 .color-N5{color:#DEE1EB;}
-		.d2-3748359424 .color-N6{color:#EEF1F8;}
-		.d2-3748359424 .color-N7{color:#FFFFFF;}
-		.d2-3748359424 .color-B1{color:#0D32B2;}
-		.d2-3748359424 .color-B2{color:#0D32B2;}
-		.d2-3748359424 .color-B3{color:#E3E9FD;}
-		.d2-3748359424 .color-B4{color:#E3E9FD;}
-		.d2-3748359424 .color-B5{color:#EDF0FD;}
-		.d2-3748359424 .color-B6{color:#F7F8FE;}
-		.d2-3748359424 .color-AA2{color:#4A6FF3;}
-		.d2-3748359424 .color-AA4{color:#EDF0FD;}
-		.d2-3748359424 .color-AA5{color:#F7F8FE;}
-		.d2-3748359424 .color-AB4{color:#EDF0FD;}
-		.d2-3748359424 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]></style><g id="x"><g class="shape" ><rect x="1.000000" y="0.000000" width="53.000000" height="66.000000" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="27.500000" y="38.500000" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">x</text></g><g id="y"><g class="shape" ><rect x="0.000000" y="166.000000" width="54.000000" height="66.000000" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="27.000000" y="204.500000" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">y</text></g><g id="(x -&gt; y)[0]"><marker id="mk-3488378134" markerWidth="10.000000" markerHeight="12.000000" refX="7.000000" refY="6.000000" viewBox="0.000000 0.000000 10.000000 12.000000" orient="auto" markerUnits="userSpaceOnUse"> <polygon points="0.000000,0.000000 10.000000,6.000000 0.000000,12.000000" class="connection fill-B1" stroke-width="2" /> </marker><path d="M 27.000000 68.000000 C 27.000000 106.000000 27.000000 126.000000 27.000000 162.000000" fill="none" class="connection stroke-B1" style="stroke-width:2;" marker-end="url(#mk-3488378134)" mask="url(#d2-3748359424)" /></g><mask id="d2-3748359424" maskUnits="userSpaceOnUse" x="-101" y="-101" width="256" height="434">
-=======
 		.d2-1250993138 .fill-N1{fill:#0A0F25;}
 		.d2-1250993138 .fill-N2{fill:#676C7E;}
 		.d2-1250993138 .fill-N3{fill:#9499AB;}
@@ -258,8 +89,7 @@
 		.d2-1250993138 .color-AA4{color:#EDF0FD;}
 		.d2-1250993138 .color-AA5{color:#F7F8FE;}
 		.d2-1250993138 .color-AB4{color:#EDF0FD;}
-		.d2-1250993138 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]></style><g id="x"><g class="shape" ><rect x="1.000000" y="0.000000" width="53.000000" height="66.000000" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="27.500000" y="38.500000" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">x</text></g><g id="y"><g class="shape" ><rect x="0.000000" y="166.000000" width="54.000000" height="66.000000" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="27.000000" y="204.500000" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">y</text></g><g id="(x -&gt; y)[0]"><marker id="mk-3488378134" markerWidth="10.000000" markerHeight="12.000000" refX="7.000000" refY="6.000000" viewBox="0.000000 0.000000 10.000000 12.000000" orient="auto" markerUnits="userSpaceOnUse"> <polygon points="0.000000,0.000000 10.000000,6.000000 0.000000,12.000000" class="connection fill-B1" stroke-width="2" /> </marker><path d="M 27.000000 68.000000 C 27.000000 106.000000 27.000000 126.000000 27.000000 162.000000" fill="none" class="connection stroke-B1" style="stroke-width:2;" marker-end="url(#mk-3488378134)" mask="url(#d2-1250993138)" /></g><mask id="d2-1250993138" maskUnits="userSpaceOnUse" x="-101" y="-101" width="256" height="434">
+		.d2-1250993138 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]></style><g id="x"><g class="shape" ><rect x="1.000000" y="0.000000" width="53.000000" height="66.000000" stroke="#0D32B2" fill="#F7F8FE" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="27.500000" y="38.500000" fill="#0A0F25" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">x</text></g><g id="y"><g class="shape" ><rect x="0.000000" y="166.000000" width="54.000000" height="66.000000" stroke="#0D32B2" fill="#F7F8FE" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="27.000000" y="204.500000" fill="#0A0F25" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">y</text></g><g id="(x -&gt; y)[0]"><marker id="mk-3488378134" markerWidth="10.000000" markerHeight="12.000000" refX="7.000000" refY="6.000000" viewBox="0.000000 0.000000 10.000000 12.000000" orient="auto" markerUnits="userSpaceOnUse"> <polygon points="0.000000,0.000000 10.000000,6.000000 0.000000,12.000000" fill="#0D32B2" class="connection fill-B1" stroke-width="2" /> </marker><path d="M 27.000000 68.000000 C 27.000000 106.000000 27.000000 126.000000 27.000000 162.000000" stroke="#0D32B2" fill="none" class="connection stroke-B1" style="stroke-width:2;" marker-end="url(#mk-3488378134)" mask="url(#d2-1250993138)" /></g><mask id="d2-1250993138" maskUnits="userSpaceOnUse" x="-101" y="-101" width="256" height="434">
->>>>>>> 33280fed5 (fixed e2e tests)
 <rect x="-101" y="-101" width="256" height="434" fill="white"></rect>
 <rect x="23.500000" y="22.500000" width="8" height="21" fill="rgba(0,0,0,0.75)"></rect>
 <rect x="22.500000" y="188.500000" width="9" height="21" fill="rgba(0,0,0,0.75)"></rect>

e2etests-cli/testdata/TestCLI_E2E/multiboard/life_index_d2/scenarios/why.exp.svg

@@ -1,26 +1,4 @@
-<<<<<<< HEAD
+<?xml version="1.0" encoding="utf-8"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" d2Version="v0.6.8-HEAD" preserveAspectRatio="xMinYMin meet" viewBox="0 0 256 434"><svg id="d2-svg" class="d2-2808374517" width="256" height="434" viewBox="-101 -101 256 434"><rect x="-101.000000" y="-101.000000" width="256.000000" height="434.000000" rx="0.000000" fill="#FFFFFF" class=" fill-N7" stroke-width="0" /><style type="text/css"><![CDATA[
-<<<<<<< HEAD
-<?xml version="1.0" encoding="utf-8"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" d2Version="v0.6.8-HEAD" preserveAspectRatio="xMinYMin meet" viewBox="0 0 256 434"><svg id="d2-svg" class="d2-2626224973" width="256" height="434" viewBox="-101 -101 256 434"><rect x="-101.000000" y="-101.000000" width="256.000000" height="434.000000" rx="0.000000" fill="#FFFFFF" class=" fill-N7" stroke-width="0" /><style type="text/css"><![CDATA[
-||||||| parent of 33280fed5 (fixed e2e tests)
-<?xml version="1.0" encoding="utf-8"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" d2Version="v0.6.6-HEAD" preserveAspectRatio="xMinYMin meet" viewBox="0 0 256 434"><svg id="d2-svg" class="d2-2626224973" width="256" height="434" viewBox="-101 -101 256 434"><rect x="-101.000000" y="-101.000000" width="256.000000" height="434.000000" rx="0.000000" class=" fill-N7" stroke-width="0" /><style type="text/css"><![CDATA[
-=======
-<<<<<<< HEAD
-<?xml version="1.0" encoding="utf-8"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" d2Version="v0.6.6-HEAD" preserveAspectRatio="xMinYMin meet" viewBox="0 0 256 434"><svg id="d2-svg" class="d2-2626224973" width="256" height="434" viewBox="-101 -101 256 434"><rect x="-101.000000" y="-101.000000" width="256.000000" height="434.000000" rx="0.000000" class=" fill-N7" stroke-width="0" /><style type="text/css"><![CDATA[
->>>>>>> 33280fed5 (fixed e2e tests)
-.d2-2626224973 .text-bold {
-	font-family: "d2-2626224973-font-bold";
-=======
-<?xml version="1.0" encoding="utf-8"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" d2Version="v0.6.5-HEAD" preserveAspectRatio="xMinYMin meet" viewBox="0 0 256 434"><svg id="d2-svg" class="d2-2808374517" width="256" height="434" viewBox="-101 -101 256 434"><rect x="-101.000000" y="-101.000000" width="256.000000" height="434.000000" rx="0.000000" class=" fill-N7" stroke-width="0" /><style type="text/css"><![CDATA[
-||||||| parent of cb2f2823c (Fix changes)
-<<<<<<< HEAD
-<?xml version="1.0" encoding="utf-8"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" d2Version="v0.6.6-HEAD" preserveAspectRatio="xMinYMin meet" viewBox="0 0 256 434"><svg id="d2-svg" class="d2-2626224973" width="256" height="434" viewBox="-101 -101 256 434"><rect x="-101.000000" y="-101.000000" width="256.000000" height="434.000000" rx="0.000000" class=" fill-N7" stroke-width="0" /><style type="text/css"><![CDATA[
-.d2-2626224973 .text-bold {
-	font-family: "d2-2626224973-font-bold";
-=======
-<?xml version="1.0" encoding="utf-8"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" d2Version="v0.6.5-HEAD" preserveAspectRatio="xMinYMin meet" viewBox="0 0 256 434"><svg id="d2-svg" class="d2-2808374517" width="256" height="434" viewBox="-101 -101 256 434"><rect x="-101.000000" y="-101.000000" width="256.000000" height="434.000000" rx="0.000000" class=" fill-N7" stroke-width="0" /><style type="text/css"><![CDATA[
-=======
-<?xml version="1.0" encoding="utf-8"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" d2Version="v0.6.6-HEAD" preserveAspectRatio="xMinYMin meet" viewBox="0 0 256 434"><svg id="d2-svg" class="d2-2808374517" width="256" height="434" viewBox="-101 -101 256 434"><rect x="-101.000000" y="-101.000000" width="256.000000" height="434.000000" rx="0.000000" class=" fill-N7" stroke-width="0" /><style type="text/css"><![CDATA[
->>>>>>> cb2f2823c (Fix changes)
 .d2-2808374517 .text-bold {
 	font-family: "d2-2808374517-font-bold";
 }
@@ -40,153 +18,6 @@
   opacity: 0.5;
 }
 
-<<<<<<< HEAD
-		.d2-2626224973 .fill-N1{fill:#0A0F25;}
-		.d2-2626224973 .fill-N2{fill:#676C7E;}
-		.d2-2626224973 .fill-N3{fill:#9499AB;}
-		.d2-2626224973 .fill-N4{fill:#CFD2DD;}
-		.d2-2626224973 .fill-N5{fill:#DEE1EB;}
-		.d2-2626224973 .fill-N6{fill:#EEF1F8;}
-		.d2-2626224973 .fill-N7{fill:#FFFFFF;}
-		.d2-2626224973 .fill-B1{fill:#0D32B2;}
-		.d2-2626224973 .fill-B2{fill:#0D32B2;}
-		.d2-2626224973 .fill-B3{fill:#E3E9FD;}
-		.d2-2626224973 .fill-B4{fill:#E3E9FD;}
-		.d2-2626224973 .fill-B5{fill:#EDF0FD;}
-		.d2-2626224973 .fill-B6{fill:#F7F8FE;}
-		.d2-2626224973 .fill-AA2{fill:#4A6FF3;}
-		.d2-2626224973 .fill-AA4{fill:#EDF0FD;}
-		.d2-2626224973 .fill-AA5{fill:#F7F8FE;}
-		.d2-2626224973 .fill-AB4{fill:#EDF0FD;}
-		.d2-2626224973 .fill-AB5{fill:#F7F8FE;}
-		.d2-2626224973 .stroke-N1{stroke:#0A0F25;}
-		.d2-2626224973 .stroke-N2{stroke:#676C7E;}
-		.d2-2626224973 .stroke-N3{stroke:#9499AB;}
-		.d2-2626224973 .stroke-N4{stroke:#CFD2DD;}
-		.d2-2626224973 .stroke-N5{stroke:#DEE1EB;}
-		.d2-2626224973 .stroke-N6{stroke:#EEF1F8;}
-		.d2-2626224973 .stroke-N7{stroke:#FFFFFF;}
-		.d2-2626224973 .stroke-B1{stroke:#0D32B2;}
-		.d2-2626224973 .stroke-B2{stroke:#0D32B2;}
-		.d2-2626224973 .stroke-B3{stroke:#E3E9FD;}
-		.d2-2626224973 .stroke-B4{stroke:#E3E9FD;}
-		.d2-2626224973 .stroke-B5{stroke:#EDF0FD;}
-		.d2-2626224973 .stroke-B6{stroke:#F7F8FE;}
-		.d2-2626224973 .stroke-AA2{stroke:#4A6FF3;}
-		.d2-2626224973 .stroke-AA4{stroke:#EDF0FD;}
-		.d2-2626224973 .stroke-AA5{stroke:#F7F8FE;}
-		.d2-2626224973 .stroke-AB4{stroke:#EDF0FD;}
-		.d2-2626224973 .stroke-AB5{stroke:#F7F8FE;}
-		.d2-2626224973 .background-color-N1{background-color:#0A0F25;}
-		.d2-2626224973 .background-color-N2{background-color:#676C7E;}
-		.d2-2626224973 .background-color-N3{background-color:#9499AB;}
-		.d2-2626224973 .background-color-N4{background-color:#CFD2DD;}
-		.d2-2626224973 .background-color-N5{background-color:#DEE1EB;}
-		.d2-2626224973 .background-color-N6{background-color:#EEF1F8;}
-		.d2-2626224973 .background-color-N7{background-color:#FFFFFF;}
-		.d2-2626224973 .background-color-B1{background-color:#0D32B2;}
-		.d2-2626224973 .background-color-B2{background-color:#0D32B2;}
-		.d2-2626224973 .background-color-B3{background-color:#E3E9FD;}
-		.d2-2626224973 .background-color-B4{background-color:#E3E9FD;}
-		.d2-2626224973 .background-color-B5{background-color:#EDF0FD;}
-		.d2-2626224973 .background-color-B6{background-color:#F7F8FE;}
-		.d2-2626224973 .background-color-AA2{background-color:#4A6FF3;}
-		.d2-2626224973 .background-color-AA4{background-color:#EDF0FD;}
-		.d2-2626224973 .background-color-AA5{background-color:#F7F8FE;}
-		.d2-2626224973 .background-color-AB4{background-color:#EDF0FD;}
-		.d2-2626224973 .background-color-AB5{background-color:#F7F8FE;}
-		.d2-2626224973 .color-N1{color:#0A0F25;}
-		.d2-2626224973 .color-N2{color:#676C7E;}
-		.d2-2626224973 .color-N3{color:#9499AB;}
-		.d2-2626224973 .color-N4{color:#CFD2DD;}
-		.d2-2626224973 .color-N5{color:#DEE1EB;}
-		.d2-2626224973 .color-N6{color:#EEF1F8;}
-		.d2-2626224973 .color-N7{color:#FFFFFF;}
-		.d2-2626224973 .color-B1{color:#0D32B2;}
-		.d2-2626224973 .color-B2{color:#0D32B2;}
-		.d2-2626224973 .color-B3{color:#E3E9FD;}
-		.d2-2626224973 .color-B4{color:#E3E9FD;}
-		.d2-2626224973 .color-B5{color:#EDF0FD;}
-		.d2-2626224973 .color-B6{color:#F7F8FE;}
-		.d2-2626224973 .color-AA2{color:#4A6FF3;}
-		.d2-2626224973 .color-AA4{color:#EDF0FD;}
-		.d2-2626224973 .color-AA5{color:#F7F8FE;}
-		.d2-2626224973 .color-AB4{color:#EDF0FD;}
-		.d2-2626224973 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]></style><g id="x"><g class="shape" ><rect x="1.000000" y="0.000000" width="53.000000" height="66.000000" stroke="#0D32B2" fill="#F7F8FE" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="27.500000" y="38.500000" fill="#0A0F25" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">x</text></g><g id="y"><g class="shape" ><rect x="0.000000" y="166.000000" width="54.000000" height="66.000000" stroke="#0D32B2" fill="#F7F8FE" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="27.000000" y="204.500000" fill="#0A0F25" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">y</text></g><g id="(x -&gt; y)[0]"><marker id="mk-3488378134" markerWidth="10.000000" markerHeight="12.000000" refX="7.000000" refY="6.000000" viewBox="0.000000 0.000000 10.000000 12.000000" orient="auto" markerUnits="userSpaceOnUse"> <polygon points="0.000000,0.000000 10.000000,6.000000 0.000000,12.000000" fill="#0D32B2" class="connection fill-B1" stroke-width="2" /> </marker><path d="M 22.761710 67.985754 C 18.200001 106.000000 18.200001 126.000000 22.523419 162.028493" stroke="#0D32B2" fill="none" class="connection stroke-B1" style="stroke-width:2;" marker-end="url(#mk-3488378134)" mask="url(#d2-2626224973)" /></g><g id="(y -&gt; x)[0]"><path d="M 31.238290 164.014246 C 35.799999 126.000000 35.799999 106.000000 31.476581 69.971507" stroke="#0D32B2" fill="none" class="connection stroke-B1" style="stroke-width:2;" marker-end="url(#mk-3488378134)" mask="url(#d2-2626224973)" /></g><mask id="d2-2626224973" maskUnits="userSpaceOnUse" x="-101" y="-101" width="256" height="434">
-||||||| parent of 33280fed5 (fixed e2e tests)
-		.d2-2626224973 .fill-N1{fill:#0A0F25;}
-		.d2-2626224973 .fill-N2{fill:#676C7E;}
-		.d2-2626224973 .fill-N3{fill:#9499AB;}
-		.d2-2626224973 .fill-N4{fill:#CFD2DD;}
-		.d2-2626224973 .fill-N5{fill:#DEE1EB;}
-		.d2-2626224973 .fill-N6{fill:#EEF1F8;}
-		.d2-2626224973 .fill-N7{fill:#FFFFFF;}
-		.d2-2626224973 .fill-B1{fill:#0D32B2;}
-		.d2-2626224973 .fill-B2{fill:#0D32B2;}
-		.d2-2626224973 .fill-B3{fill:#E3E9FD;}
-		.d2-2626224973 .fill-B4{fill:#E3E9FD;}
-		.d2-2626224973 .fill-B5{fill:#EDF0FD;}
-		.d2-2626224973 .fill-B6{fill:#F7F8FE;}
-		.d2-2626224973 .fill-AA2{fill:#4A6FF3;}
-		.d2-2626224973 .fill-AA4{fill:#EDF0FD;}
-		.d2-2626224973 .fill-AA5{fill:#F7F8FE;}
-		.d2-2626224973 .fill-AB4{fill:#EDF0FD;}
-		.d2-2626224973 .fill-AB5{fill:#F7F8FE;}
-		.d2-2626224973 .stroke-N1{stroke:#0A0F25;}
-		.d2-2626224973 .stroke-N2{stroke:#676C7E;}
-		.d2-2626224973 .stroke-N3{stroke:#9499AB;}
-		.d2-2626224973 .stroke-N4{stroke:#CFD2DD;}
-		.d2-2626224973 .stroke-N5{stroke:#DEE1EB;}
-		.d2-2626224973 .stroke-N6{stroke:#EEF1F8;}
-		.d2-2626224973 .stroke-N7{stroke:#FFFFFF;}
-		.d2-2626224973 .stroke-B1{stroke:#0D32B2;}
-		.d2-2626224973 .stroke-B2{stroke:#0D32B2;}
-		.d2-2626224973 .stroke-B3{stroke:#E3E9FD;}
-		.d2-2626224973 .stroke-B4{stroke:#E3E9FD;}
-		.d2-2626224973 .stroke-B5{stroke:#EDF0FD;}
-		.d2-2626224973 .stroke-B6{stroke:#F7F8FE;}
-		.d2-2626224973 .stroke-AA2{stroke:#4A6FF3;}
-		.d2-2626224973 .stroke-AA4{stroke:#EDF0FD;}
-		.d2-2626224973 .stroke-AA5{stroke:#F7F8FE;}
-		.d2-2626224973 .stroke-AB4{stroke:#EDF0FD;}
-		.d2-2626224973 .stroke-AB5{stroke:#F7F8FE;}
-		.d2-2626224973 .background-color-N1{background-color:#0A0F25;}
-		.d2-2626224973 .background-color-N2{background-color:#676C7E;}
-		.d2-2626224973 .background-color-N3{background-color:#9499AB;}
-		.d2-2626224973 .background-color-N4{background-color:#CFD2DD;}
-		.d2-2626224973 .background-color-N5{background-color:#DEE1EB;}
-		.d2-2626224973 .background-color-N6{background-color:#EEF1F8;}
-		.d2-2626224973 .background-color-N7{background-color:#FFFFFF;}
-		.d2-2626224973 .background-color-B1{background-color:#0D32B2;}
-		.d2-2626224973 .background-color-B2{background-color:#0D32B2;}
-		.d2-2626224973 .background-color-B3{background-color:#E3E9FD;}
-		.d2-2626224973 .background-color-B4{background-color:#E3E9FD;}
-		.d2-2626224973 .background-color-B5{background-color:#EDF0FD;}
-		.d2-2626224973 .background-color-B6{background-color:#F7F8FE;}
-		.d2-2626224973 .background-color-AA2{background-color:#4A6FF3;}
-		.d2-2626224973 .background-color-AA4{background-color:#EDF0FD;}
-		.d2-2626224973 .background-color-AA5{background-color:#F7F8FE;}
-		.d2-2626224973 .background-color-AB4{background-color:#EDF0FD;}
-		.d2-2626224973 .background-color-AB5{background-color:#F7F8FE;}
-		.d2-2626224973 .color-N1{color:#0A0F25;}
-		.d2-2626224973 .color-N2{color:#676C7E;}
-		.d2-2626224973 .color-N3{color:#9499AB;}
-		.d2-2626224973 .color-N4{color:#CFD2DD;}
-		.d2-2626224973 .color-N5{color:#DEE1EB;}
-		.d2-2626224973 .color-N6{color:#EEF1F8;}
-		.d2-2626224973 .color-N7{color:#FFFFFF;}
-		.d2-2626224973 .color-B1{color:#0D32B2;}
-		.d2-2626224973 .color-B2{color:#0D32B2;}
-		.d2-2626224973 .color-B3{color:#E3E9FD;}
-		.d2-2626224973 .color-B4{color:#E3E9FD;}
-		.d2-2626224973 .color-B5{color:#EDF0FD;}
-		.d2-2626224973 .color-B6{color:#F7F8FE;}
-		.d2-2626224973 .color-AA2{color:#4A6FF3;}
-		.d2-2626224973 .color-AA4{color:#EDF0FD;}
-		.d2-2626224973 .color-AA5{color:#F7F8FE;}
-		.d2-2626224973 .color-AB4{color:#EDF0FD;}
-		.d2-2626224973 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]></style><g id="x"><g class="shape" ><rect x="1.000000" y="0.000000" width="53.000000" height="66.000000" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="27.500000" y="38.500000" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">x</text></g><g id="y"><g class="shape" ><rect x="0.000000" y="166.000000" width="54.000000" height="66.000000" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="27.000000" y="204.500000" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">y</text></g><g id="(x -&gt; y)[0]"><marker id="mk-3488378134" markerWidth="10.000000" markerHeight="12.000000" refX="7.000000" refY="6.000000" viewBox="0.000000 0.000000 10.000000 12.000000" orient="auto" markerUnits="userSpaceOnUse"> <polygon points="0.000000,0.000000 10.000000,6.000000 0.000000,12.000000" class="connection fill-B1" stroke-width="2" /> </marker><path d="M 22.761710 67.985754 C 18.200001 106.000000 18.200001 126.000000 22.523419 162.028493" fill="none" class="connection stroke-B1" style="stroke-width:2;" marker-end="url(#mk-3488378134)" mask="url(#d2-2626224973)" /></g><g id="(y -&gt; x)[0]"><path d="M 31.238290 164.014246 C 35.799999 126.000000 35.799999 106.000000 31.476581 69.971507" fill="none" class="connection stroke-B1" style="stroke-width:2;" marker-end="url(#mk-3488378134)" mask="url(#d2-2626224973)" /></g><mask id="d2-2626224973" maskUnits="userSpaceOnUse" x="-101" y="-101" width="256" height="434">
-=======
 		.d2-2808374517 .fill-N1{fill:#0A0F25;}
 		.d2-2808374517 .fill-N2{fill:#676C7E;}
 		.d2-2808374517 .fill-N3{fill:#9499AB;}
@@ -258,8 +89,7 @@
 		.d2-2808374517 .color-AA4{color:#EDF0FD;}
 		.d2-2808374517 .color-AA5{color:#F7F8FE;}
 		.d2-2808374517 .color-AB4{color:#EDF0FD;}
-		.d2-2808374517 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]></style><g id="x"><g class="shape" ><rect x="1.000000" y="0.000000" width="53.000000" height="66.000000" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="27.500000" y="38.500000" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">x</text></g><g id="y"><g class="shape" ><rect x="0.000000" y="166.000000" width="54.000000" height="66.000000" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="27.000000" y="204.500000" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">y</text></g><g id="(x -&gt; y)[0]"><marker id="mk-3488378134" markerWidth="10.000000" markerHeight="12.000000" refX="7.000000" refY="6.000000" viewBox="0.000000 0.000000 10.000000 12.000000" orient="auto" markerUnits="userSpaceOnUse"> <polygon points="0.000000,0.000000 10.000000,6.000000 0.000000,12.000000" class="connection fill-B1" stroke-width="2" /> </marker><path d="M 22.761710 67.985754 C 18.200001 106.000000 18.200001 126.000000 22.523419 162.028493" fill="none" class="connection stroke-B1" style="stroke-width:2;" marker-end="url(#mk-3488378134)" mask="url(#d2-2808374517)" /></g><g id="(y -&gt; x)[0]"><path d="M 31.238290 164.014246 C 35.799999 126.000000 35.799999 106.000000 31.476581 69.971507" fill="none" class="connection stroke-B1" style="stroke-width:2;" marker-end="url(#mk-3488378134)" mask="url(#d2-2808374517)" /></g><mask id="d2-2808374517" maskUnits="userSpaceOnUse" x="-101" y="-101" width="256" height="434">
+		.d2-2808374517 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]></style><g id="x"><g class="shape" ><rect x="1.000000" y="0.000000" width="53.000000" height="66.000000" stroke="#0D32B2" fill="#F7F8FE" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="27.500000" y="38.500000" fill="#0A0F25" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">x</text></g><g id="y"><g class="shape" ><rect x="0.000000" y="166.000000" width="54.000000" height="66.000000" stroke="#0D32B2" fill="#F7F8FE" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="27.000000" y="204.500000" fill="#0A0F25" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">y</text></g><g id="(x -&gt; y)[0]"><marker id="mk-3488378134" markerWidth="10.000000" markerHeight="12.000000" refX="7.000000" refY="6.000000" viewBox="0.000000 0.000000 10.000000 12.000000" orient="auto" markerUnits="userSpaceOnUse"> <polygon points="0.000000,0.000000 10.000000,6.000000 0.000000,12.000000" fill="#0D32B2" class="connection fill-B1" stroke-width="2" /> </marker><path d="M 22.761710 67.985754 C 18.200001 106.000000 18.200001 126.000000 22.523419 162.028493" stroke="#0D32B2" fill="none" class="connection stroke-B1" style="stroke-width:2;" marker-end="url(#mk-3488378134)" mask="url(#d2-2808374517)" /></g><g id="(y -&gt; x)[0]"><path d="M 31.238290 164.014246 C 35.799999 126.000000 35.799999 106.000000 31.476581 69.971507" stroke="#0D32B2" fill="none" class="connection stroke-B1" style="stroke-width:2;" marker-end="url(#mk-3488378134)" mask="url(#d2-2808374517)" /></g><mask id="d2-2808374517" maskUnits="userSpaceOnUse" x="-101" y="-101" width="256" height="434">
->>>>>>> 33280fed5 (fixed e2e tests)
 <rect x="-101" y="-101" width="256" height="434" fill="white"></rect>
 <rect x="23.500000" y="22.500000" width="8" height="21" fill="rgba(0,0,0,0.75)"></rect>
 <rect x="22.500000" y="188.500000" width="9" height="21" fill="rgba(0,0,0,0.75)"></rect>

e2etests-cli/testdata/TestCLI_E2E/sequence-layer/index.exp.svg

@@ -1,16 +1,6 @@
-<<<<<<< HEAD
+<?xml version="1.0" encoding="utf-8"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" d2Version="v0.6.8-HEAD" preserveAspectRatio="xMinYMin meet" viewBox="0 0 255 268"><svg id="d2-svg" class="d2-875883775" width="255" height="268" viewBox="-101 -101 255 268"><rect x="-101.000000" y="-101.000000" width="255.000000" height="268.000000" rx="0.000000" fill="#FFFFFF" class=" fill-N7" stroke-width="0" /><style type="text/css"><![CDATA[
-<?xml version="1.0" encoding="utf-8"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" d2Version="v0.6.8-HEAD" preserveAspectRatio="xMinYMin meet" viewBox="0 0 255 268"><svg id="d2-svg" class="d2-1573652205" width="255" height="268" viewBox="-101 -101 255 268"><rect x="-101.000000" y="-101.000000" width="255.000000" height="268.000000" rx="0.000000" fill="#FFFFFF" class=" fill-N7" stroke-width="0" /><style type="text/css"><![CDATA[
-.d2-1573652205 .text-bold {
-	font-family: "d2-1573652205-font-bold";
-||||||| parent of cb2f2823c (Fix changes)
-<?xml version="1.0" encoding="utf-8"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" d2Version="v0.6.6-HEAD" preserveAspectRatio="xMinYMin meet" viewBox="0 0 255 268"><svg id="d2-svg" class="d2-1573652205" width="255" height="268" viewBox="-101 -101 255 268"><rect x="-101.000000" y="-101.000000" width="255.000000" height="268.000000" rx="0.000000" class=" fill-N7" stroke-width="0" /><style type="text/css"><![CDATA[
-.d2-1573652205 .text-bold {
-	font-family: "d2-1573652205-font-bold";
-=======
-<?xml version="1.0" encoding="utf-8"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" d2Version="v0.6.6-HEAD" preserveAspectRatio="xMinYMin meet" viewBox="0 0 255 268"><svg id="d2-svg" class="d2-875883775" width="255" height="268" viewBox="-101 -101 255 268"><rect x="-101.000000" y="-101.000000" width="255.000000" height="268.000000" rx="0.000000" class=" fill-N7" stroke-width="0" /><style type="text/css"><![CDATA[
 .d2-875883775 .text-bold {
 	font-family: "d2-875883775-font-bold";
->>>>>>> cb2f2823c (Fix changes)
 }
 @font-face {
 	font-family: d2-875883775-font-bold;
@@ -28,153 +18,6 @@
   opacity: 0.5;
 }
 
-<<<<<<< HEAD
-		.d2-1573652205 .fill-N1{fill:#0A0F25;}
-		.d2-1573652205 .fill-N2{fill:#676C7E;}
-		.d2-1573652205 .fill-N3{fill:#9499AB;}
-		.d2-1573652205 .fill-N4{fill:#CFD2DD;}
-		.d2-1573652205 .fill-N5{fill:#DEE1EB;}
-		.d2-1573652205 .fill-N6{fill:#EEF1F8;}
-		.d2-1573652205 .fill-N7{fill:#FFFFFF;}
-		.d2-1573652205 .fill-B1{fill:#0D32B2;}
-		.d2-1573652205 .fill-B2{fill:#0D32B2;}
-		.d2-1573652205 .fill-B3{fill:#E3E9FD;}
-		.d2-1573652205 .fill-B4{fill:#E3E9FD;}
-		.d2-1573652205 .fill-B5{fill:#EDF0FD;}
-		.d2-1573652205 .fill-B6{fill:#F7F8FE;}
-		.d2-1573652205 .fill-AA2{fill:#4A6FF3;}
-		.d2-1573652205 .fill-AA4{fill:#EDF0FD;}
-		.d2-1573652205 .fill-AA5{fill:#F7F8FE;}
-		.d2-1573652205 .fill-AB4{fill:#EDF0FD;}
-		.d2-1573652205 .fill-AB5{fill:#F7F8FE;}
-		.d2-1573652205 .stroke-N1{stroke:#0A0F25;}
-		.d2-1573652205 .stroke-N2{stroke:#676C7E;}
-		.d2-1573652205 .stroke-N3{stroke:#9499AB;}
-		.d2-1573652205 .stroke-N4{stroke:#CFD2DD;}
-		.d2-1573652205 .stroke-N5{stroke:#DEE1EB;}
-		.d2-1573652205 .stroke-N6{stroke:#EEF1F8;}
-		.d2-1573652205 .stroke-N7{stroke:#FFFFFF;}
-		.d2-1573652205 .stroke-B1{stroke:#0D32B2;}
-		.d2-1573652205 .stroke-B2{stroke:#0D32B2;}
-		.d2-1573652205 .stroke-B3{stroke:#E3E9FD;}
-		.d2-1573652205 .stroke-B4{stroke:#E3E9FD;}
-		.d2-1573652205 .stroke-B5{stroke:#EDF0FD;}
-		.d2-1573652205 .stroke-B6{stroke:#F7F8FE;}
-		.d2-1573652205 .stroke-AA2{stroke:#4A6FF3;}
-		.d2-1573652205 .stroke-AA4{stroke:#EDF0FD;}
-		.d2-1573652205 .stroke-AA5{stroke:#F7F8FE;}
-		.d2-1573652205 .stroke-AB4{stroke:#EDF0FD;}
-		.d2-1573652205 .stroke-AB5{stroke:#F7F8FE;}
-		.d2-1573652205 .background-color-N1{background-color:#0A0F25;}
-		.d2-1573652205 .background-color-N2{background-color:#676C7E;}
-		.d2-1573652205 .background-color-N3{background-color:#9499AB;}
-		.d2-1573652205 .background-color-N4{background-color:#CFD2DD;}
-		.d2-1573652205 .background-color-N5{background-color:#DEE1EB;}
-		.d2-1573652205 .background-color-N6{background-color:#EEF1F8;}
-		.d2-1573652205 .background-color-N7{background-color:#FFFFFF;}
-		.d2-1573652205 .background-color-B1{background-color:#0D32B2;}
-		.d2-1573652205 .background-color-B2{background-color:#0D32B2;}
-		.d2-1573652205 .background-color-B3{background-color:#E3E9FD;}
-		.d2-1573652205 .background-color-B4{background-color:#E3E9FD;}
-		.d2-1573652205 .background-color-B5{background-color:#EDF0FD;}
-		.d2-1573652205 .background-color-B6{background-color:#F7F8FE;}
-		.d2-1573652205 .background-color-AA2{background-color:#4A6FF3;}
-		.d2-1573652205 .background-color-AA4{background-color:#EDF0FD;}
-		.d2-1573652205 .background-color-AA5{background-color:#F7F8FE;}
-		.d2-1573652205 .background-color-AB4{background-color:#EDF0FD;}
-		.d2-1573652205 .background-color-AB5{background-color:#F7F8FE;}
-		.d2-1573652205 .color-N1{color:#0A0F25;}
-		.d2-1573652205 .color-N2{color:#676C7E;}
-		.d2-1573652205 .color-N3{color:#9499AB;}
-		.d2-1573652205 .color-N4{color:#CFD2DD;}
-		.d2-1573652205 .color-N5{color:#DEE1EB;}
-		.d2-1573652205 .color-N6{color:#EEF1F8;}
-		.d2-1573652205 .color-N7{color:#FFFFFF;}
-		.d2-1573652205 .color-B1{color:#0D32B2;}
-		.d2-1573652205 .color-B2{color:#0D32B2;}
-		.d2-1573652205 .color-B3{color:#E3E9FD;}
-		.d2-1573652205 .color-B4{color:#E3E9FD;}
-		.d2-1573652205 .color-B5{color:#EDF0FD;}
-		.d2-1573652205 .color-B6{color:#F7F8FE;}
-		.d2-1573652205 .color-AA2{color:#4A6FF3;}
-		.d2-1573652205 .color-AA4{color:#EDF0FD;}
-		.d2-1573652205 .color-AA5{color:#F7F8FE;}
-		.d2-1573652205 .color-AB4{color:#EDF0FD;}
-		.d2-1573652205 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]></style><g id="k"><g class="shape" ><rect x="0.000000" y="0.000000" width="53.000000" height="66.000000" stroke="#0D32B2" fill="#F7F8FE" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="26.500000" y="38.500000" fill="#0A0F25" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">k</text></g><mask id="d2-1573652205" maskUnits="userSpaceOnUse" x="-101" y="-101" width="255" height="268">
-||||||| parent of cb2f2823c (Fix changes)
-		.d2-1573652205 .fill-N1{fill:#0A0F25;}
-		.d2-1573652205 .fill-N2{fill:#676C7E;}
-		.d2-1573652205 .fill-N3{fill:#9499AB;}
-		.d2-1573652205 .fill-N4{fill:#CFD2DD;}
-		.d2-1573652205 .fill-N5{fill:#DEE1EB;}
-		.d2-1573652205 .fill-N6{fill:#EEF1F8;}
-		.d2-1573652205 .fill-N7{fill:#FFFFFF;}
-		.d2-1573652205 .fill-B1{fill:#0D32B2;}
-		.d2-1573652205 .fill-B2{fill:#0D32B2;}
-		.d2-1573652205 .fill-B3{fill:#E3E9FD;}
-		.d2-1573652205 .fill-B4{fill:#E3E9FD;}
-		.d2-1573652205 .fill-B5{fill:#EDF0FD;}
-		.d2-1573652205 .fill-B6{fill:#F7F8FE;}
-		.d2-1573652205 .fill-AA2{fill:#4A6FF3;}
-		.d2-1573652205 .fill-AA4{fill:#EDF0FD;}
-		.d2-1573652205 .fill-AA5{fill:#F7F8FE;}
-		.d2-1573652205 .fill-AB4{fill:#EDF0FD;}
-		.d2-1573652205 .fill-AB5{fill:#F7F8FE;}
-		.d2-1573652205 .stroke-N1{stroke:#0A0F25;}
-		.d2-1573652205 .stroke-N2{stroke:#676C7E;}
-		.d2-1573652205 .stroke-N3{stroke:#9499AB;}
-		.d2-1573652205 .stroke-N4{stroke:#CFD2DD;}
-		.d2-1573652205 .stroke-N5{stroke:#DEE1EB;}
-		.d2-1573652205 .stroke-N6{stroke:#EEF1F8;}
-		.d2-1573652205 .stroke-N7{stroke:#FFFFFF;}
-		.d2-1573652205 .stroke-B1{stroke:#0D32B2;}
-		.d2-1573652205 .stroke-B2{stroke:#0D32B2;}
-		.d2-1573652205 .stroke-B3{stroke:#E3E9FD;}
-		.d2-1573652205 .stroke-B4{stroke:#E3E9FD;}
-		.d2-1573652205 .stroke-B5{stroke:#EDF0FD;}
-		.d2-1573652205 .stroke-B6{stroke:#F7F8FE;}
-		.d2-1573652205 .stroke-AA2{stroke:#4A6FF3;}
-		.d2-1573652205 .stroke-AA4{stroke:#EDF0FD;}
-		.d2-1573652205 .stroke-AA5{stroke:#F7F8FE;}
-		.d2-1573652205 .stroke-AB4{stroke:#EDF0FD;}
-		.d2-1573652205 .stroke-AB5{stroke:#F7F8FE;}
-		.d2-1573652205 .background-color-N1{background-color:#0A0F25;}
-		.d2-1573652205 .background-color-N2{background-color:#676C7E;}
-		.d2-1573652205 .background-color-N3{background-color:#9499AB;}
-		.d2-1573652205 .background-color-N4{background-color:#CFD2DD;}
-		.d2-1573652205 .background-color-N5{background-color:#DEE1EB;}
-		.d2-1573652205 .background-color-N6{background-color:#EEF1F8;}
-		.d2-1573652205 .background-color-N7{background-color:#FFFFFF;}
-		.d2-1573652205 .background-color-B1{background-color:#0D32B2;}
-		.d2-1573652205 .background-color-B2{background-color:#0D32B2;}
-		.d2-1573652205 .background-color-B3{background-color:#E3E9FD;}
-		.d2-1573652205 .background-color-B4{background-color:#E3E9FD;}
-		.d2-1573652205 .background-color-B5{background-color:#EDF0FD;}
-		.d2-1573652205 .background-color-B6{background-color:#F7F8FE;}
-		.d2-1573652205 .background-color-AA2{background-color:#4A6FF3;}
-		.d2-1573652205 .background-color-AA4{background-color:#EDF0FD;}
-		.d2-1573652205 .background-color-AA5{background-color:#F7F8FE;}
-		.d2-1573652205 .background-color-AB4{background-color:#EDF0FD;}
-		.d2-1573652205 .background-color-AB5{background-color:#F7F8FE;}
-		.d2-1573652205 .color-N1{color:#0A0F25;}
-		.d2-1573652205 .color-N2{color:#676C7E;}
-		.d2-1573652205 .color-N3{color:#9499AB;}
-		.d2-1573652205 .color-N4{color:#CFD2DD;}
-		.d2-1573652205 .color-N5{color:#DEE1EB;}
-		.d2-1573652205 .color-N6{color:#EEF1F8;}
-		.d2-1573652205 .color-N7{color:#FFFFFF;}
-		.d2-1573652205 .color-B1{color:#0D32B2;}
-		.d2-1573652205 .color-B2{color:#0D32B2;}
-		.d2-1573652205 .color-B3{color:#E3E9FD;}
-		.d2-1573652205 .color-B4{color:#E3E9FD;}
-		.d2-1573652205 .color-B5{color:#EDF0FD;}
-		.d2-1573652205 .color-B6{color:#F7F8FE;}
-		.d2-1573652205 .color-AA2{color:#4A6FF3;}
-		.d2-1573652205 .color-AA4{color:#EDF0FD;}
-		.d2-1573652205 .color-AA5{color:#F7F8FE;}
-		.d2-1573652205 .color-AB4{color:#EDF0FD;}
-		.d2-1573652205 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]></style><g id="k"><g class="shape" ><rect x="0.000000" y="0.000000" width="53.000000" height="66.000000" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="26.500000" y="38.500000" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">k</text></g><mask id="d2-1573652205" maskUnits="userSpaceOnUse" x="-101" y="-101" width="255" height="268">
-=======
 		.d2-875883775 .fill-N1{fill:#0A0F25;}
 		.d2-875883775 .fill-N2{fill:#676C7E;}
 		.d2-875883775 .fill-N3{fill:#9499AB;}
@@ -246,8 +89,7 @@
 		.d2-875883775 .color-AA4{color:#EDF0FD;}
 		.d2-875883775 .color-AA5{color:#F7F8FE;}
 		.d2-875883775 .color-AB4{color:#EDF0FD;}
-		.d2-875883775 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]></style><g id="k"><g class="shape" ><rect x="0.000000" y="0.000000" width="53.000000" height="66.000000" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="26.500000" y="38.500000" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">k</text></g><mask id="d2-875883775" maskUnits="userSpaceOnUse" x="-101" y="-101" width="255" height="268">
+		.d2-875883775 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]></style><g id="k"><g class="shape" ><rect x="0.000000" y="0.000000" width="53.000000" height="66.000000" stroke="#0D32B2" fill="#F7F8FE" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="26.500000" y="38.500000" fill="#0A0F25" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">k</text></g><mask id="d2-875883775" maskUnits="userSpaceOnUse" x="-101" y="-101" width="255" height="268">
->>>>>>> cb2f2823c (Fix changes)
 <rect x="-101" y="-101" width="255" height="268" fill="white"></rect>
 <rect x="22.500000" y="22.500000" width="8" height="21" fill="rgba(0,0,0,0.75)"></rect>
 </mask></svg></svg>

e2etests-cli/testdata/TestCLI_E2E/sequence-spread-layer/index.exp.svg

@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="utf-8"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" d2Version="v0.6.8-HEAD" preserveAspectRatio="xMinYMin meet" viewBox="0 0 255 268"><svg id="d2-svg" class="d2-1573652205" width="255" height="268" viewBox="-101 -101 255 268"><rect x="-101.000000" y="-101.000000" width="255.000000" height="268.000000" rx="0.000000" fill="#FFFFFF" class=" fill-N7" stroke-width="0" /><style type="text/css"><![CDATA[
+<?xml version="1.0" encoding="utf-8"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" d2Version="v0.6.8-HEAD" preserveAspectRatio="xMinYMin meet" viewBox="0 0 255 268"><svg id="d2-svg" class="d2-875883775" width="255" height="268" viewBox="-101 -101 255 268"><rect x="-101.000000" y="-101.000000" width="255.000000" height="268.000000" rx="0.000000" fill="#FFFFFF" class=" fill-N7" stroke-width="0" /><style type="text/css"><![CDATA[
-.d2-1573652205 .text-bold {
+.d2-875883775 .text-bold {
-	font-family: "d2-1573652205-font-bold";
+	font-family: "d2-875883775-font-bold";
 }
 @font-face {
-	font-family: d2-1573652205-font-bold;
+	font-family: d2-875883775-font-bold;
 	src: url("data:application/font-woff;base64,d09GRgABAAAAAAXgAAoAAAAACpwAAguFAAAAAAAAAAAAAAAAAAAAAAAAAABPUy8yAAAA9AAAAGAAAABgXxHXrmNtYXAAAAFUAAAAMAAAADAADQCiZ2x5ZgAAAYQAAACIAAAAiGZGz+xoZWFkAAACDAAAADYAAAA2G38e1GhoZWEAAAJEAAAAJAAAACQKfwXBaG10eAAAAmgAAAAIAAAACATWAJFsb2NhAAACcAAAAAYAAAAGAEQALG1heHAAAAJ4AAAAIAAAACAAGgD3bmFtZQAAApgAAAMoAAAIKgjwVkFwb3N0AAAFwAAAAB0AAAAg/9EAMgADAioCvAAFAAACigJYAAAASwKKAlgAAAFeADIBKQAAAgsHAwMEAwICBGAAAvcAAAADAAAAAAAAAABBREJPACAAIP//Au7/BgAAA9gBESAAAZ8AAAAAAfAClAAAACAAAwAAAAEAAwABAAAADAAEACQAAAAEAAQAAQAAAGv//wAAAGv///+WAAEAAAAAAAEAAAAFAFAAAAJiApQAAwAJAA8AEgAVAAAzESERJTMnJyMHNzM3NyMXAzcnAREHUAIS/qWkJykEKSkEKiCYH3pfXwFNXgKU/WxbTWJi9l87O/6eubr+jQFzugAAAQBBAAACHgK9AAwAADMRMxEzNzMHEyMnBxVBjwSdoK67n3A/Ar3+bsXM/tzBR3oAAQAAAAILhbLmP1lfDzz1AAED6AAAAADYXaCEAAAAAN1mLzb+N/7ECG0D8QABAAMAAgAAAAAAAAABAAAD2P7vAAAImP43/jcIbQABAAAAAAAAAAAAAAAAAAAAAgKyAFACJABBAAAALABEAAAAAQAAAAIAkAAMAGMABwABAAAAAAAAAAAAAAAAAAQAA3icnJTPbhtVFMZ/TmzTCsECRVW6ie6CRZHo2FRJ1TYrh9SKRRQHjwtCQkgTz/iPMp4ZeSYO4QlY8xa8RVc8BM+BWKP5fOzYBdEmipJ8d+75851zvnOBHf5mm0r1IfBHPTFcYa9+bniLB/UTw9u061uGqzyp/Wm4RlibG67zea1n+CPeVn8z/ID96k+GH7JbbRv+mGfVHcOfbDv+Mvwp+7xd4Aq84FfDFXbJDG+xw4+Gt3mExaxUeUTTcI3P2DNcZw/oM6EgZkLCCMeQCSOumBGR4xMxY8KQiBBHhxYxhb4mBEKO0X9+DfApmBEo4pgCR4xPTEDO2CL+Iq+Uc2Uc6jSzuxYFYwIu5HFJQIIjZURKQsSl4hQUZLyiQYOcgfhmFOR45EyI8UiZMaJBlzan9BkzIcfRVqSSmU/KkIJrAuV3ZlF2ZkBEQm6srkgIxdOJXyTvDqc4umSyXY98uhHhSxzfybvklsr2Kzz9ujVmm3mXbALm6mesrsS6udYEx7ot87b4VrjgFe5e/dlk8v4ehfpfKPIFV5p/qEklYpLg3C4tfCnId49xHOncwVdHvqdDnxO6vKGvc4sePVqc0afDa/l26eH4mi5nHMujI7y4a0sxZ/yA4xs6siljR9afxcQifiYzdefiOFMdUzL1vGTuqdZIFd59wuUOpRvqyOUz0B6Vlk7zS7RnASNTRSaGU/VyqY3c+heaIqaqpZzt7X25DXPbveUW35Bqh0u1LjiVk1swet9UvXc0c60fj4CQlAtZDEiZ0qDgRrzPCbgixnGs7p1oSwpaK58yz41UEjEVgw6J4szI9Dcw3fjGfbChe2dvSSj/kunlqqr7ZHHq1e2M3qh7yzvfuhytTaBhU03X1DQQ18S0H2mn1vn78s31uqU85YiUmPBfL8AzPJrsc8AhY2UY6GZur0NTL0STlxyq+ksiWQ2l58giHODxnAMOeMnzd/q4ZOKMi1txWc/d4pgjuhx+UBUL+y5HvF59+/+sv4tpU7U4nq5OL+49xSd3UOsX2rPb97KniZWTmFu02604I2BacnG76zW5x3j/AAAA//8BAAD///S3T1F4nGJgZgCD/+cYjBiwAAAAAAD//wEAAP//LwECAwAAAA==");
 }]]></style><style type="text/css"><![CDATA[.shape {
   shape-rendering: geometricPrecision;
@@ -18,78 +18,78 @@
   opacity: 0.5;
 }
 
-		.d2-1573652205 .fill-N1{fill:#0A0F25;}
+		.d2-875883775 .fill-N1{fill:#0A0F25;}
-		.d2-1573652205 .fill-N2{fill:#676C7E;}
+		.d2-875883775 .fill-N2{fill:#676C7E;}
-		.d2-1573652205 .fill-N3{fill:#9499AB;}
+		.d2-875883775 .fill-N3{fill:#9499AB;}
-		.d2-1573652205 .fill-N4{fill:#CFD2DD;}
+		.d2-875883775 .fill-N4{fill:#CFD2DD;}
-		.d2-1573652205 .fill-N5{fill:#DEE1EB;}
+		.d2-875883775 .fill-N5{fill:#DEE1EB;}
-		.d2-1573652205 .fill-N6{fill:#EEF1F8;}
+		.d2-875883775 .fill-N6{fill:#EEF1F8;}
-		.d2-1573652205 .fill-N7{fill:#FFFFFF;}
+		.d2-875883775 .fill-N7{fill:#FFFFFF;}
-		.d2-1573652205 .fill-B1{fill:#0D32B2;}
+		.d2-875883775 .fill-B1{fill:#0D32B2;}
-		.d2-1573652205 .fill-B2{fill:#0D32B2;}
+		.d2-875883775 .fill-B2{fill:#0D32B2;}
-		.d2-1573652205 .fill-B3{fill:#E3E9FD;}
+		.d2-875883775 .fill-B3{fill:#E3E9FD;}
-		.d2-1573652205 .fill-B4{fill:#E3E9FD;}
+		.d2-875883775 .fill-B4{fill:#E3E9FD;}
-		.d2-1573652205 .fill-B5{fill:#EDF0FD;}
+		.d2-875883775 .fill-B5{fill:#EDF0FD;}
-		.d2-1573652205 .fill-B6{fill:#F7F8FE;}
+		.d2-875883775 .fill-B6{fill:#F7F8FE;}
-		.d2-1573652205 .fill-AA2{fill:#4A6FF3;}
+		.d2-875883775 .fill-AA2{fill:#4A6FF3;}
-		.d2-1573652205 .fill-AA4{fill:#EDF0FD;}
+		.d2-875883775 .fill-AA4{fill:#EDF0FD;}
-		.d2-1573652205 .fill-AA5{fill:#F7F8FE;}
+		.d2-875883775 .fill-AA5{fill:#F7F8FE;}
-		.d2-1573652205 .fill-AB4{fill:#EDF0FD;}
+		.d2-875883775 .fill-AB4{fill:#EDF0FD;}
-		.d2-1573652205 .fill-AB5{fill:#F7F8FE;}
+		.d2-875883775 .fill-AB5{fill:#F7F8FE;}
-		.d2-1573652205 .stroke-N1{stroke:#0A0F25;}
+		.d2-875883775 .stroke-N1{stroke:#0A0F25;}
-		.d2-1573652205 .stroke-N2{stroke:#676C7E;}
+		.d2-875883775 .stroke-N2{stroke:#676C7E;}
-		.d2-1573652205 .stroke-N3{stroke:#9499AB;}
+		.d2-875883775 .stroke-N3{stroke:#9499AB;}
-		.d2-1573652205 .stroke-N4{stroke:#CFD2DD;}
+		.d2-875883775 .stroke-N4{stroke:#CFD2DD;}
-		.d2-1573652205 .stroke-N5{stroke:#DEE1EB;}
+		.d2-875883775 .stroke-N5{stroke:#DEE1EB;}
-		.d2-1573652205 .stroke-N6{stroke:#EEF1F8;}
+		.d2-875883775 .stroke-N6{stroke:#EEF1F8;}
-		.d2-1573652205 .stroke-N7{stroke:#FFFFFF;}
+		.d2-875883775 .stroke-N7{stroke:#FFFFFF;}
-		.d2-1573652205 .stroke-B1{stroke:#0D32B2;}
+		.d2-875883775 .stroke-B1{stroke:#0D32B2;}
-		.d2-1573652205 .stroke-B2{stroke:#0D32B2;}
+		.d2-875883775 .stroke-B2{stroke:#0D32B2;}
-		.d2-1573652205 .stroke-B3{stroke:#E3E9FD;}
+		.d2-875883775 .stroke-B3{stroke:#E3E9FD;}
-		.d2-1573652205 .stroke-B4{stroke:#E3E9FD;}
+		.d2-875883775 .stroke-B4{stroke:#E3E9FD;}
-		.d2-1573652205 .stroke-B5{stroke:#EDF0FD;}
+		.d2-875883775 .stroke-B5{stroke:#EDF0FD;}
-		.d2-1573652205 .stroke-B6{stroke:#F7F8FE;}
+		.d2-875883775 .stroke-B6{stroke:#F7F8FE;}
-		.d2-1573652205 .stroke-AA2{stroke:#4A6FF3;}
+		.d2-875883775 .stroke-AA2{stroke:#4A6FF3;}
-		.d2-1573652205 .stroke-AA4{stroke:#EDF0FD;}
+		.d2-875883775 .stroke-AA4{stroke:#EDF0FD;}
-		.d2-1573652205 .stroke-AA5{stroke:#F7F8FE;}
+		.d2-875883775 .stroke-AA5{stroke:#F7F8FE;}
-		.d2-1573652205 .stroke-AB4{stroke:#EDF0FD;}
+		.d2-875883775 .stroke-AB4{stroke:#EDF0FD;}
-		.d2-1573652205 .stroke-AB5{stroke:#F7F8FE;}
+		.d2-875883775 .stroke-AB5{stroke:#F7F8FE;}
-		.d2-1573652205 .background-color-N1{background-color:#0A0F25;}
+		.d2-875883775 .background-color-N1{background-color:#0A0F25;}
-		.d2-1573652205 .background-color-N2{background-color:#676C7E;}
+		.d2-875883775 .background-color-N2{background-color:#676C7E;}
-		.d2-1573652205 .background-color-N3{background-color:#9499AB;}
+		.d2-875883775 .background-color-N3{background-color:#9499AB;}
-		.d2-1573652205 .background-color-N4{background-color:#CFD2DD;}
+		.d2-875883775 .background-color-N4{background-color:#CFD2DD;}
-		.d2-1573652205 .background-color-N5{background-color:#DEE1EB;}
+		.d2-875883775 .background-color-N5{background-color:#DEE1EB;}
-		.d2-1573652205 .background-color-N6{background-color:#EEF1F8;}
+		.d2-875883775 .background-color-N6{background-color:#EEF1F8;}
-		.d2-1573652205 .background-color-N7{background-color:#FFFFFF;}
+		.d2-875883775 .background-color-N7{background-color:#FFFFFF;}
-		.d2-1573652205 .background-color-B1{background-color:#0D32B2;}
+		.d2-875883775 .background-color-B1{background-color:#0D32B2;}
-		.d2-1573652205 .background-color-B2{background-color:#0D32B2;}
+		.d2-875883775 .background-color-B2{background-color:#0D32B2;}
-		.d2-1573652205 .background-color-B3{background-color:#E3E9FD;}
+		.d2-875883775 .background-color-B3{background-color:#E3E9FD;}
-		.d2-1573652205 .background-color-B4{background-color:#E3E9FD;}
+		.d2-875883775 .background-color-B4{background-color:#E3E9FD;}
-		.d2-1573652205 .background-color-B5{background-color:#EDF0FD;}
+		.d2-875883775 .background-color-B5{background-color:#EDF0FD;}
-		.d2-1573652205 .background-color-B6{background-color:#F7F8FE;}
+		.d2-875883775 .background-color-B6{background-color:#F7F8FE;}
-		.d2-1573652205 .background-color-AA2{background-color:#4A6FF3;}
+		.d2-875883775 .background-color-AA2{background-color:#4A6FF3;}
-		.d2-1573652205 .background-color-AA4{background-color:#EDF0FD;}
+		.d2-875883775 .background-color-AA4{background-color:#EDF0FD;}
-		.d2-1573652205 .background-color-AA5{background-color:#F7F8FE;}
+		.d2-875883775 .background-color-AA5{background-color:#F7F8FE;}
-		.d2-1573652205 .background-color-AB4{background-color:#EDF0FD;}
+		.d2-875883775 .background-color-AB4{background-color:#EDF0FD;}
-		.d2-1573652205 .background-color-AB5{background-color:#F7F8FE;}
+		.d2-875883775 .background-color-AB5{background-color:#F7F8FE;}
-		.d2-1573652205 .color-N1{color:#0A0F25;}
+		.d2-875883775 .color-N1{color:#0A0F25;}
-		.d2-1573652205 .color-N2{color:#676C7E;}
+		.d2-875883775 .color-N2{color:#676C7E;}
-		.d2-1573652205 .color-N3{color:#9499AB;}
+		.d2-875883775 .color-N3{color:#9499AB;}
-		.d2-1573652205 .color-N4{color:#CFD2DD;}
+		.d2-875883775 .color-N4{color:#CFD2DD;}
-		.d2-1573652205 .color-N5{color:#DEE1EB;}
+		.d2-875883775 .color-N5{color:#DEE1EB;}
-		.d2-1573652205 .color-N6{color:#EEF1F8;}
+		.d2-875883775 .color-N6{color:#EEF1F8;}
-		.d2-1573652205 .color-N7{color:#FFFFFF;}
+		.d2-875883775 .color-N7{color:#FFFFFF;}
-		.d2-1573652205 .color-B1{color:#0D32B2;}
+		.d2-875883775 .color-B1{color:#0D32B2;}
-		.d2-1573652205 .color-B2{color:#0D32B2;}
+		.d2-875883775 .color-B2{color:#0D32B2;}
-		.d2-1573652205 .color-B3{color:#E3E9FD;}
+		.d2-875883775 .color-B3{color:#E3E9FD;}
-		.d2-1573652205 .color-B4{color:#E3E9FD;}
+		.d2-875883775 .color-B4{color:#E3E9FD;}
-		.d2-1573652205 .color-B5{color:#EDF0FD;}
+		.d2-875883775 .color-B5{color:#EDF0FD;}
-		.d2-1573652205 .color-B6{color:#F7F8FE;}
+		.d2-875883775 .color-B6{color:#F7F8FE;}
-		.d2-1573652205 .color-AA2{color:#4A6FF3;}
+		.d2-875883775 .color-AA2{color:#4A6FF3;}
-		.d2-1573652205 .color-AA4{color:#EDF0FD;}
+		.d2-875883775 .color-AA4{color:#EDF0FD;}
-		.d2-1573652205 .color-AA5{color:#F7F8FE;}
+		.d2-875883775 .color-AA5{color:#F7F8FE;}
-		.d2-1573652205 .color-AB4{color:#EDF0FD;}
+		.d2-875883775 .color-AB4{color:#EDF0FD;}
-		.d2-1573652205 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]></style><g id="k"><g class="shape" ><rect x="0.000000" y="0.000000" width="53.000000" height="66.000000" stroke="#0D32B2" fill="#F7F8FE" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="26.500000" y="38.500000" fill="#0A0F25" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">k</text></g><mask id="d2-1573652205" maskUnits="userSpaceOnUse" x="-101" y="-101" width="255" height="268">
+		.d2-875883775 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]></style><g id="k"><g class="shape" ><rect x="0.000000" y="0.000000" width="53.000000" height="66.000000" stroke="#0D32B2" fill="#F7F8FE" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="26.500000" y="38.500000" fill="#0A0F25" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">k</text></g><mask id="d2-875883775" maskUnits="userSpaceOnUse" x="-101" y="-101" width="255" height="268">
 <rect x="-101" y="-101" width="255" height="268" fill="white"></rect>
 <rect x="22.500000" y="22.500000" width="8" height="21" fill="rgba(0,0,0,0.75)"></rect>
 </mask></svg></svg>

e2etests-cli/testdata/TestCLI_E2E/stdin.exp.svg

@@ -1,26 +1,4 @@
-<<<<<<< HEAD
+<?xml version="1.0" encoding="utf-8"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" d2Version="v0.6.8-HEAD" preserveAspectRatio="xMinYMin meet" viewBox="0 0 256 434"><svg id="d2-svg" class="d2-4198988860" width="256" height="434" viewBox="-101 -101 256 434"><rect x="-101.000000" y="-101.000000" width="256.000000" height="434.000000" rx="0.000000" fill="#FFFFFF" class=" fill-N7" stroke-width="0" /><style type="text/css"><![CDATA[
-<<<<<<< HEAD
-<?xml version="1.0" encoding="utf-8"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" d2Version="v0.6.8-HEAD" preserveAspectRatio="xMinYMin meet" viewBox="0 0 256 434"><svg id="d2-svg" class="d2-1843626214" width="256" height="434" viewBox="-101 -101 256 434"><rect x="-101.000000" y="-101.000000" width="256.000000" height="434.000000" rx="0.000000" fill="#FFFFFF" class=" fill-N7" stroke-width="0" /><style type="text/css"><![CDATA[
-||||||| parent of 33280fed5 (fixed e2e tests)
-<?xml version="1.0" encoding="utf-8"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" d2Version="v0.6.6-HEAD" preserveAspectRatio="xMinYMin meet" viewBox="0 0 256 434"><svg id="d2-svg" class="d2-1843626214" width="256" height="434" viewBox="-101 -101 256 434"><rect x="-101.000000" y="-101.000000" width="256.000000" height="434.000000" rx="0.000000" class=" fill-N7" stroke-width="0" /><style type="text/css"><![CDATA[
-=======
-<<<<<<< HEAD
-<?xml version="1.0" encoding="utf-8"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" d2Version="v0.6.6-HEAD" preserveAspectRatio="xMinYMin meet" viewBox="0 0 256 434"><svg id="d2-svg" class="d2-1843626214" width="256" height="434" viewBox="-101 -101 256 434"><rect x="-101.000000" y="-101.000000" width="256.000000" height="434.000000" rx="0.000000" class=" fill-N7" stroke-width="0" /><style type="text/css"><![CDATA[
->>>>>>> 33280fed5 (fixed e2e tests)
-.d2-1843626214 .text-bold {
-	font-family: "d2-1843626214-font-bold";
-=======
-<?xml version="1.0" encoding="utf-8"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" d2Version="v0.6.5-HEAD" preserveAspectRatio="xMinYMin meet" viewBox="0 0 256 434"><svg id="d2-svg" class="d2-4198988860" width="256" height="434" viewBox="-101 -101 256 434"><rect x="-101.000000" y="-101.000000" width="256.000000" height="434.000000" rx="0.000000" class=" fill-N7" stroke-width="0" /><style type="text/css"><![CDATA[
-||||||| parent of cb2f2823c (Fix changes)
-<<<<<<< HEAD
-<?xml version="1.0" encoding="utf-8"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" d2Version="v0.6.6-HEAD" preserveAspectRatio="xMinYMin meet" viewBox="0 0 256 434"><svg id="d2-svg" class="d2-1843626214" width="256" height="434" viewBox="-101 -101 256 434"><rect x="-101.000000" y="-101.000000" width="256.000000" height="434.000000" rx="0.000000" class=" fill-N7" stroke-width="0" /><style type="text/css"><![CDATA[
-.d2-1843626214 .text-bold {
-	font-family: "d2-1843626214-font-bold";
-=======
-<?xml version="1.0" encoding="utf-8"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" d2Version="v0.6.5-HEAD" preserveAspectRatio="xMinYMin meet" viewBox="0 0 256 434"><svg id="d2-svg" class="d2-4198988860" width="256" height="434" viewBox="-101 -101 256 434"><rect x="-101.000000" y="-101.000000" width="256.000000" height="434.000000" rx="0.000000" class=" fill-N7" stroke-width="0" /><style type="text/css"><![CDATA[
-=======
-<?xml version="1.0" encoding="utf-8"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" d2Version="v0.6.6-HEAD" preserveAspectRatio="xMinYMin meet" viewBox="0 0 256 434"><svg id="d2-svg" class="d2-4198988860" width="256" height="434" viewBox="-101 -101 256 434"><rect x="-101.000000" y="-101.000000" width="256.000000" height="434.000000" rx="0.000000" class=" fill-N7" stroke-width="0" /><style type="text/css"><![CDATA[
->>>>>>> cb2f2823c (Fix changes)
 .d2-4198988860 .text-bold {
 	font-family: "d2-4198988860-font-bold";
 }
@@ -40,153 +18,6 @@
   opacity: 0.5;
 }
 
-<<<<<<< HEAD
-		.d2-1843626214 .fill-N1{fill:#0A0F25;}
-		.d2-1843626214 .fill-N2{fill:#676C7E;}
-		.d2-1843626214 .fill-N3{fill:#9499AB;}
-		.d2-1843626214 .fill-N4{fill:#CFD2DD;}
-		.d2-1843626214 .fill-N5{fill:#DEE1EB;}
-		.d2-1843626214 .fill-N6{fill:#EEF1F8;}
-		.d2-1843626214 .fill-N7{fill:#FFFFFF;}
-		.d2-1843626214 .fill-B1{fill:#0D32B2;}
-		.d2-1843626214 .fill-B2{fill:#0D32B2;}
-		.d2-1843626214 .fill-B3{fill:#E3E9FD;}
-		.d2-1843626214 .fill-B4{fill:#E3E9FD;}
-		.d2-1843626214 .fill-B5{fill:#EDF0FD;}
-		.d2-1843626214 .fill-B6{fill:#F7F8FE;}
-		.d2-1843626214 .fill-AA2{fill:#4A6FF3;}
-		.d2-1843626214 .fill-AA4{fill:#EDF0FD;}
-		.d2-1843626214 .fill-AA5{fill:#F7F8FE;}
-		.d2-1843626214 .fill-AB4{fill:#EDF0FD;}
-		.d2-1843626214 .fill-AB5{fill:#F7F8FE;}
-		.d2-1843626214 .stroke-N1{stroke:#0A0F25;}
-		.d2-1843626214 .stroke-N2{stroke:#676C7E;}
-		.d2-1843626214 .stroke-N3{stroke:#9499AB;}
-		.d2-1843626214 .stroke-N4{stroke:#CFD2DD;}
-		.d2-1843626214 .stroke-N5{stroke:#DEE1EB;}
-		.d2-1843626214 .stroke-N6{stroke:#EEF1F8;}
-		.d2-1843626214 .stroke-N7{stroke:#FFFFFF;}
-		.d2-1843626214 .stroke-B1{stroke:#0D32B2;}
-		.d2-1843626214 .stroke-B2{stroke:#0D32B2;}
-		.d2-1843626214 .stroke-B3{stroke:#E3E9FD;}
-		.d2-1843626214 .stroke-B4{stroke:#E3E9FD;}
-		.d2-1843626214 .stroke-B5{stroke:#EDF0FD;}
-		.d2-1843626214 .stroke-B6{stroke:#F7F8FE;}
-		.d2-1843626214 .stroke-AA2{stroke:#4A6FF3;}
-		.d2-1843626214 .stroke-AA4{stroke:#EDF0FD;}
-		.d2-1843626214 .stroke-AA5{stroke:#F7F8FE;}
-		.d2-1843626214 .stroke-AB4{stroke:#EDF0FD;}
-		.d2-1843626214 .stroke-AB5{stroke:#F7F8FE;}
-		.d2-1843626214 .background-color-N1{background-color:#0A0F25;}
-		.d2-1843626214 .background-color-N2{background-color:#676C7E;}
-		.d2-1843626214 .background-color-N3{background-color:#9499AB;}
-		.d2-1843626214 .background-color-N4{background-color:#CFD2DD;}
-		.d2-1843626214 .background-color-N5{background-color:#DEE1EB;}
-		.d2-1843626214 .background-color-N6{background-color:#EEF1F8;}
-		.d2-1843626214 .background-color-N7{background-color:#FFFFFF;}
-		.d2-1843626214 .background-color-B1{background-color:#0D32B2;}
-		.d2-1843626214 .background-color-B2{background-color:#0D32B2;}
-		.d2-1843626214 .background-color-B3{background-color:#E3E9FD;}
-		.d2-1843626214 .background-color-B4{background-color:#E3E9FD;}
-		.d2-1843626214 .background-color-B5{background-color:#EDF0FD;}
-		.d2-1843626214 .background-color-B6{background-color:#F7F8FE;}
-		.d2-1843626214 .background-color-AA2{background-color:#4A6FF3;}
-		.d2-1843626214 .background-color-AA4{background-color:#EDF0FD;}
-		.d2-1843626214 .background-color-AA5{background-color:#F7F8FE;}
-		.d2-1843626214 .background-color-AB4{background-color:#EDF0FD;}
-		.d2-1843626214 .background-color-AB5{background-color:#F7F8FE;}
-		.d2-1843626214 .color-N1{color:#0A0F25;}
-		.d2-1843626214 .color-N2{color:#676C7E;}
-		.d2-1843626214 .color-N3{color:#9499AB;}
-		.d2-1843626214 .color-N4{color:#CFD2DD;}
-		.d2-1843626214 .color-N5{color:#DEE1EB;}
-		.d2-1843626214 .color-N6{color:#EEF1F8;}
-		.d2-1843626214 .color-N7{color:#FFFFFF;}
-		.d2-1843626214 .color-B1{color:#0D32B2;}
-		.d2-1843626214 .color-B2{color:#0D32B2;}
-		.d2-1843626214 .color-B3{color:#E3E9FD;}
-		.d2-1843626214 .color-B4{color:#E3E9FD;}
-		.d2-1843626214 .color-B5{color:#EDF0FD;}
-		.d2-1843626214 .color-B6{color:#F7F8FE;}
-		.d2-1843626214 .color-AA2{color:#4A6FF3;}
-		.d2-1843626214 .color-AA4{color:#EDF0FD;}
-		.d2-1843626214 .color-AA5{color:#F7F8FE;}
-		.d2-1843626214 .color-AB4{color:#EDF0FD;}
-		.d2-1843626214 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]></style><g id="x"><g class="shape" ><rect x="1.000000" y="0.000000" width="53.000000" height="66.000000" stroke="#0D32B2" fill="#F7F8FE" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="27.500000" y="38.500000" fill="#0A0F25" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">x</text></g><g id="y"><g class="shape" ><rect x="0.000000" y="166.000000" width="54.000000" height="66.000000" stroke="#0D32B2" fill="#F7F8FE" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="27.000000" y="204.500000" fill="#0A0F25" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">y</text></g><g id="(x -&gt; y)[0]"><marker id="mk-3488378134" markerWidth="10.000000" markerHeight="12.000000" refX="7.000000" refY="6.000000" viewBox="0.000000 0.000000 10.000000 12.000000" orient="auto" markerUnits="userSpaceOnUse"> <polygon points="0.000000,0.000000 10.000000,6.000000 0.000000,12.000000" fill="#0D32B2" class="connection fill-B1" stroke-width="2" /> </marker><path d="M 27.000000 68.000000 C 27.000000 106.000000 27.000000 126.000000 27.000000 162.000000" stroke="#0D32B2" fill="none" class="connection stroke-B1" style="stroke-width:2;" marker-end="url(#mk-3488378134)" mask="url(#d2-1843626214)" /></g><mask id="d2-1843626214" maskUnits="userSpaceOnUse" x="-101" y="-101" width="256" height="434">
-||||||| parent of 33280fed5 (fixed e2e tests)
-		.d2-1843626214 .fill-N1{fill:#0A0F25;}
-		.d2-1843626214 .fill-N2{fill:#676C7E;}
-		.d2-1843626214 .fill-N3{fill:#9499AB;}
-		.d2-1843626214 .fill-N4{fill:#CFD2DD;}
-		.d2-1843626214 .fill-N5{fill:#DEE1EB;}
-		.d2-1843626214 .fill-N6{fill:#EEF1F8;}
-		.d2-1843626214 .fill-N7{fill:#FFFFFF;}
-		.d2-1843626214 .fill-B1{fill:#0D32B2;}
-		.d2-1843626214 .fill-B2{fill:#0D32B2;}
-		.d2-1843626214 .fill-B3{fill:#E3E9FD;}
-		.d2-1843626214 .fill-B4{fill:#E3E9FD;}
-		.d2-1843626214 .fill-B5{fill:#EDF0FD;}
-		.d2-1843626214 .fill-B6{fill:#F7F8FE;}
-		.d2-1843626214 .fill-AA2{fill:#4A6FF3;}
-		.d2-1843626214 .fill-AA4{fill:#EDF0FD;}
-		.d2-1843626214 .fill-AA5{fill:#F7F8FE;}
-		.d2-1843626214 .fill-AB4{fill:#EDF0FD;}
-		.d2-1843626214 .fill-AB5{fill:#F7F8FE;}
-		.d2-1843626214 .stroke-N1{stroke:#0A0F25;}
-		.d2-1843626214 .stroke-N2{stroke:#676C7E;}
-		.d2-1843626214 .stroke-N3{stroke:#9499AB;}
-		.d2-1843626214 .stroke-N4{stroke:#CFD2DD;}
-		.d2-1843626214 .stroke-N5{stroke:#DEE1EB;}
-		.d2-1843626214 .stroke-N6{stroke:#EEF1F8;}
-		.d2-1843626214 .stroke-N7{stroke:#FFFFFF;}
-		.d2-1843626214 .stroke-B1{stroke:#0D32B2;}
-		.d2-1843626214 .stroke-B2{stroke:#0D32B2;}
-		.d2-1843626214 .stroke-B3{stroke:#E3E9FD;}
-		.d2-1843626214 .stroke-B4{stroke:#E3E9FD;}
-		.d2-1843626214 .stroke-B5{stroke:#EDF0FD;}
-		.d2-1843626214 .stroke-B6{stroke:#F7F8FE;}
-		.d2-1843626214 .stroke-AA2{stroke:#4A6FF3;}
-		.d2-1843626214 .stroke-AA4{stroke:#EDF0FD;}
-		.d2-1843626214 .stroke-AA5{stroke:#F7F8FE;}
-		.d2-1843626214 .stroke-AB4{stroke:#EDF0FD;}
-		.d2-1843626214 .stroke-AB5{stroke:#F7F8FE;}
-		.d2-1843626214 .background-color-N1{background-color:#0A0F25;}
-		.d2-1843626214 .background-color-N2{background-color:#676C7E;}
-		.d2-1843626214 .background-color-N3{background-color:#9499AB;}
-		.d2-1843626214 .background-color-N4{background-color:#CFD2DD;}
-		.d2-1843626214 .background-color-N5{background-color:#DEE1EB;}
-		.d2-1843626214 .background-color-N6{background-color:#EEF1F8;}
-		.d2-1843626214 .background-color-N7{background-color:#FFFFFF;}
-		.d2-1843626214 .background-color-B1{background-color:#0D32B2;}
-		.d2-1843626214 .background-color-B2{background-color:#0D32B2;}
-		.d2-1843626214 .background-color-B3{background-color:#E3E9FD;}
-		.d2-1843626214 .background-color-B4{background-color:#E3E9FD;}
-		.d2-1843626214 .background-color-B5{background-color:#EDF0FD;}
-		.d2-1843626214 .background-color-B6{background-color:#F7F8FE;}
-		.d2-1843626214 .background-color-AA2{background-color:#4A6FF3;}
-		.d2-1843626214 .background-color-AA4{background-color:#EDF0FD;}
-		.d2-1843626214 .background-color-AA5{background-color:#F7F8FE;}
-		.d2-1843626214 .background-color-AB4{background-color:#EDF0FD;}
-		.d2-1843626214 .background-color-AB5{background-color:#F7F8FE;}
-		.d2-1843626214 .color-N1{color:#0A0F25;}
-		.d2-1843626214 .color-N2{color:#676C7E;}
-		.d2-1843626214 .color-N3{color:#9499AB;}
-		.d2-1843626214 .color-N4{color:#CFD2DD;}
-		.d2-1843626214 .color-N5{color:#DEE1EB;}
-		.d2-1843626214 .color-N6{color:#EEF1F8;}
-		.d2-1843626214 .color-N7{color:#FFFFFF;}
-		.d2-1843626214 .color-B1{color:#0D32B2;}
-		.d2-1843626214 .color-B2{color:#0D32B2;}
-		.d2-1843626214 .color-B3{color:#E3E9FD;}
-		.d2-1843626214 .color-B4{color:#E3E9FD;}
-		.d2-1843626214 .color-B5{color:#EDF0FD;}
-		.d2-1843626214 .color-B6{color:#F7F8FE;}
-		.d2-1843626214 .color-AA2{color:#4A6FF3;}
-		.d2-1843626214 .color-AA4{color:#EDF0FD;}
-		.d2-1843626214 .color-AA5{color:#F7F8FE;}
-		.d2-1843626214 .color-AB4{color:#EDF0FD;}
-		.d2-1843626214 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]></style><g id="x"><g class="shape" ><rect x="1.000000" y="0.000000" width="53.000000" height="66.000000" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="27.500000" y="38.500000" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">x</text></g><g id="y"><g class="shape" ><rect x="0.000000" y="166.000000" width="54.000000" height="66.000000" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="27.000000" y="204.500000" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">y</text></g><g id="(x -&gt; y)[0]"><marker id="mk-3488378134" markerWidth="10.000000" markerHeight="12.000000" refX="7.000000" refY="6.000000" viewBox="0.000000 0.000000 10.000000 12.000000" orient="auto" markerUnits="userSpaceOnUse"> <polygon points="0.000000,0.000000 10.000000,6.000000 0.000000,12.000000" class="connection fill-B1" stroke-width="2" /> </marker><path d="M 27.000000 68.000000 C 27.000000 106.000000 27.000000 126.000000 27.000000 162.000000" fill="none" class="connection stroke-B1" style="stroke-width:2;" marker-end="url(#mk-3488378134)" mask="url(#d2-1843626214)" /></g><mask id="d2-1843626214" maskUnits="userSpaceOnUse" x="-101" y="-101" width="256" height="434">
-=======
 		.d2-4198988860 .fill-N1{fill:#0A0F25;}
 		.d2-4198988860 .fill-N2{fill:#676C7E;}
 		.d2-4198988860 .fill-N3{fill:#9499AB;}
@@ -258,8 +89,7 @@
 		.d2-4198988860 .color-AA4{color:#EDF0FD;}
 		.d2-4198988860 .color-AA5{color:#F7F8FE;}
 		.d2-4198988860 .color-AB4{color:#EDF0FD;}
-		.d2-4198988860 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]></style><g id="x"><g class="shape" ><rect x="1.000000" y="0.000000" width="53.000000" height="66.000000" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="27.500000" y="38.500000" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">x</text></g><g id="y"><g class="shape" ><rect x="0.000000" y="166.000000" width="54.000000" height="66.000000" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="27.000000" y="204.500000" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">y</text></g><g id="(x -&gt; y)[0]"><marker id="mk-3488378134" markerWidth="10.000000" markerHeight="12.000000" refX="7.000000" refY="6.000000" viewBox="0.000000 0.000000 10.000000 12.000000" orient="auto" markerUnits="userSpaceOnUse"> <polygon points="0.000000,0.000000 10.000000,6.000000 0.000000,12.000000" class="connection fill-B1" stroke-width="2" /> </marker><path d="M 27.000000 68.000000 C 27.000000 106.000000 27.000000 126.000000 27.000000 162.000000" fill="none" class="connection stroke-B1" style="stroke-width:2;" marker-end="url(#mk-3488378134)" mask="url(#d2-4198988860)" /></g><mask id="d2-4198988860" maskUnits="userSpaceOnUse" x="-101" y="-101" width="256" height="434">
+		.d2-4198988860 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]></style><g id="x"><g class="shape" ><rect x="1.000000" y="0.000000" width="53.000000" height="66.000000" stroke="#0D32B2" fill="#F7F8FE" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="27.500000" y="38.500000" fill="#0A0F25" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">x</text></g><g id="y"><g class="shape" ><rect x="0.000000" y="166.000000" width="54.000000" height="66.000000" stroke="#0D32B2" fill="#F7F8FE" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="27.000000" y="204.500000" fill="#0A0F25" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">y</text></g><g id="(x -&gt; y)[0]"><marker id="mk-3488378134" markerWidth="10.000000" markerHeight="12.000000" refX="7.000000" refY="6.000000" viewBox="0.000000 0.000000 10.000000 12.000000" orient="auto" markerUnits="userSpaceOnUse"> <polygon points="0.000000,0.000000 10.000000,6.000000 0.000000,12.000000" fill="#0D32B2" class="connection fill-B1" stroke-width="2" /> </marker><path d="M 27.000000 68.000000 C 27.000000 106.000000 27.000000 126.000000 27.000000 162.000000" stroke="#0D32B2" fill="none" class="connection stroke-B1" style="stroke-width:2;" marker-end="url(#mk-3488378134)" mask="url(#d2-4198988860)" /></g><mask id="d2-4198988860" maskUnits="userSpaceOnUse" x="-101" y="-101" width="256" height="434">
->>>>>>> 33280fed5 (fixed e2e tests)
 <rect x="-101" y="-101" width="256" height="434" fill="white"></rect>
 <rect x="23.500000" y="22.500000" width="8" height="21" fill="rgba(0,0,0,0.75)"></rect>
 <rect x="22.500000" y="188.500000" width="9" height="21" fill="rgba(0,0,0,0.75)"></rect>

e2etests-cli/testdata/TestCLI_E2E/vars-animation.exp.svg

@@ -1,28 +1,4 @@
-<<<<<<< HEAD
-<<<<<<< HEAD
 <?xml version="1.0" encoding="utf-8"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" d2Version="v0.6.8-HEAD" preserveAspectRatio="xMinYMin meet" viewBox="0 0 606 665"><svg id="d2-svg" width="606" height="665" viewBox="-246 -166 606 665"><style type="text/css"><![CDATA[
-||||||| parent of 33280fed5 (fixed e2e tests)
-<?xml version="1.0" encoding="utf-8"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" d2Version="v0.6.6-HEAD" preserveAspectRatio="xMinYMin meet" viewBox="0 0 606 665"><svg id="d2-svg" width="606" height="665" viewBox="-246 -166 606 665"><style type="text/css"><![CDATA[
-=======
-<<<<<<< HEAD
-||||||| parent of cb2f2823c (Fix changes)
-<<<<<<< HEAD
-=======
->>>>>>> cb2f2823c (Fix changes)
-<?xml version="1.0" encoding="utf-8"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" d2Version="v0.6.6-HEAD" preserveAspectRatio="xMinYMin meet" viewBox="0 0 606 665"><svg id="d2-svg" width="606" height="665" viewBox="-246 -166 606 665"><style type="text/css"><![CDATA[
-<<<<<<< HEAD
->>>>>>> 33280fed5 (fixed e2e tests)
-.d2-2597568289 .text-mono {
-	font-family: "d2-2597568289-font-mono";
-=======
-<?xml version="1.0" encoding="utf-8"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" d2Version="v0.6.5-HEAD" preserveAspectRatio="xMinYMin meet" viewBox="0 0 606 665"><svg id="d2-svg" width="606" height="665" viewBox="-246 -166 606 665"><style type="text/css"><![CDATA[
-||||||| parent of cb2f2823c (Fix changes)
-.d2-2597568289 .text-mono {
-	font-family: "d2-2597568289-font-mono";
-=======
-<?xml version="1.0" encoding="utf-8"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" d2Version="v0.6.5-HEAD" preserveAspectRatio="xMinYMin meet" viewBox="0 0 606 665"><svg id="d2-svg" width="606" height="665" viewBox="-246 -166 606 665"><style type="text/css"><![CDATA[
-=======
->>>>>>> cb2f2823c (Fix changes)
 .d2-2824756871 .text-mono {
 	font-family: "d2-2824756871-font-mono";
 }
@@ -893,43 +869,19 @@
 		75.000000%, 100.000000% {
 				opacity: 1;
 		}
-<<<<<<< HEAD
+}]]></style><g style="animation: d2Transition-d2-2824756871-0 5600ms infinite"  class="d2-2824756871" width="492" height="247" viewBox="-246 -166 492 247"><rect x="-246.000000" y="-166.000000" width="492.000000" height="247.000000" rx="0.000000" fill="#FFFFFF" class=" fill-N7" stroke-width="0" /><g id="&#34;Chicken&#39;s plan&#34;"><g class="shape" ></g><text x="0.000000" y="-30.000000" fill="#000410" class="text-mono fill-N1" style="text-anchor:middle;font-size:35px">CHICKEN&#39;S PLAN</text></g><mask id="d2-2824756871" maskUnits="userSpaceOnUse" x="-246" y="-166" width="492" height="247">
-}]]></style><g style="animation: d2Transition-d2-2597568289-0 5600ms infinite"  class="d2-2597568289" width="492" height="247" viewBox="-246 -166 492 247"><rect x="-246.000000" y="-166.000000" width="492.000000" height="247.000000" rx="0.000000" fill="#FFFFFF" class=" fill-N7" stroke-width="0" /><g id="&#34;Chicken&#39;s plan&#34;"><g class="shape" ></g><text x="0.000000" y="-30.000000" fill="#000410" class="text-mono fill-N1" style="text-anchor:middle;font-size:35px">CHICKEN&#39;S PLAN</text></g><mask id="d2-2597568289" maskUnits="userSpaceOnUse" x="-246" y="-166" width="492" height="247">
-||||||| parent of 33280fed5 (fixed e2e tests)
-}]]></style><g style="animation: d2Transition-d2-2597568289-0 5600ms infinite"  class="d2-2597568289" width="492" height="247" viewBox="-246 -166 492 247"><rect x="-246.000000" y="-166.000000" width="492.000000" height="247.000000" rx="0.000000" class=" fill-N7" stroke-width="0" /><g id="&#34;Chicken&#39;s plan&#34;"><g class="shape" ></g><text x="0.000000" y="-30.000000" class="text-mono fill-N1" style="text-anchor:middle;font-size:35px">CHICKEN&#39;S PLAN</text></g><mask id="d2-2597568289" maskUnits="userSpaceOnUse" x="-246" y="-166" width="492" height="247">
-=======
-}]]></style><g style="animation: d2Transition-d2-2824756871-0 5600ms infinite"  class="d2-2824756871" width="492" height="247" viewBox="-246 -166 492 247"><rect x="-246.000000" y="-166.000000" width="492.000000" height="247.000000" rx="0.000000" class=" fill-N7" stroke-width="0" /><g id="&#34;Chicken&#39;s plan&#34;"><g class="shape" ></g><text x="0.000000" y="-30.000000" class="text-mono fill-N1" style="text-anchor:middle;font-size:35px">CHICKEN&#39;S PLAN</text></g><mask id="d2-2824756871" maskUnits="userSpaceOnUse" x="-246" y="-166" width="492" height="247">
->>>>>>> 33280fed5 (fixed e2e tests)
 <rect x="-246" y="-166" width="492" height="247" fill="white"></rect>
 <rect x="-145.000000" y="-65.000000" width="290" height="45" fill="rgba(0,0,0,0.75)"></rect>
-<<<<<<< HEAD
+</mask></g><g style="animation: d2Transition-d2-2824756871-1 5600ms infinite"  class="d2-2824756871" width="492" height="333" viewBox="-160 -166 492 333"><rect x="-160.000000" y="-166.000000" width="492.000000" height="333.000000" rx="0.000000" fill="#FFFFFF" class=" fill-N7" stroke-width="0" /><g id="&#34;Chicken&#39;s plan&#34;"><g class="shape" ></g><text x="86.000000" y="-30.000000" fill="#000410" class="text-mono fill-N1" style="text-anchor:middle;font-size:35px">CHICKEN&#39;S PLAN</text></g><g id="Approach road"><g class="shape" ><rect x="0.000000" y="0.000000" width="171.000000" height="66.000000" stroke="#000410" fill="#FFFFFF" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="85.500000" y="38.500000" fill="#000410" class="text-mono-bold fill-N1" style="text-anchor:middle;font-size:16px">APPROACH ROAD</text></g><mask id="d2-837698653" maskUnits="userSpaceOnUse" x="-160" y="-166" width="492" height="333">
-</mask></g><g style="animation: d2Transition-d2-2597568289-1 5600ms infinite"  class="d2-2597568289" width="492" height="333" viewBox="-160 -166 492 333"><rect x="-160.000000" y="-166.000000" width="492.000000" height="333.000000" rx="0.000000" fill="#FFFFFF" class=" fill-N7" stroke-width="0" /><g id="&#34;Chicken&#39;s plan&#34;"><g class="shape" ></g><text x="86.000000" y="-30.000000" fill="#000410" class="text-mono fill-N1" style="text-anchor:middle;font-size:35px">CHICKEN&#39;S PLAN</text></g><g id="Approach road"><g class="shape" ><rect x="0.000000" y="0.000000" width="171.000000" height="66.000000" stroke="#000410" fill="#FFFFFF" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="85.500000" y="38.500000" fill="#000410" class="text-mono-bold fill-N1" style="text-anchor:middle;font-size:16px">APPROACH ROAD</text></g><mask id="d2-837698653" maskUnits="userSpaceOnUse" x="-160" y="-166" width="492" height="333">
-||||||| parent of 33280fed5 (fixed e2e tests)
-</mask></g><g style="animation: d2Transition-d2-2597568289-1 5600ms infinite"  class="d2-2597568289" width="492" height="333" viewBox="-160 -166 492 333"><rect x="-160.000000" y="-166.000000" width="492.000000" height="333.000000" rx="0.000000" class=" fill-N7" stroke-width="0" /><g id="&#34;Chicken&#39;s plan&#34;"><g class="shape" ></g><text x="86.000000" y="-30.000000" class="text-mono fill-N1" style="text-anchor:middle;font-size:35px">CHICKEN&#39;S PLAN</text></g><g id="Approach road"><g class="shape" ><rect x="0.000000" y="0.000000" width="171.000000" height="66.000000" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="85.500000" y="38.500000" class="text-mono-bold fill-N1" style="text-anchor:middle;font-size:16px">APPROACH ROAD</text></g><mask id="d2-837698653" maskUnits="userSpaceOnUse" x="-160" y="-166" width="492" height="333">
-=======
-</mask></g><g style="animation: d2Transition-d2-2824756871-1 5600ms infinite"  class="d2-2824756871" width="492" height="333" viewBox="-160 -166 492 333"><rect x="-160.000000" y="-166.000000" width="492.000000" height="333.000000" rx="0.000000" class=" fill-N7" stroke-width="0" /><g id="&#34;Chicken&#39;s plan&#34;"><g class="shape" ></g><text x="86.000000" y="-30.000000" class="text-mono fill-N1" style="text-anchor:middle;font-size:35px">CHICKEN&#39;S PLAN</text></g><g id="Approach road"><g class="shape" ><rect x="0.000000" y="0.000000" width="171.000000" height="66.000000" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="85.500000" y="38.500000" class="text-mono-bold fill-N1" style="text-anchor:middle;font-size:16px">APPROACH ROAD</text></g><mask id="d2-837698653" maskUnits="userSpaceOnUse" x="-160" y="-166" width="492" height="333">
->>>>>>> 33280fed5 (fixed e2e tests)
 <rect x="-160" y="-166" width="492" height="333" fill="white"></rect>
 <rect x="-59.000000" y="-65.000000" width="290" height="45" fill="rgba(0,0,0,0.75)"></rect>
 <rect x="22.500000" y="22.500000" width="126" height="21" fill="rgba(0,0,0,0.75)"></rect>
-<<<<<<< HEAD
+</mask></g><g style="animation: d2Transition-d2-2824756871-2 5600ms infinite"  class="d2-2824756871" width="492" height="499" viewBox="-160 -166 492 499"><rect x="-160.000000" y="-166.000000" width="492.000000" height="499.000000" rx="0.000000" fill="#FFFFFF" class=" fill-N7" stroke-width="0" /><g id="&#34;Chicken&#39;s plan&#34;"><g class="shape" ></g><text x="86.000000" y="-30.000000" fill="#000410" class="text-mono fill-N1" style="text-anchor:middle;font-size:35px">CHICKEN&#39;S PLAN</text></g><g id="Approach road"><g class="shape" ><rect x="0.000000" y="0.000000" width="171.000000" height="66.000000" stroke="#000410" fill="#FFFFFF" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="85.500000" y="38.500000" fill="#000410" class="text-mono-bold fill-N1" style="text-anchor:middle;font-size:16px">APPROACH ROAD</text></g><g id="Cross road"><g class="shape" ><rect x="15.000000" y="166.000000" width="142.000000" height="66.000000" stroke="#000410" fill="#FFFFFF" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="86.000000" y="204.500000" fill="#000410" class="text-mono-bold fill-N1" style="text-anchor:middle;font-size:16px">CROSS ROAD</text></g><g id="(Approach road -&gt; Cross road)[0]"><marker id="mk-3488378134" markerWidth="10.000000" markerHeight="12.000000" refX="7.000000" refY="6.000000" viewBox="0.000000 0.000000 10.000000 12.000000" orient="auto" markerUnits="userSpaceOnUse"> <polygon points="0.000000,0.000000 10.000000,6.000000 0.000000,12.000000" fill="#000410" class="connection fill-B1" stroke-width="2" /> </marker><path d="M 85.500000 68.000000 C 85.500000 106.000000 85.500000 126.000000 85.500000 162.000000" stroke="#000410" fill="none" class="connection stroke-B1" style="stroke-width:2;" marker-end="url(#mk-3488378134)" mask="url(#d2-237013693)" /></g><mask id="d2-237013693" maskUnits="userSpaceOnUse" x="-160" y="-166" width="492" height="499">
-</mask></g><g style="animation: d2Transition-d2-2597568289-2 5600ms infinite"  class="d2-2597568289" width="492" height="499" viewBox="-160 -166 492 499"><rect x="-160.000000" y="-166.000000" width="492.000000" height="499.000000" rx="0.000000" fill="#FFFFFF" class=" fill-N7" stroke-width="0" /><g id="&#34;Chicken&#39;s plan&#34;"><g class="shape" ></g><text x="86.000000" y="-30.000000" fill="#000410" class="text-mono fill-N1" style="text-anchor:middle;font-size:35px">CHICKEN&#39;S PLAN</text></g><g id="Approach road"><g class="shape" ><rect x="0.000000" y="0.000000" width="171.000000" height="66.000000" stroke="#000410" fill="#FFFFFF" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="85.500000" y="38.500000" fill="#000410" class="text-mono-bold fill-N1" style="text-anchor:middle;font-size:16px">APPROACH ROAD</text></g><g id="Cross road"><g class="shape" ><rect x="15.000000" y="166.000000" width="142.000000" height="66.000000" stroke="#000410" fill="#FFFFFF" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="86.000000" y="204.500000" fill="#000410" class="text-mono-bold fill-N1" style="text-anchor:middle;font-size:16px">CROSS ROAD</text></g><g id="(Approach road -&gt; Cross road)[0]"><marker id="mk-3488378134" markerWidth="10.000000" markerHeight="12.000000" refX="7.000000" refY="6.000000" viewBox="0.000000 0.000000 10.000000 12.000000" orient="auto" markerUnits="userSpaceOnUse"> <polygon points="0.000000,0.000000 10.000000,6.000000 0.000000,12.000000" fill="#000410" class="connection fill-B1" stroke-width="2" /> </marker><path d="M 85.500000 68.000000 C 85.500000 106.000000 85.500000 126.000000 85.500000 162.000000" stroke="#000410" fill="none" class="connection stroke-B1" style="stroke-width:2;" marker-end="url(#mk-3488378134)" mask="url(#d2-4187960027)" /></g><mask id="d2-4187960027" maskUnits="userSpaceOnUse" x="-160" y="-166" width="492" height="499">
-||||||| parent of 33280fed5 (fixed e2e tests)
-</mask></g><g style="animation: d2Transition-d2-2597568289-2 5600ms infinite"  class="d2-2597568289" width="492" height="499" viewBox="-160 -166 492 499"><rect x="-160.000000" y="-166.000000" width="492.000000" height="499.000000" rx="0.000000" class=" fill-N7" stroke-width="0" /><g id="&#34;Chicken&#39;s plan&#34;"><g class="shape" ></g><text x="86.000000" y="-30.000000" class="text-mono fill-N1" style="text-anchor:middle;font-size:35px">CHICKEN&#39;S PLAN</text></g><g id="Approach road"><g class="shape" ><rect x="0.000000" y="0.000000" width="171.000000" height="66.000000" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="85.500000" y="38.500000" class="text-mono-bold fill-N1" style="text-anchor:middle;font-size:16px">APPROACH ROAD</text></g><g id="Cross road"><g class="shape" ><rect x="15.000000" y="166.000000" width="142.000000" height="66.000000" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="86.000000" y="204.500000" class="text-mono-bold fill-N1" style="text-anchor:middle;font-size:16px">CROSS ROAD</text></g><g id="(Approach road -&gt; Cross road)[0]"><marker id="mk-3488378134" markerWidth="10.000000" markerHeight="12.000000" refX="7.000000" refY="6.000000" viewBox="0.000000 0.000000 10.000000 12.000000" orient="auto" markerUnits="userSpaceOnUse"> <polygon points="0.000000,0.000000 10.000000,6.000000 0.000000,12.000000" class="connection fill-B1" stroke-width="2" /> </marker><path d="M 85.500000 68.000000 C 85.500000 106.000000 85.500000 126.000000 85.500000 162.000000" fill="none" class="connection stroke-B1" style="stroke-width:2;" marker-end="url(#mk-3488378134)" mask="url(#d2-4187960027)" /></g><mask id="d2-4187960027" maskUnits="userSpaceOnUse" x="-160" y="-166" width="492" height="499">
-=======
-</mask></g><g style="animation: d2Transition-d2-2824756871-2 5600ms infinite"  class="d2-2824756871" width="492" height="499" viewBox="-160 -166 492 499"><rect x="-160.000000" y="-166.000000" width="492.000000" height="499.000000" rx="0.000000" class=" fill-N7" stroke-width="0" /><g id="&#34;Chicken&#39;s plan&#34;"><g class="shape" ></g><text x="86.000000" y="-30.000000" class="text-mono fill-N1" style="text-anchor:middle;font-size:35px">CHICKEN&#39;S PLAN</text></g><g id="Approach road"><g class="shape" ><rect x="0.000000" y="0.000000" width="171.000000" height="66.000000" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="85.500000" y="38.500000" class="text-mono-bold fill-N1" style="text-anchor:middle;font-size:16px">APPROACH ROAD</text></g><g id="Cross road"><g class="shape" ><rect x="15.000000" y="166.000000" width="142.000000" height="66.000000" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="86.000000" y="204.500000" class="text-mono-bold fill-N1" style="text-anchor:middle;font-size:16px">CROSS ROAD</text></g><g id="(Approach road -&gt; Cross road)[0]"><marker id="mk-3488378134" markerWidth="10.000000" markerHeight="12.000000" refX="7.000000" refY="6.000000" viewBox="0.000000 0.000000 10.000000 12.000000" orient="auto" markerUnits="userSpaceOnUse"> <polygon points="0.000000,0.000000 10.000000,6.000000 0.000000,12.000000" class="connection fill-B1" stroke-width="2" /> </marker><path d="M 85.500000 68.000000 C 85.500000 106.000000 85.500000 126.000000 85.500000 162.000000" fill="none" class="connection stroke-B1" style="stroke-width:2;" marker-end="url(#mk-3488378134)" mask="url(#d2-237013693)" /></g><mask id="d2-237013693" maskUnits="userSpaceOnUse" x="-160" y="-166" width="492" height="499">
->>>>>>> 33280fed5 (fixed e2e tests)
 <rect x="-160" y="-166" width="492" height="499" fill="white"></rect>
 <rect x="-59.000000" y="-65.000000" width="290" height="45" fill="rgba(0,0,0,0.75)"></rect>
 <rect x="22.500000" y="22.500000" width="126" height="21" fill="rgba(0,0,0,0.75)"></rect>
 <rect x="37.500000" y="188.500000" width="97" height="21" fill="rgba(0,0,0,0.75)"></rect>
-<<<<<<< HEAD
+</mask></g><g style="animation: d2Transition-d2-2824756871-3 5600ms infinite"  class="d2-2824756871" width="492" height="665" viewBox="-132 -166 492 665"><rect x="-132.000000" y="-166.000000" width="492.000000" height="665.000000" rx="0.000000" fill="#FFFFFF" class=" fill-N7" stroke-width="0" /><g id="&#34;Chicken&#39;s plan&#34;"><g class="shape" ></g><text x="114.000000" y="-30.000000" fill="#000410" class="text-mono fill-N1" style="text-anchor:middle;font-size:35px">CHICKEN&#39;S PLAN</text></g><g id="Approach road"><g class="shape" ><rect x="29.000000" y="0.000000" width="171.000000" height="66.000000" stroke="#000410" fill="#FFFFFF" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="114.500000" y="38.500000" fill="#000410" class="text-mono-bold fill-N1" style="text-anchor:middle;font-size:16px">APPROACH ROAD</text></g><g id="Cross road"><g class="shape" ><rect x="43.000000" y="166.000000" width="142.000000" height="66.000000" stroke="#000410" fill="#FFFFFF" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="114.000000" y="204.500000" fill="#000410" class="text-mono-bold fill-N1" style="text-anchor:middle;font-size:16px">CROSS ROAD</text></g><g id="Make you wonder why"><g class="shape" ><rect x="0.000000" y="332.000000" width="228.000000" height="66.000000" stroke="#000410" fill="#FFFFFF" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="114.000000" y="370.500000" fill="#000410" class="text-mono-bold fill-N1" style="text-anchor:middle;font-size:16px">MAKE YOU WONDER WHY</text></g><g id="(Approach road -&gt; Cross road)[0]"><marker id="mk-3488378134" markerWidth="10.000000" markerHeight="12.000000" refX="7.000000" refY="6.000000" viewBox="0.000000 0.000000 10.000000 12.000000" orient="auto" markerUnits="userSpaceOnUse"> <polygon points="0.000000,0.000000 10.000000,6.000000 0.000000,12.000000" fill="#000410" class="connection fill-B1" stroke-width="2" /> </marker><path d="M 114.000000 68.000000 C 114.000000 106.000000 114.000000 126.000000 114.000000 162.000000" stroke="#000410" fill="none" class="connection stroke-B1" style="stroke-width:2;" marker-end="url(#mk-3488378134)" mask="url(#d2-2907728269)" /></g><g id="(Cross road -&gt; Make you wonder why)[0]"><path d="M 114.000000 234.000000 C 114.000000 272.000000 114.000000 292.000000 114.000000 328.000000" stroke="#000410" fill="none" class="connection stroke-B1" style="stroke-width:2;" marker-end="url(#mk-3488378134)" mask="url(#d2-2907728269)" /></g><mask id="d2-2907728269" maskUnits="userSpaceOnUse" x="-132" y="-166" width="492" height="665">
-</mask></g><g style="animation: d2Transition-d2-2597568289-3 5600ms infinite"  class="d2-2597568289" width="492" height="665" viewBox="-132 -166 492 665"><rect x="-132.000000" y="-166.000000" width="492.000000" height="665.000000" rx="0.000000" fill="#FFFFFF" class=" fill-N7" stroke-width="0" /><g id="&#34;Chicken&#39;s plan&#34;"><g class="shape" ></g><text x="114.000000" y="-30.000000" fill="#000410" class="text-mono fill-N1" style="text-anchor:middle;font-size:35px">CHICKEN&#39;S PLAN</text></g><g id="Approach road"><g class="shape" ><rect x="29.000000" y="0.000000" width="171.000000" height="66.000000" stroke="#000410" fill="#FFFFFF" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="114.500000" y="38.500000" fill="#000410" class="text-mono-bold fill-N1" style="text-anchor:middle;font-size:16px">APPROACH ROAD</text></g><g id="Cross road"><g class="shape" ><rect x="43.000000" y="166.000000" width="142.000000" height="66.000000" stroke="#000410" fill="#FFFFFF" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="114.000000" y="204.500000" fill="#000410" class="text-mono-bold fill-N1" style="text-anchor:middle;font-size:16px">CROSS ROAD</text></g><g id="Make you wonder why"><g class="shape" ><rect x="0.000000" y="332.000000" width="228.000000" height="66.000000" stroke="#000410" fill="#FFFFFF" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="114.000000" y="370.500000" fill="#000410" class="text-mono-bold fill-N1" style="text-anchor:middle;font-size:16px">MAKE YOU WONDER WHY</text></g><g id="(Approach road -&gt; Cross road)[0]"><marker id="mk-3488378134" markerWidth="10.000000" markerHeight="12.000000" refX="7.000000" refY="6.000000" viewBox="0.000000 0.000000 10.000000 12.000000" orient="auto" markerUnits="userSpaceOnUse"> <polygon points="0.000000,0.000000 10.000000,6.000000 0.000000,12.000000" fill="#000410" class="connection fill-B1" stroke-width="2" /> </marker><path d="M 114.000000 68.000000 C 114.000000 106.000000 114.000000 126.000000 114.000000 162.000000" stroke="#000410" fill="none" class="connection stroke-B1" style="stroke-width:2;" marker-end="url(#mk-3488378134)" mask="url(#d2-552645845)" /></g><g id="(Cross road -&gt; Make you wonder why)[0]"><path d="M 114.000000 234.000000 C 114.000000 272.000000 114.000000 292.000000 114.000000 328.000000" stroke="#000410" fill="none" class="connection stroke-B1" style="stroke-width:2;" marker-end="url(#mk-3488378134)" mask="url(#d2-552645845)" /></g><mask id="d2-552645845" maskUnits="userSpaceOnUse" x="-132" y="-166" width="492" height="665">
-||||||| parent of 33280fed5 (fixed e2e tests)
-</mask></g><g style="animation: d2Transition-d2-2597568289-3 5600ms infinite"  class="d2-2597568289" width="492" height="665" viewBox="-132 -166 492 665"><rect x="-132.000000" y="-166.000000" width="492.000000" height="665.000000" rx="0.000000" class=" fill-N7" stroke-width="0" /><g id="&#34;Chicken&#39;s plan&#34;"><g class="shape" ></g><text x="114.000000" y="-30.000000" class="text-mono fill-N1" style="text-anchor:middle;font-size:35px">CHICKEN&#39;S PLAN</text></g><g id="Approach road"><g class="shape" ><rect x="29.000000" y="0.000000" width="171.000000" height="66.000000" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="114.500000" y="38.500000" class="text-mono-bold fill-N1" style="text-anchor:middle;font-size:16px">APPROACH ROAD</text></g><g id="Cross road"><g class="shape" ><rect x="43.000000" y="166.000000" width="142.000000" height="66.000000" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="114.000000" y="204.500000" class="text-mono-bold fill-N1" style="text-anchor:middle;font-size:16px">CROSS ROAD</text></g><g id="Make you wonder why"><g class="shape" ><rect x="0.000000" y="332.000000" width="228.000000" height="66.000000" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="114.000000" y="370.500000" class="text-mono-bold fill-N1" style="text-anchor:middle;font-size:16px">MAKE YOU WONDER WHY</text></g><g id="(Approach road -&gt; Cross road)[0]"><marker id="mk-3488378134" markerWidth="10.000000" markerHeight="12.000000" refX="7.000000" refY="6.000000" viewBox="0.000000 0.000000 10.000000 12.000000" orient="auto" markerUnits="userSpaceOnUse"> <polygon points="0.000000,0.000000 10.000000,6.000000 0.000000,12.000000" class="connection fill-B1" stroke-width="2" /> </marker><path d="M 114.000000 68.000000 C 114.000000 106.000000 114.000000 126.000000 114.000000 162.000000" fill="none" class="connection stroke-B1" style="stroke-width:2;" marker-end="url(#mk-3488378134)" mask="url(#d2-552645845)" /></g><g id="(Cross road -&gt; Make you wonder why)[0]"><path d="M 114.000000 234.000000 C 114.000000 272.000000 114.000000 292.000000 114.000000 328.000000" fill="none" class="connection stroke-B1" style="stroke-width:2;" marker-end="url(#mk-3488378134)" mask="url(#d2-552645845)" /></g><mask id="d2-552645845" maskUnits="userSpaceOnUse" x="-132" y="-166" width="492" height="665">
-=======
-</mask></g><g style="animation: d2Transition-d2-2824756871-3 5600ms infinite"  class="d2-2824756871" width="492" height="665" viewBox="-132 -166 492 665"><rect x="-132.000000" y="-166.000000" width="492.000000" height="665.000000" rx="0.000000" class=" fill-N7" stroke-width="0" /><g id="&#34;Chicken&#39;s plan&#34;"><g class="shape" ></g><text x="114.000000" y="-30.000000" class="text-mono fill-N1" style="text-anchor:middle;font-size:35px">CHICKEN&#39;S PLAN</text></g><g id="Approach road"><g class="shape" ><rect x="29.000000" y="0.000000" width="171.000000" height="66.000000" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="114.500000" y="38.500000" class="text-mono-bold fill-N1" style="text-anchor:middle;font-size:16px">APPROACH ROAD</text></g><g id="Cross road"><g class="shape" ><rect x="43.000000" y="166.000000" width="142.000000" height="66.000000" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="114.000000" y="204.500000" class="text-mono-bold fill-N1" style="text-anchor:middle;font-size:16px">CROSS ROAD</text></g><g id="Make you wonder why"><g class="shape" ><rect x="0.000000" y="332.000000" width="228.000000" height="66.000000" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="114.000000" y="370.500000" class="text-mono-bold fill-N1" style="text-anchor:middle;font-size:16px">MAKE YOU WONDER WHY</text></g><g id="(Approach road -&gt; Cross road)[0]"><marker id="mk-3488378134" markerWidth="10.000000" markerHeight="12.000000" refX="7.000000" refY="6.000000" viewBox="0.000000 0.000000 10.000000 12.000000" orient="auto" markerUnits="userSpaceOnUse"> <polygon points="0.000000,0.000000 10.000000,6.000000 0.000000,12.000000" class="connection fill-B1" stroke-width="2" /> </marker><path d="M 114.000000 68.000000 C 114.000000 106.000000 114.000000 126.000000 114.000000 162.000000" fill="none" class="connection stroke-B1" style="stroke-width:2;" marker-end="url(#mk-3488378134)" mask="url(#d2-2907728269)" /></g><g id="(Cross road -&gt; Make you wonder why)[0]"><path d="M 114.000000 234.000000 C 114.000000 272.000000 114.000000 292.000000 114.000000 328.000000" fill="none" class="connection stroke-B1" style="stroke-width:2;" marker-end="url(#mk-3488378134)" mask="url(#d2-2907728269)" /></g><mask id="d2-2907728269" maskUnits="userSpaceOnUse" x="-132" y="-166" width="492" height="665">
->>>>>>> 33280fed5 (fixed e2e tests)
 <rect x="-132" y="-166" width="492" height="665" fill="white"></rect>
 <rect x="-31.000000" y="-65.000000" width="290" height="45" fill="rgba(0,0,0,0.75)"></rect>
 <rect x="51.500000" y="22.500000" width="126" height="21" fill="rgba(0,0,0,0.75)"></rect>

e2etests-cli/testdata/TestCLI_E2E/with-font.exp.svg

@@ -1,26 +1,4 @@
-<<<<<<< HEAD
+<?xml version="1.0" encoding="utf-8"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" d2Version="v0.6.8-HEAD" preserveAspectRatio="xMinYMin meet" viewBox="0 0 641 489"><svg id="d2-svg" class="d2-373183345" width="641" height="489" viewBox="-101 -101 641 489"><rect x="-101.000000" y="-101.000000" width="641.000000" height="489.000000" rx="0.000000" fill="#FFFFFF" class=" fill-N7" stroke-width="0" /><style type="text/css"><![CDATA[
-<<<<<<< HEAD
-<?xml version="1.0" encoding="utf-8"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" d2Version="v0.6.8-HEAD" preserveAspectRatio="xMinYMin meet" viewBox="0 0 641 489"><svg id="d2-svg" class="d2-1771907023" width="641" height="489" viewBox="-101 -101 641 489"><rect x="-101.000000" y="-101.000000" width="641.000000" height="489.000000" rx="0.000000" fill="#FFFFFF" class=" fill-N7" stroke-width="0" /><style type="text/css"><![CDATA[
-||||||| parent of 33280fed5 (fixed e2e tests)
-<?xml version="1.0" encoding="utf-8"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" d2Version="v0.6.6-HEAD" preserveAspectRatio="xMinYMin meet" viewBox="0 0 641 489"><svg id="d2-svg" class="d2-1771907023" width="641" height="489" viewBox="-101 -101 641 489"><rect x="-101.000000" y="-101.000000" width="641.000000" height="489.000000" rx="0.000000" class=" fill-N7" stroke-width="0" /><style type="text/css"><![CDATA[
-=======
-<<<<<<< HEAD
-<?xml version="1.0" encoding="utf-8"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" d2Version="v0.6.6-HEAD" preserveAspectRatio="xMinYMin meet" viewBox="0 0 641 489"><svg id="d2-svg" class="d2-1771907023" width="641" height="489" viewBox="-101 -101 641 489"><rect x="-101.000000" y="-101.000000" width="641.000000" height="489.000000" rx="0.000000" class=" fill-N7" stroke-width="0" /><style type="text/css"><![CDATA[
->>>>>>> 33280fed5 (fixed e2e tests)
-.d2-1771907023 .text-bold {
-	font-family: "d2-1771907023-font-bold";
-=======
-<?xml version="1.0" encoding="utf-8"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" d2Version="v0.6.5-HEAD" preserveAspectRatio="xMinYMin meet" viewBox="0 0 641 489"><svg id="d2-svg" class="d2-373183345" width="641" height="489" viewBox="-101 -101 641 489"><rect x="-101.000000" y="-101.000000" width="641.000000" height="489.000000" rx="0.000000" class=" fill-N7" stroke-width="0" /><style type="text/css"><![CDATA[
-||||||| parent of cb2f2823c (Fix changes)
-<<<<<<< HEAD
-<?xml version="1.0" encoding="utf-8"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" d2Version="v0.6.6-HEAD" preserveAspectRatio="xMinYMin meet" viewBox="0 0 641 489"><svg id="d2-svg" class="d2-1771907023" width="641" height="489" viewBox="-101 -101 641 489"><rect x="-101.000000" y="-101.000000" width="641.000000" height="489.000000" rx="0.000000" class=" fill-N7" stroke-width="0" /><style type="text/css"><![CDATA[
-.d2-1771907023 .text-bold {
-	font-family: "d2-1771907023-font-bold";
-=======
-<?xml version="1.0" encoding="utf-8"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" d2Version="v0.6.5-HEAD" preserveAspectRatio="xMinYMin meet" viewBox="0 0 641 489"><svg id="d2-svg" class="d2-373183345" width="641" height="489" viewBox="-101 -101 641 489"><rect x="-101.000000" y="-101.000000" width="641.000000" height="489.000000" rx="0.000000" class=" fill-N7" stroke-width="0" /><style type="text/css"><![CDATA[
-=======
-<?xml version="1.0" encoding="utf-8"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" d2Version="v0.6.6-HEAD" preserveAspectRatio="xMinYMin meet" viewBox="0 0 641 489"><svg id="d2-svg" class="d2-373183345" width="641" height="489" viewBox="-101 -101 641 489"><rect x="-101.000000" y="-101.000000" width="641.000000" height="489.000000" rx="0.000000" class=" fill-N7" stroke-width="0" /><style type="text/css"><![CDATA[
->>>>>>> cb2f2823c (Fix changes)
 .d2-373183345 .text-bold {
 	font-family: "d2-373183345-font-bold";
 }
@@ -47,153 +25,6 @@
   opacity: 0.5;
 }
 
-<<<<<<< HEAD
-		.d2-1771907023 .fill-N1{fill:#0A0F25;}
-		.d2-1771907023 .fill-N2{fill:#676C7E;}
-		.d2-1771907023 .fill-N3{fill:#9499AB;}
-		.d2-1771907023 .fill-N4{fill:#CFD2DD;}
-		.d2-1771907023 .fill-N5{fill:#DEE1EB;}
-		.d2-1771907023 .fill-N6{fill:#EEF1F8;}
-		.d2-1771907023 .fill-N7{fill:#FFFFFF;}
-		.d2-1771907023 .fill-B1{fill:#0D32B2;}
-		.d2-1771907023 .fill-B2{fill:#0D32B2;}
-		.d2-1771907023 .fill-B3{fill:#E3E9FD;}
-		.d2-1771907023 .fill-B4{fill:#E3E9FD;}
-		.d2-1771907023 .fill-B5{fill:#EDF0FD;}
-		.d2-1771907023 .fill-B6{fill:#F7F8FE;}
-		.d2-1771907023 .fill-AA2{fill:#4A6FF3;}
-		.d2-1771907023 .fill-AA4{fill:#EDF0FD;}
-		.d2-1771907023 .fill-AA5{fill:#F7F8FE;}
-		.d2-1771907023 .fill-AB4{fill:#EDF0FD;}
-		.d2-1771907023 .fill-AB5{fill:#F7F8FE;}
-		.d2-1771907023 .stroke-N1{stroke:#0A0F25;}
-		.d2-1771907023 .stroke-N2{stroke:#676C7E;}
-		.d2-1771907023 .stroke-N3{stroke:#9499AB;}
-		.d2-1771907023 .stroke-N4{stroke:#CFD2DD;}
-		.d2-1771907023 .stroke-N5{stroke:#DEE1EB;}
-		.d2-1771907023 .stroke-N6{stroke:#EEF1F8;}
-		.d2-1771907023 .stroke-N7{stroke:#FFFFFF;}
-		.d2-1771907023 .stroke-B1{stroke:#0D32B2;}
-		.d2-1771907023 .stroke-B2{stroke:#0D32B2;}
-		.d2-1771907023 .stroke-B3{stroke:#E3E9FD;}
-		.d2-1771907023 .stroke-B4{stroke:#E3E9FD;}
-		.d2-1771907023 .stroke-B5{stroke:#EDF0FD;}
-		.d2-1771907023 .stroke-B6{stroke:#F7F8FE;}
-		.d2-1771907023 .stroke-AA2{stroke:#4A6FF3;}
-		.d2-1771907023 .stroke-AA4{stroke:#EDF0FD;}
-		.d2-1771907023 .stroke-AA5{stroke:#F7F8FE;}
-		.d2-1771907023 .stroke-AB4{stroke:#EDF0FD;}
-		.d2-1771907023 .stroke-AB5{stroke:#F7F8FE;}
-		.d2-1771907023 .background-color-N1{background-color:#0A0F25;}
-		.d2-1771907023 .background-color-N2{background-color:#676C7E;}
-		.d2-1771907023 .background-color-N3{background-color:#9499AB;}
-		.d2-1771907023 .background-color-N4{background-color:#CFD2DD;}
-		.d2-1771907023 .background-color-N5{background-color:#DEE1EB;}
-		.d2-1771907023 .background-color-N6{background-color:#EEF1F8;}
-		.d2-1771907023 .background-color-N7{background-color:#FFFFFF;}
-		.d2-1771907023 .background-color-B1{background-color:#0D32B2;}
-		.d2-1771907023 .background-color-B2{background-color:#0D32B2;}
-		.d2-1771907023 .background-color-B3{background-color:#E3E9FD;}
-		.d2-1771907023 .background-color-B4{background-color:#E3E9FD;}
-		.d2-1771907023 .background-color-B5{background-color:#EDF0FD;}
-		.d2-1771907023 .background-color-B6{background-color:#F7F8FE;}
-		.d2-1771907023 .background-color-AA2{background-color:#4A6FF3;}
-		.d2-1771907023 .background-color-AA4{background-color:#EDF0FD;}
-		.d2-1771907023 .background-color-AA5{background-color:#F7F8FE;}
-		.d2-1771907023 .background-color-AB4{background-color:#EDF0FD;}
-		.d2-1771907023 .background-color-AB5{background-color:#F7F8FE;}
-		.d2-1771907023 .color-N1{color:#0A0F25;}
-		.d2-1771907023 .color-N2{color:#676C7E;}
-		.d2-1771907023 .color-N3{color:#9499AB;}
-		.d2-1771907023 .color-N4{color:#CFD2DD;}
-		.d2-1771907023 .color-N5{color:#DEE1EB;}
-		.d2-1771907023 .color-N6{color:#EEF1F8;}
-		.d2-1771907023 .color-N7{color:#FFFFFF;}
-		.d2-1771907023 .color-B1{color:#0D32B2;}
-		.d2-1771907023 .color-B2{color:#0D32B2;}
-		.d2-1771907023 .color-B3{color:#E3E9FD;}
-		.d2-1771907023 .color-B4{color:#E3E9FD;}
-		.d2-1771907023 .color-B5{color:#EDF0FD;}
-		.d2-1771907023 .color-B6{color:#F7F8FE;}
-		.d2-1771907023 .color-AA2{color:#4A6FF3;}
-		.d2-1771907023 .color-AA4{color:#EDF0FD;}
-		.d2-1771907023 .color-AA5{color:#F7F8FE;}
-		.d2-1771907023 .color-AB4{color:#EDF0FD;}
-		.d2-1771907023 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]></style><g id="a"><g class="shape" ><rect x="29.000000" y="0.000000" width="382.000000" height="83.000000" stroke="#0D32B2" fill="#F7F8FE" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="220.000000" y="38.500000" fill="#0A0F25" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">Why do computers get sick often?</text></g><g id="b"><g class="shape" ><rect x="0.000000" y="204.000000" width="439.000000" height="83.000000" stroke="#0D32B2" fill="#F7F8FE" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="219.500000" y="242.500000" fill="#0A0F25" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">Because their Windows are always open!</text></g><g id="(a -&gt; b)[0]"><marker id="mk-3488378134" markerWidth="10.000000" markerHeight="12.000000" refX="7.000000" refY="6.000000" viewBox="0.000000 0.000000 10.000000 12.000000" orient="auto" markerUnits="userSpaceOnUse"> <polygon points="0.000000,0.000000 10.000000,6.000000 0.000000,12.000000" fill="#0D32B2" class="connection fill-B1" stroke-width="2" /> </marker><path d="M 219.500000 84.500000 C 219.500000 131.300003 219.500000 155.699997 219.500000 200.500000" stroke="#0D32B2" fill="none" class="connection stroke-B1" style="stroke-width:2;" marker-end="url(#mk-3488378134)" mask="url(#d2-1771907023)" /><text x="219.500000" y="149.000000" fill="#676C7E" class="text-italic fill-N2" style="text-anchor:middle;font-size:16px">italic font</text></g><mask id="d2-1771907023" maskUnits="userSpaceOnUse" x="-101" y="-101" width="641" height="489">
-||||||| parent of 33280fed5 (fixed e2e tests)
-		.d2-1771907023 .fill-N1{fill:#0A0F25;}
-		.d2-1771907023 .fill-N2{fill:#676C7E;}
-		.d2-1771907023 .fill-N3{fill:#9499AB;}
-		.d2-1771907023 .fill-N4{fill:#CFD2DD;}
-		.d2-1771907023 .fill-N5{fill:#DEE1EB;}
-		.d2-1771907023 .fill-N6{fill:#EEF1F8;}
-		.d2-1771907023 .fill-N7{fill:#FFFFFF;}
-		.d2-1771907023 .fill-B1{fill:#0D32B2;}
-		.d2-1771907023 .fill-B2{fill:#0D32B2;}
-		.d2-1771907023 .fill-B3{fill:#E3E9FD;}
-		.d2-1771907023 .fill-B4{fill:#E3E9FD;}
-		.d2-1771907023 .fill-B5{fill:#EDF0FD;}
-		.d2-1771907023 .fill-B6{fill:#F7F8FE;}
-		.d2-1771907023 .fill-AA2{fill:#4A6FF3;}
-		.d2-1771907023 .fill-AA4{fill:#EDF0FD;}
-		.d2-1771907023 .fill-AA5{fill:#F7F8FE;}
-		.d2-1771907023 .fill-AB4{fill:#EDF0FD;}
-		.d2-1771907023 .fill-AB5{fill:#F7F8FE;}
-		.d2-1771907023 .stroke-N1{stroke:#0A0F25;}
-		.d2-1771907023 .stroke-N2{stroke:#676C7E;}
-		.d2-1771907023 .stroke-N3{stroke:#9499AB;}
-		.d2-1771907023 .stroke-N4{stroke:#CFD2DD;}
-		.d2-1771907023 .stroke-N5{stroke:#DEE1EB;}
-		.d2-1771907023 .stroke-N6{stroke:#EEF1F8;}
-		.d2-1771907023 .stroke-N7{stroke:#FFFFFF;}
-		.d2-1771907023 .stroke-B1{stroke:#0D32B2;}
-		.d2-1771907023 .stroke-B2{stroke:#0D32B2;}
-		.d2-1771907023 .stroke-B3{stroke:#E3E9FD;}
-		.d2-1771907023 .stroke-B4{stroke:#E3E9FD;}
-		.d2-1771907023 .stroke-B5{stroke:#EDF0FD;}
-		.d2-1771907023 .stroke-B6{stroke:#F7F8FE;}
-		.d2-1771907023 .stroke-AA2{stroke:#4A6FF3;}
-		.d2-1771907023 .stroke-AA4{stroke:#EDF0FD;}
-		.d2-1771907023 .stroke-AA5{stroke:#F7F8FE;}
-		.d2-1771907023 .stroke-AB4{stroke:#EDF0FD;}
-		.d2-1771907023 .stroke-AB5{stroke:#F7F8FE;}
-		.d2-1771907023 .background-color-N1{background-color:#0A0F25;}
-		.d2-1771907023 .background-color-N2{background-color:#676C7E;}
-		.d2-1771907023 .background-color-N3{background-color:#9499AB;}
-		.d2-1771907023 .background-color-N4{background-color:#CFD2DD;}
-		.d2-1771907023 .background-color-N5{background-color:#DEE1EB;}
-		.d2-1771907023 .background-color-N6{background-color:#EEF1F8;}
-		.d2-1771907023 .background-color-N7{background-color:#FFFFFF;}
-		.d2-1771907023 .background-color-B1{background-color:#0D32B2;}
-		.d2-1771907023 .background-color-B2{background-color:#0D32B2;}
-		.d2-1771907023 .background-color-B3{background-color:#E3E9FD;}
-		.d2-1771907023 .background-color-B4{background-color:#E3E9FD;}
-		.d2-1771907023 .background-color-B5{background-color:#EDF0FD;}
-		.d2-1771907023 .background-color-B6{background-color:#F7F8FE;}
-		.d2-1771907023 .background-color-AA2{background-color:#4A6FF3;}
-		.d2-1771907023 .background-color-AA4{background-color:#EDF0FD;}
-		.d2-1771907023 .background-color-AA5{background-color:#F7F8FE;}
-		.d2-1771907023 .background-color-AB4{background-color:#EDF0FD;}
-		.d2-1771907023 .background-color-AB5{background-color:#F7F8FE;}
-		.d2-1771907023 .color-N1{color:#0A0F25;}
-		.d2-1771907023 .color-N2{color:#676C7E;}
-		.d2-1771907023 .color-N3{color:#9499AB;}
-		.d2-1771907023 .color-N4{color:#CFD2DD;}
-		.d2-1771907023 .color-N5{color:#DEE1EB;}
-		.d2-1771907023 .color-N6{color:#EEF1F8;}
-		.d2-1771907023 .color-N7{color:#FFFFFF;}
-		.d2-1771907023 .color-B1{color:#0D32B2;}
-		.d2-1771907023 .color-B2{color:#0D32B2;}
-		.d2-1771907023 .color-B3{color:#E3E9FD;}
-		.d2-1771907023 .color-B4{color:#E3E9FD;}
-		.d2-1771907023 .color-B5{color:#EDF0FD;}
-		.d2-1771907023 .color-B6{color:#F7F8FE;}
-		.d2-1771907023 .color-AA2{color:#4A6FF3;}
-		.d2-1771907023 .color-AA4{color:#EDF0FD;}
-		.d2-1771907023 .color-AA5{color:#F7F8FE;}
-		.d2-1771907023 .color-AB4{color:#EDF0FD;}
-		.d2-1771907023 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]></style><g id="a"><g class="shape" ><rect x="29.000000" y="0.000000" width="382.000000" height="83.000000" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="220.000000" y="38.500000" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">Why do computers get sick often?</text></g><g id="b"><g class="shape" ><rect x="0.000000" y="204.000000" width="439.000000" height="83.000000" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="219.500000" y="242.500000" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">Because their Windows are always open!</text></g><g id="(a -&gt; b)[0]"><marker id="mk-3488378134" markerWidth="10.000000" markerHeight="12.000000" refX="7.000000" refY="6.000000" viewBox="0.000000 0.000000 10.000000 12.000000" orient="auto" markerUnits="userSpaceOnUse"> <polygon points="0.000000,0.000000 10.000000,6.000000 0.000000,12.000000" class="connection fill-B1" stroke-width="2" /> </marker><path d="M 219.500000 84.500000 C 219.500000 131.300003 219.500000 155.699997 219.500000 200.500000" fill="none" class="connection stroke-B1" style="stroke-width:2;" marker-end="url(#mk-3488378134)" mask="url(#d2-1771907023)" /><text x="219.500000" y="149.000000" class="text-italic fill-N2" style="text-anchor:middle;font-size:16px">italic font</text></g><mask id="d2-1771907023" maskUnits="userSpaceOnUse" x="-101" y="-101" width="641" height="489">
-=======
 		.d2-373183345 .fill-N1{fill:#0A0F25;}
 		.d2-373183345 .fill-N2{fill:#676C7E;}
 		.d2-373183345 .fill-N3{fill:#9499AB;}
@@ -265,8 +96,7 @@
 		.d2-373183345 .color-AA4{color:#EDF0FD;}
 		.d2-373183345 .color-AA5{color:#F7F8FE;}
 		.d2-373183345 .color-AB4{color:#EDF0FD;}
-		.d2-373183345 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]></style><g id="a"><g class="shape" ><rect x="29.000000" y="0.000000" width="382.000000" height="83.000000" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="220.000000" y="38.500000" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">Why do computers get sick often?</text></g><g id="b"><g class="shape" ><rect x="0.000000" y="204.000000" width="439.000000" height="83.000000" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="219.500000" y="242.500000" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">Because their Windows are always open!</text></g><g id="(a -&gt; b)[0]"><marker id="mk-3488378134" markerWidth="10.000000" markerHeight="12.000000" refX="7.000000" refY="6.000000" viewBox="0.000000 0.000000 10.000000 12.000000" orient="auto" markerUnits="userSpaceOnUse"> <polygon points="0.000000,0.000000 10.000000,6.000000 0.000000,12.000000" class="connection fill-B1" stroke-width="2" /> </marker><path d="M 219.500000 84.500000 C 219.500000 131.300003 219.500000 155.699997 219.500000 200.500000" fill="none" class="connection stroke-B1" style="stroke-width:2;" marker-end="url(#mk-3488378134)" mask="url(#d2-373183345)" /><text x="219.500000" y="149.000000" class="text-italic fill-N2" style="text-anchor:middle;font-size:16px">italic font</text></g><mask id="d2-373183345" maskUnits="userSpaceOnUse" x="-101" y="-101" width="641" height="489">
+		.d2-373183345 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]></style><g id="a"><g class="shape" ><rect x="29.000000" y="0.000000" width="382.000000" height="83.000000" stroke="#0D32B2" fill="#F7F8FE" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="220.000000" y="38.500000" fill="#0A0F25" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">Why do computers get sick often?</text></g><g id="b"><g class="shape" ><rect x="0.000000" y="204.000000" width="439.000000" height="83.000000" stroke="#0D32B2" fill="#F7F8FE" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="219.500000" y="242.500000" fill="#0A0F25" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">Because their Windows are always open!</text></g><g id="(a -&gt; b)[0]"><marker id="mk-3488378134" markerWidth="10.000000" markerHeight="12.000000" refX="7.000000" refY="6.000000" viewBox="0.000000 0.000000 10.000000 12.000000" orient="auto" markerUnits="userSpaceOnUse"> <polygon points="0.000000,0.000000 10.000000,6.000000 0.000000,12.000000" fill="#0D32B2" class="connection fill-B1" stroke-width="2" /> </marker><path d="M 219.500000 84.500000 C 219.500000 131.300003 219.500000 155.699997 219.500000 200.500000" stroke="#0D32B2" fill="none" class="connection stroke-B1" style="stroke-width:2;" marker-end="url(#mk-3488378134)" mask="url(#d2-373183345)" /><text x="219.500000" y="149.000000" fill="#676C7E" class="text-italic fill-N2" style="text-anchor:middle;font-size:16px">italic font</text></g><mask id="d2-373183345" maskUnits="userSpaceOnUse" x="-101" y="-101" width="641" height="489">
->>>>>>> 33280fed5 (fixed e2e tests)
 <rect x="-101" y="-101" width="641" height="489" fill="white"></rect>
 <rect x="51.500000" y="22.500000" width="337" height="38" fill="rgba(0,0,0,0.75)"></rect>
 <rect x="22.500000" y="226.500000" width="394" height="38" fill="rgba(0,0,0,0.75)"></rect>

e2etests/testdata/patterns/real/dagre/sketch.exp.svg

@@ -1,22 +1,6 @@
-<<<<<<< HEAD
+<?xml version="1.0" encoding="utf-8"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" d2Version="v0.6.8-HEAD" preserveAspectRatio="xMinYMin meet" viewBox="0 0 316 436"><svg id="d2-svg" class="d2-2028191254" width="316" height="436" viewBox="22 -22 316 436"><rect x="22.000000" y="-22.000000" width="316.000000" height="436.000000" rx="0.000000" fill="#FFFFFF" class=" fill-N7" stroke-width="0" /><style type="text/css"><![CDATA[
-<<<<<<< HEAD
-<?xml version="1.0" encoding="utf-8"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" d2Version="v0.6.8-HEAD" preserveAspectRatio="xMinYMin meet" viewBox="0 0 316 436"><svg id="d2-svg" class="d2-3480617744" width="316" height="436" viewBox="22 -22 316 436"><rect x="22.000000" y="-22.000000" width="316.000000" height="436.000000" rx="0.000000" fill="#FFFFFF" class=" fill-N7" stroke-width="0" /><style type="text/css"><![CDATA[
-.d2-3480617744 .text-mono {
-	font-family: "d2-3480617744-font-mono";
-||||||| parent of 33280fed5 (fixed e2e tests)
-<?xml version="1.0" encoding="utf-8"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" d2Version="v0.6.6-HEAD" preserveAspectRatio="xMinYMin meet" viewBox="0 0 316 436"><svg id="d2-svg" class="d2-3480617744" width="316" height="436" viewBox="22 -22 316 436"><rect x="22.000000" y="-22.000000" width="316.000000" height="436.000000" rx="0.000000" class=" fill-N7" stroke-width="0" /><style type="text/css"><![CDATA[
-.d2-3480617744 .text-mono {
-	font-family: "d2-3480617744-font-mono";
-=======
-<?xml version="1.0" encoding="utf-8"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" d2Version="v0.6.5-HEAD" preserveAspectRatio="xMinYMin meet" viewBox="0 0 316 436"><svg id="d2-svg" class="d2-2028191254" width="316" height="436" viewBox="22 -22 316 436"><rect x="22.000000" y="-22.000000" width="316.000000" height="436.000000" rx="0.000000" class=" fill-N7" stroke-width="0" /><style type="text/css"><![CDATA[
-||||||| parent of cb2f2823c (Fix changes)
-<?xml version="1.0" encoding="utf-8"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" d2Version="v0.6.5-HEAD" preserveAspectRatio="xMinYMin meet" viewBox="0 0 316 436"><svg id="d2-svg" class="d2-2028191254" width="316" height="436" viewBox="22 -22 316 436"><rect x="22.000000" y="-22.000000" width="316.000000" height="436.000000" rx="0.000000" class=" fill-N7" stroke-width="0" /><style type="text/css"><![CDATA[
-=======
-<?xml version="1.0" encoding="utf-8"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" d2Version="v0.6.6-HEAD" preserveAspectRatio="xMinYMin meet" viewBox="0 0 316 436"><svg id="d2-svg" class="d2-2028191254" width="316" height="436" viewBox="22 -22 316 436"><rect x="22.000000" y="-22.000000" width="316.000000" height="436.000000" rx="0.000000" class=" fill-N7" stroke-width="0" /><style type="text/css"><![CDATA[
->>>>>>> cb2f2823c (Fix changes)
 .d2-2028191254 .text-mono {
 	font-family: "d2-2028191254-font-mono";
->>>>>>> 33280fed5 (fixed e2e tests)
 }
 @font-face {
 	font-family: d2-2028191254-font-mono;
@@ -152,13 +136,7 @@
 <rect x="7" y="7" width="1" height="1" fill="#0A0F25"/>
 </g>
 </pattern>
-<<<<<<< HEAD
+</defs><g id="NETWORK"><g class="shape" ><rect x="23.000000" y="19.000000" width="314.000000" height="394.000000" stroke="black" fill="#E7E9EE" style="stroke-width:2;" /><rect x="23.000000" y="19.000000" width="314.000000" height="394.000000" class="dots-overlay" style="stroke-width:2;" /><rect x="28.000000" y="24.000000" width="304.000000" height="384.000000" stroke="black" fill="transparent" style="stroke-width:2;" /></g><text x="180.000000" y="6.000000" fill="#0A0F25" class="text-mono fill-N1" style="text-anchor:middle;font-size:28px">NETWORK</text></g><g id="NETWORK.CELL TOWER"><g class="shape" ><rect x="53.000000" y="60.000000" width="254.000000" height="323.000000" stroke="black" fill="#F5F6F9" style="stroke-width:2;" /><rect x="53.000000" y="60.000000" width="254.000000" height="323.000000" class="dots-overlay" style="stroke-width:2;" /></g><text x="180.000000" y="48.000000" fill="#0A0F25" class="text-mono fill-N1" style="text-anchor:middle;font-size:24px">CELL TOWER</text></g><g id="NETWORK.CELL TOWER.satellites"><g class="shape" ><path d="M 125 90 H 271 C 267 90 256 108 256 123 C 256 138 267 156 271 156 H 125 C 121 156 110 138 110 123 C 110 108 121 90 125 90 Z" stroke="black" fill="white" style="stroke-width:2;" /><path d="M 115 100 H 261 C 257 100 246 118 246 133 C 246 148 257 166 261 166 H 115 C 111 166 100 148 100 133 C 100 118 111 100 115 100 Z" stroke="black" fill="white" style="stroke-width:2;" /></g><text x="180.500000" y="138.500000" fill="#0A0F25" class="text-mono-bold fill-N1" style="text-anchor:middle;font-size:16px">SATELLITES</text></g><g id="NETWORK.CELL TOWER.transmitter"><g class="shape" ><rect x="105.000000" y="287.000000" width="151.000000" height="66.000000" stroke="black" fill="white" style="stroke-width:2;" /></g><text x="180.500000" y="325.500000" fill="#0A0F25" class="text-mono-bold fill-N1" style="text-anchor:middle;font-size:16px">TRANSMITTER</text></g><g id="NETWORK.CELL TOWER.(satellites -&gt; transmitter)[0]"><marker id="mk-27687146" markerWidth="10.000000" markerHeight="12.000000" refX="7.000000" refY="6.000000" viewBox="0.000000 0.000000 10.000000 12.000000" orient="auto" markerUnits="userSpaceOnUse"> <polygon points="0.000000,0.000000 10.000000,6.000000 0.000000,12.000000" fill="black" class="connection" stroke-width="2" /> </marker><path d="M 150.729685 167.544766 C 112.198997 214.399994 112.250000 238.699997 149.714288 284.406432" stroke="black" fill="none" class="connection" style="stroke-width:2;" marker-end="url(#mk-27687146)" mask="url(#d2-2028191254)" /><text x="112.000000" y="232.000000" fill="#676C7E" class="text-mono-italic fill-N2" style="text-anchor:middle;font-size:16px">SEND</text></g><g id="NETWORK.CELL TOWER.(satellites -&gt; transmitter)[1]"><path d="M 180.008264 167.999983 C 180.199997 214.399994 180.250000 238.699997 180.250000 283.500000" stroke="black" fill="none" class="connection" style="stroke-width:2;" marker-end="url(#mk-27687146)" mask="url(#d2-2028191254)" /><text x="180.000000" y="232.000000" fill="#676C7E" class="text-mono-italic fill-N2" style="text-anchor:middle;font-size:16px">SEND</text></g><g id="NETWORK.CELL TOWER.(satellites -&gt; transmitter)[2]"><path d="M 210.262632 167.551051 C 248.399994 214.399994 248.250000 238.699997 210.785712 284.406432" stroke="black" fill="none" class="connection" style="stroke-width:2;" marker-end="url(#mk-27687146)" mask="url(#d2-2028191254)" /><text x="248.000000" y="232.000000" fill="#676C7E" class="text-mono-italic fill-N2" style="text-anchor:middle;font-size:16px">SEND</text></g><mask id="d2-2028191254" maskUnits="userSpaceOnUse" x="22" y="-22" width="316" height="436">
-</defs><g id="NETWORK"><g class="shape" ><rect x="23.000000" y="19.000000" width="314.000000" height="394.000000" stroke="black" fill="#E7E9EE" style="stroke-width:2;" /><rect x="23.000000" y="19.000000" width="314.000000" height="394.000000" class="dots-overlay" style="stroke-width:2;" /><rect x="28.000000" y="24.000000" width="304.000000" height="384.000000" stroke="black" fill="transparent" style="stroke-width:2;" /></g><text x="180.000000" y="6.000000" fill="#0A0F25" class="text-mono fill-N1" style="text-anchor:middle;font-size:28px">NETWORK</text></g><g id="NETWORK.CELL TOWER"><g class="shape" ><rect x="53.000000" y="60.000000" width="254.000000" height="323.000000" stroke="black" fill="#F5F6F9" style="stroke-width:2;" /><rect x="53.000000" y="60.000000" width="254.000000" height="323.000000" class="dots-overlay" style="stroke-width:2;" /></g><text x="180.000000" y="48.000000" fill="#0A0F25" class="text-mono fill-N1" style="text-anchor:middle;font-size:24px">CELL TOWER</text></g><g id="NETWORK.CELL TOWER.satellites"><g class="shape" ><path d="M 125 90 H 271 C 267 90 256 108 256 123 C 256 138 267 156 271 156 H 125 C 121 156 110 138 110 123 C 110 108 121 90 125 90 Z" stroke="black" fill="white" style="stroke-width:2;" /><path d="M 115 100 H 261 C 257 100 246 118 246 133 C 246 148 257 166 261 166 H 115 C 111 166 100 148 100 133 C 100 118 111 100 115 100 Z" stroke="black" fill="white" style="stroke-width:2;" /></g><text x="180.500000" y="138.500000" fill="#0A0F25" class="text-mono-bold fill-N1" style="text-anchor:middle;font-size:16px">SATELLITES</text></g><g id="NETWORK.CELL TOWER.transmitter"><g class="shape" ><rect x="105.000000" y="287.000000" width="151.000000" height="66.000000" stroke="black" fill="white" style="stroke-width:2;" /></g><text x="180.500000" y="325.500000" fill="#0A0F25" class="text-mono-bold fill-N1" style="text-anchor:middle;font-size:16px">TRANSMITTER</text></g><g id="NETWORK.CELL TOWER.(satellites -&gt; transmitter)[0]"><marker id="mk-27687146" markerWidth="10.000000" markerHeight="12.000000" refX="7.000000" refY="6.000000" viewBox="0.000000 0.000000 10.000000 12.000000" orient="auto" markerUnits="userSpaceOnUse"> <polygon points="0.000000,0.000000 10.000000,6.000000 0.000000,12.000000" fill="black" class="connection" stroke-width="2" /> </marker><path d="M 150.729685 167.544766 C 112.198997 214.399994 112.250000 238.699997 149.714288 284.406432" stroke="black" fill="none" class="connection" style="stroke-width:2;" marker-end="url(#mk-27687146)" mask="url(#d2-3480617744)" /><text x="112.000000" y="232.000000" fill="#676C7E" class="text-mono-italic fill-N2" style="text-anchor:middle;font-size:16px">SEND</text></g><g id="NETWORK.CELL TOWER.(satellites -&gt; transmitter)[1]"><path d="M 180.008264 167.999983 C 180.199997 214.399994 180.250000 238.699997 180.250000 283.500000" stroke="black" fill="none" class="connection" style="stroke-width:2;" marker-end="url(#mk-27687146)" mask="url(#d2-3480617744)" /><text x="180.000000" y="232.000000" fill="#676C7E" class="text-mono-italic fill-N2" style="text-anchor:middle;font-size:16px">SEND</text></g><g id="NETWORK.CELL TOWER.(satellites -&gt; transmitter)[2]"><path d="M 210.262632 167.551051 C 248.399994 214.399994 248.250000 238.699997 210.785712 284.406432" stroke="black" fill="none" class="connection" style="stroke-width:2;" marker-end="url(#mk-27687146)" mask="url(#d2-3480617744)" /><text x="248.000000" y="232.000000" fill="#676C7E" class="text-mono-italic fill-N2" style="text-anchor:middle;font-size:16px">SEND</text></g><mask id="d2-3480617744" maskUnits="userSpaceOnUse" x="22" y="-22" width="316" height="436">
-||||||| parent of 33280fed5 (fixed e2e tests)
-</defs><g id="NETWORK"><g class="shape" ><rect x="23.000000" y="19.000000" width="314.000000" height="394.000000" stroke="black" fill="#E7E9EE" style="stroke-width:2;" /><rect x="23.000000" y="19.000000" width="314.000000" height="394.000000" class="dots-overlay" style="stroke-width:2;" /><rect x="28.000000" y="24.000000" width="304.000000" height="384.000000" stroke="black" fill="transparent" style="stroke-width:2;" /></g><text x="180.000000" y="6.000000" class="text-mono fill-N1" style="text-anchor:middle;font-size:28px">NETWORK</text></g><g id="NETWORK.CELL TOWER"><g class="shape" ><rect x="53.000000" y="60.000000" width="254.000000" height="323.000000" stroke="black" fill="#F5F6F9" style="stroke-width:2;" /><rect x="53.000000" y="60.000000" width="254.000000" height="323.000000" class="dots-overlay" style="stroke-width:2;" /></g><text x="180.000000" y="48.000000" class="text-mono fill-N1" style="text-anchor:middle;font-size:24px">CELL TOWER</text></g><g id="NETWORK.CELL TOWER.satellites"><g class="shape" ><path d="M 125 90 H 271 C 267 90 256 108 256 123 C 256 138 267 156 271 156 H 125 C 121 156 110 138 110 123 C 110 108 121 90 125 90 Z" stroke="black" fill="white" style="stroke-width:2;" /><path d="M 115 100 H 261 C 257 100 246 118 246 133 C 246 148 257 166 261 166 H 115 C 111 166 100 148 100 133 C 100 118 111 100 115 100 Z" stroke="black" fill="white" style="stroke-width:2;" /></g><text x="180.500000" y="138.500000" class="text-mono-bold fill-N1" style="text-anchor:middle;font-size:16px">SATELLITES</text></g><g id="NETWORK.CELL TOWER.transmitter"><g class="shape" ><rect x="105.000000" y="287.000000" width="151.000000" height="66.000000" stroke="black" fill="white" style="stroke-width:2;" /></g><text x="180.500000" y="325.500000" class="text-mono-bold fill-N1" style="text-anchor:middle;font-size:16px">TRANSMITTER</text></g><g id="NETWORK.CELL TOWER.(satellites -&gt; transmitter)[0]"><marker id="mk-27687146" markerWidth="10.000000" markerHeight="12.000000" refX="7.000000" refY="6.000000" viewBox="0.000000 0.000000 10.000000 12.000000" orient="auto" markerUnits="userSpaceOnUse"> <polygon points="0.000000,0.000000 10.000000,6.000000 0.000000,12.000000" fill="black" class="connection" stroke-width="2" /> </marker><path d="M 150.729685 167.544766 C 112.198997 214.399994 112.250000 238.699997 149.714288 284.406432" stroke="black" fill="none" class="connection" style="stroke-width:2;" marker-end="url(#mk-27687146)" mask="url(#d2-3480617744)" /><text x="112.000000" y="232.000000" class="text-mono-italic fill-N2" style="text-anchor:middle;font-size:16px">SEND</text></g><g id="NETWORK.CELL TOWER.(satellites -&gt; transmitter)[1]"><path d="M 180.008264 167.999983 C 180.199997 214.399994 180.250000 238.699997 180.250000 283.500000" stroke="black" fill="none" class="connection" style="stroke-width:2;" marker-end="url(#mk-27687146)" mask="url(#d2-3480617744)" /><text x="180.000000" y="232.000000" class="text-mono-italic fill-N2" style="text-anchor:middle;font-size:16px">SEND</text></g><g id="NETWORK.CELL TOWER.(satellites -&gt; transmitter)[2]"><path d="M 210.262632 167.551051 C 248.399994 214.399994 248.250000 238.699997 210.785712 284.406432" stroke="black" fill="none" class="connection" style="stroke-width:2;" marker-end="url(#mk-27687146)" mask="url(#d2-3480617744)" /><text x="248.000000" y="232.000000" class="text-mono-italic fill-N2" style="text-anchor:middle;font-size:16px">SEND</text></g><mask id="d2-3480617744" maskUnits="userSpaceOnUse" x="22" y="-22" width="316" height="436">
-=======
-</defs><g id="NETWORK"><g class="shape" ><rect x="23.000000" y="19.000000" width="314.000000" height="394.000000" stroke="black" fill="#E7E9EE" style="stroke-width:2;" /><rect x="23.000000" y="19.000000" width="314.000000" height="394.000000" class="dots-overlay" style="stroke-width:2;" /><rect x="28.000000" y="24.000000" width="304.000000" height="384.000000" stroke="black" fill="transparent" style="stroke-width:2;" /></g><text x="180.000000" y="6.000000" class="text-mono fill-N1" style="text-anchor:middle;font-size:28px">NETWORK</text></g><g id="NETWORK.CELL TOWER"><g class="shape" ><rect x="53.000000" y="60.000000" width="254.000000" height="323.000000" stroke="black" fill="#F5F6F9" style="stroke-width:2;" /><rect x="53.000000" y="60.000000" width="254.000000" height="323.000000" class="dots-overlay" style="stroke-width:2;" /></g><text x="180.000000" y="48.000000" class="text-mono fill-N1" style="text-anchor:middle;font-size:24px">CELL TOWER</text></g><g id="NETWORK.CELL TOWER.satellites"><g class="shape" ><path d="M 125 90 H 271 C 267 90 256 108 256 123 C 256 138 267 156 271 156 H 125 C 121 156 110 138 110 123 C 110 108 121 90 125 90 Z" stroke="black" fill="white" style="stroke-width:2;" /><path d="M 115 100 H 261 C 257 100 246 118 246 133 C 246 148 257 166 261 166 H 115 C 111 166 100 148 100 133 C 100 118 111 100 115 100 Z" stroke="black" fill="white" style="stroke-width:2;" /></g><text x="180.500000" y="138.500000" class="text-mono-bold fill-N1" style="text-anchor:middle;font-size:16px">SATELLITES</text></g><g id="NETWORK.CELL TOWER.transmitter"><g class="shape" ><rect x="105.000000" y="287.000000" width="151.000000" height="66.000000" stroke="black" fill="white" style="stroke-width:2;" /></g><text x="180.500000" y="325.500000" class="text-mono-bold fill-N1" style="text-anchor:middle;font-size:16px">TRANSMITTER</text></g><g id="NETWORK.CELL TOWER.(satellites -&gt; transmitter)[0]"><marker id="mk-27687146" markerWidth="10.000000" markerHeight="12.000000" refX="7.000000" refY="6.000000" viewBox="0.000000 0.000000 10.000000 12.000000" orient="auto" markerUnits="userSpaceOnUse"> <polygon points="0.000000,0.000000 10.000000,6.000000 0.000000,12.000000" fill="black" class="connection" stroke-width="2" /> </marker><path d="M 150.729685 167.544766 C 112.198997 214.399994 112.250000 238.699997 149.714288 284.406432" stroke="black" fill="none" class="connection" style="stroke-width:2;" marker-end="url(#mk-27687146)" mask="url(#d2-2028191254)" /><text x="112.000000" y="232.000000" class="text-mono-italic fill-N2" style="text-anchor:middle;font-size:16px">SEND</text></g><g id="NETWORK.CELL TOWER.(satellites -&gt; transmitter)[1]"><path d="M 180.008264 167.999983 C 180.199997 214.399994 180.250000 238.699997 180.250000 283.500000" stroke="black" fill="none" class="connection" style="stroke-width:2;" marker-end="url(#mk-27687146)" mask="url(#d2-2028191254)" /><text x="180.000000" y="232.000000" class="text-mono-italic fill-N2" style="text-anchor:middle;font-size:16px">SEND</text></g><g id="NETWORK.CELL TOWER.(satellites -&gt; transmitter)[2]"><path d="M 210.262632 167.551051 C 248.399994 214.399994 248.250000 238.699997 210.785712 284.406432" stroke="black" fill="none" class="connection" style="stroke-width:2;" marker-end="url(#mk-27687146)" mask="url(#d2-2028191254)" /><text x="248.000000" y="232.000000" class="text-mono-italic fill-N2" style="text-anchor:middle;font-size:16px">SEND</text></g><mask id="d2-2028191254" maskUnits="userSpaceOnUse" x="22" y="-22" width="316" height="436">
->>>>>>> 33280fed5 (fixed e2e tests)
 <rect x="22" y="-22" width="316" height="436" fill="white"></rect>
 <rect x="122.000000" y="-22.000000" width="116" height="36" fill="rgba(0,0,0,0.75)"></rect>
 <rect x="108.500000" y="24.000000" width="143" height="31" fill="rgba(0,0,0,0.75)"></rect>

e2etests/testdata/patterns/root-dots-with-fill/dagre/sketch.exp.svg

@@ -1,22 +1,6 @@
-<<<<<<< HEAD
+<?xml version="1.0" encoding="utf-8"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" d2Version="v0.6.8-HEAD" preserveAspectRatio="xMinYMin meet" viewBox="0 0 350 400"><svg id="d2-svg" class="d2-1730354970" width="350" height="400" viewBox="-1 -1 350 400"><rect x="-1.000000" y="-1.000000" width="350.000000" height="400.000000" rx="0.000000" fill="honeydew" stroke-width="0" /><rect x="-1.000000" y="-1.000000" width="350.000000" height="400.000000" rx="0.000000" class="dots-overlay" stroke-width="0" /><style type="text/css"><![CDATA[
-<<<<<<< HEAD
-<?xml version="1.0" encoding="utf-8"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" d2Version="v0.6.8-HEAD" preserveAspectRatio="xMinYMin meet" viewBox="0 0 350 400"><svg id="d2-svg" class="d2-1506362080" width="350" height="400" viewBox="-1 -1 350 400"><rect x="-1.000000" y="-1.000000" width="350.000000" height="400.000000" rx="0.000000" fill="honeydew" stroke-width="0" /><rect x="-1.000000" y="-1.000000" width="350.000000" height="400.000000" rx="0.000000" class="dots-overlay" stroke-width="0" /><style type="text/css"><![CDATA[
-.d2-1506362080 .text-bold {
-	font-family: "d2-1506362080-font-bold";
-||||||| parent of 33280fed5 (fixed e2e tests)
-<?xml version="1.0" encoding="utf-8"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" d2Version="v0.6.6-HEAD" preserveAspectRatio="xMinYMin meet" viewBox="0 0 350 400"><svg id="d2-svg" class="d2-1506362080" width="350" height="400" viewBox="-1 -1 350 400"><rect x="-1.000000" y="-1.000000" width="350.000000" height="400.000000" rx="0.000000" fill="honeydew" stroke-width="0" /><rect x="-1.000000" y="-1.000000" width="350.000000" height="400.000000" rx="0.000000" class="dots-overlay" stroke-width="0" /><style type="text/css"><![CDATA[
-.d2-1506362080 .text-bold {
-	font-family: "d2-1506362080-font-bold";
-=======
-<?xml version="1.0" encoding="utf-8"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" d2Version="v0.6.5-HEAD" preserveAspectRatio="xMinYMin meet" viewBox="0 0 350 400"><svg id="d2-svg" class="d2-1730354970" width="350" height="400" viewBox="-1 -1 350 400"><rect x="-1.000000" y="-1.000000" width="350.000000" height="400.000000" rx="0.000000" fill="honeydew" stroke-width="0" /><rect x="-1.000000" y="-1.000000" width="350.000000" height="400.000000" rx="0.000000" class="dots-overlay" stroke-width="0" /><style type="text/css"><![CDATA[
-||||||| parent of cb2f2823c (Fix changes)
-<?xml version="1.0" encoding="utf-8"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" d2Version="v0.6.5-HEAD" preserveAspectRatio="xMinYMin meet" viewBox="0 0 350 400"><svg id="d2-svg" class="d2-1730354970" width="350" height="400" viewBox="-1 -1 350 400"><rect x="-1.000000" y="-1.000000" width="350.000000" height="400.000000" rx="0.000000" fill="honeydew" stroke-width="0" /><rect x="-1.000000" y="-1.000000" width="350.000000" height="400.000000" rx="0.000000" class="dots-overlay" stroke-width="0" /><style type="text/css"><![CDATA[
-=======
-<?xml version="1.0" encoding="utf-8"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" d2Version="v0.6.6-HEAD" preserveAspectRatio="xMinYMin meet" viewBox="0 0 350 400"><svg id="d2-svg" class="d2-1730354970" width="350" height="400" viewBox="-1 -1 350 400"><rect x="-1.000000" y="-1.000000" width="350.000000" height="400.000000" rx="0.000000" fill="honeydew" stroke-width="0" /><rect x="-1.000000" y="-1.000000" width="350.000000" height="400.000000" rx="0.000000" class="dots-overlay" stroke-width="0" /><style type="text/css"><![CDATA[
->>>>>>> cb2f2823c (Fix changes)
 .d2-1730354970 .text-bold {
 	font-family: "d2-1730354970-font-bold";
->>>>>>> 33280fed5 (fixed e2e tests)
 }
 @font-face {
 	font-family: d2-1730354970-font-bold;
@@ -138,13 +122,7 @@
 <rect x="7" y="7" width="1" height="1" fill="#0A0F25"/>
 </g>
 </pattern>
-<<<<<<< HEAD
+</defs><g id="x"><g class="shape" ><rect x="191.000000" y="0.000000" width="53.000000" height="66.000000" stroke="#0D32B2" fill="#F7F8FE" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="217.500000" y="38.500000" fill="#0A0F25" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">x</text></g><g id="y"><g class="shape" ><rect x="0.000000" y="166.000000" width="54.000000" height="66.000000" stroke="#0D32B2" fill="#F7F8FE" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="27.000000" y="204.500000" fill="#0A0F25" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">y</text></g><g id="z"><g class="shape" ><rect x="162.000000" y="332.000000" width="52.000000" height="66.000000" stroke="#0D32B2" fill="#F7F8FE" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="188.000000" y="370.500000" fill="#0A0F25" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">z</text></g><g id="abcd"><g class="shape" ><rect x="114.000000" y="166.000000" width="80.000000" height="66.000000" stroke="#0D32B2" fill="#F7F8FE" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="154.000000" y="204.500000" fill="#0A0F25" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">abcd</text></g><g id="g"><g class="shape" ><rect x="254.000000" y="166.000000" width="54.000000" height="66.000000" stroke="#0D32B2" fill="#F7F8FE" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="281.000000" y="204.500000" fill="#0A0F25" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">g</text></g><g id="(x -&gt; y)[0]"><marker id="mk-3488378134" markerWidth="10.000000" markerHeight="12.000000" refX="7.000000" refY="6.000000" viewBox="0.000000 0.000000 10.000000 12.000000" orient="auto" markerUnits="userSpaceOnUse"> <polygon points="0.000000,0.000000 10.000000,6.000000 0.000000,12.000000" fill="#0D32B2" class="connection fill-B1" stroke-width="2" /> </marker><path d="M 189.164614 45.794582 C 59.799000 101.800003 27.000000 126.000000 27.000000 162.000000" stroke="#0D32B2" fill="none" class="connection stroke-B1" style="stroke-width:2;" marker-end="url(#mk-3488378134)" mask="url(#d2-1730354970)" /></g><g id="(y -&gt; z)[0]"><path d="M 27.000000 234.000000 C 27.000000 272.000000 53.900002 295.910004 157.946979 349.716585" stroke="#0D32B2" fill="none" class="connection stroke-B1" style="stroke-width:2;" marker-end="url(#mk-3488378134)" mask="url(#d2-1730354970)" /></g><g id="(x -&gt; abcd)[0]"><path d="M 190.789834 67.592325 C 161.600006 106.000000 154.000000 126.000000 154.000000 162.000000" stroke="#0D32B2" fill="none" class="connection stroke-B1" style="stroke-width:2;" marker-end="url(#mk-3488378134)" mask="url(#d2-1730354970)" /></g><g id="(x -&gt; g)[0]"><path d="M 244.210166 67.592325 C 273.399994 106.000000 281.000000 126.000000 281.000000 162.000000" stroke="#0D32B2" fill="none" class="connection stroke-B1" style="stroke-width:2;" marker-end="url(#mk-3488378134)" mask="url(#d2-1730354970)" /></g><g id="(x -&gt; z)[0]"><path d="M 245.688659 51.071649 C 327.200012 102.800003 348.000000 132.600006 348.000000 157.500000 C 348.000000 182.399994 321.200012 295.799988 217.556225 349.168809" stroke="#0D32B2" fill="none" class="connection stroke-B1" style="stroke-width:2;" marker-end="url(#mk-3488378134)" mask="url(#d2-1730354970)" /></g><mask id="d2-1730354970" maskUnits="userSpaceOnUse" x="-1" y="-1" width="350" height="400">
-</defs><g id="x"><g class="shape" ><rect x="191.000000" y="0.000000" width="53.000000" height="66.000000" stroke="#0D32B2" fill="#F7F8FE" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="217.500000" y="38.500000" fill="#0A0F25" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">x</text></g><g id="y"><g class="shape" ><rect x="0.000000" y="166.000000" width="54.000000" height="66.000000" stroke="#0D32B2" fill="#F7F8FE" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="27.000000" y="204.500000" fill="#0A0F25" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">y</text></g><g id="z"><g class="shape" ><rect x="162.000000" y="332.000000" width="52.000000" height="66.000000" stroke="#0D32B2" fill="#F7F8FE" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="188.000000" y="370.500000" fill="#0A0F25" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">z</text></g><g id="abcd"><g class="shape" ><rect x="114.000000" y="166.000000" width="80.000000" height="66.000000" stroke="#0D32B2" fill="#F7F8FE" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="154.000000" y="204.500000" fill="#0A0F25" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">abcd</text></g><g id="g"><g class="shape" ><rect x="254.000000" y="166.000000" width="54.000000" height="66.000000" stroke="#0D32B2" fill="#F7F8FE" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="281.000000" y="204.500000" fill="#0A0F25" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">g</text></g><g id="(x -&gt; y)[0]"><marker id="mk-3488378134" markerWidth="10.000000" markerHeight="12.000000" refX="7.000000" refY="6.000000" viewBox="0.000000 0.000000 10.000000 12.000000" orient="auto" markerUnits="userSpaceOnUse"> <polygon points="0.000000,0.000000 10.000000,6.000000 0.000000,12.000000" fill="#0D32B2" class="connection fill-B1" stroke-width="2" /> </marker><path d="M 189.164614 45.794582 C 59.799000 101.800003 27.000000 126.000000 27.000000 162.000000" stroke="#0D32B2" fill="none" class="connection stroke-B1" style="stroke-width:2;" marker-end="url(#mk-3488378134)" mask="url(#d2-1506362080)" /></g><g id="(y -&gt; z)[0]"><path d="M 27.000000 234.000000 C 27.000000 272.000000 53.900002 295.910004 157.946979 349.716585" stroke="#0D32B2" fill="none" class="connection stroke-B1" style="stroke-width:2;" marker-end="url(#mk-3488378134)" mask="url(#d2-1506362080)" /></g><g id="(x -&gt; abcd)[0]"><path d="M 190.789834 67.592325 C 161.600006 106.000000 154.000000 126.000000 154.000000 162.000000" stroke="#0D32B2" fill="none" class="connection stroke-B1" style="stroke-width:2;" marker-end="url(#mk-3488378134)" mask="url(#d2-1506362080)" /></g><g id="(x -&gt; g)[0]"><path d="M 244.210166 67.592325 C 273.399994 106.000000 281.000000 126.000000 281.000000 162.000000" stroke="#0D32B2" fill="none" class="connection stroke-B1" style="stroke-width:2;" marker-end="url(#mk-3488378134)" mask="url(#d2-1506362080)" /></g><g id="(x -&gt; z)[0]"><path d="M 245.688659 51.071649 C 327.200012 102.800003 348.000000 132.600006 348.000000 157.500000 C 348.000000 182.399994 321.200012 295.799988 217.556225 349.168809" stroke="#0D32B2" fill="none" class="connection stroke-B1" style="stroke-width:2;" marker-end="url(#mk-3488378134)" mask="url(#d2-1506362080)" /></g><mask id="d2-1506362080" maskUnits="userSpaceOnUse" x="-1" y="-1" width="350" height="400">
-||||||| parent of 33280fed5 (fixed e2e tests)
-</defs><g id="x"><g class="shape" ><rect x="191.000000" y="0.000000" width="53.000000" height="66.000000" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="217.500000" y="38.500000" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">x</text></g><g id="y"><g class="shape" ><rect x="0.000000" y="166.000000" width="54.000000" height="66.000000" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="27.000000" y="204.500000" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">y</text></g><g id="z"><g class="shape" ><rect x="162.000000" y="332.000000" width="52.000000" height="66.000000" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="188.000000" y="370.500000" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">z</text></g><g id="abcd"><g class="shape" ><rect x="114.000000" y="166.000000" width="80.000000" height="66.000000" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="154.000000" y="204.500000" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">abcd</text></g><g id="g"><g class="shape" ><rect x="254.000000" y="166.000000" width="54.000000" height="66.000000" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="281.000000" y="204.500000" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">g</text></g><g id="(x -&gt; y)[0]"><marker id="mk-3488378134" markerWidth="10.000000" markerHeight="12.000000" refX="7.000000" refY="6.000000" viewBox="0.000000 0.000000 10.000000 12.000000" orient="auto" markerUnits="userSpaceOnUse"> <polygon points="0.000000,0.000000 10.000000,6.000000 0.000000,12.000000" class="connection fill-B1" stroke-width="2" /> </marker><path d="M 189.164614 45.794582 C 59.799000 101.800003 27.000000 126.000000 27.000000 162.000000" fill="none" class="connection stroke-B1" style="stroke-width:2;" marker-end="url(#mk-3488378134)" mask="url(#d2-1506362080)" /></g><g id="(y -&gt; z)[0]"><path d="M 27.000000 234.000000 C 27.000000 272.000000 53.900002 295.910004 157.946979 349.716585" fill="none" class="connection stroke-B1" style="stroke-width:2;" marker-end="url(#mk-3488378134)" mask="url(#d2-1506362080)" /></g><g id="(x -&gt; abcd)[0]"><path d="M 190.789834 67.592325 C 161.600006 106.000000 154.000000 126.000000 154.000000 162.000000" fill="none" class="connection stroke-B1" style="stroke-width:2;" marker-end="url(#mk-3488378134)" mask="url(#d2-1506362080)" /></g><g id="(x -&gt; g)[0]"><path d="M 244.210166 67.592325 C 273.399994 106.000000 281.000000 126.000000 281.000000 162.000000" fill="none" class="connection stroke-B1" style="stroke-width:2;" marker-end="url(#mk-3488378134)" mask="url(#d2-1506362080)" /></g><g id="(x -&gt; z)[0]"><path d="M 245.688659 51.071649 C 327.200012 102.800003 348.000000 132.600006 348.000000 157.500000 C 348.000000 182.399994 321.200012 295.799988 217.556225 349.168809" fill="none" class="connection stroke-B1" style="stroke-width:2;" marker-end="url(#mk-3488378134)" mask="url(#d2-1506362080)" /></g><mask id="d2-1506362080" maskUnits="userSpaceOnUse" x="-1" y="-1" width="350" height="400">
-=======
-</defs><g id="x"><g class="shape" ><rect x="191.000000" y="0.000000" width="53.000000" height="66.000000" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="217.500000" y="38.500000" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">x</text></g><g id="y"><g class="shape" ><rect x="0.000000" y="166.000000" width="54.000000" height="66.000000" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="27.000000" y="204.500000" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">y</text></g><g id="z"><g class="shape" ><rect x="162.000000" y="332.000000" width="52.000000" height="66.000000" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="188.000000" y="370.500000" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">z</text></g><g id="abcd"><g class="shape" ><rect x="114.000000" y="166.000000" width="80.000000" height="66.000000" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="154.000000" y="204.500000" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">abcd</text></g><g id="g"><g class="shape" ><rect x="254.000000" y="166.000000" width="54.000000" height="66.000000" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="281.000000" y="204.500000" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">g</text></g><g id="(x -&gt; y)[0]"><marker id="mk-3488378134" markerWidth="10.000000" markerHeight="12.000000" refX="7.000000" refY="6.000000" viewBox="0.000000 0.000000 10.000000 12.000000" orient="auto" markerUnits="userSpaceOnUse"> <polygon points="0.000000,0.000000 10.000000,6.000000 0.000000,12.000000" class="connection fill-B1" stroke-width="2" /> </marker><path d="M 189.164614 45.794582 C 59.799000 101.800003 27.000000 126.000000 27.000000 162.000000" fill="none" class="connection stroke-B1" style="stroke-width:2;" marker-end="url(#mk-3488378134)" mask="url(#d2-1730354970)" /></g><g id="(y -&gt; z)[0]"><path d="M 27.000000 234.000000 C 27.000000 272.000000 53.900002 295.910004 157.946979 349.716585" fill="none" class="connection stroke-B1" style="stroke-width:2;" marker-end="url(#mk-3488378134)" mask="url(#d2-1730354970)" /></g><g id="(x -&gt; abcd)[0]"><path d="M 190.789834 67.592325 C 161.600006 106.000000 154.000000 126.000000 154.000000 162.000000" fill="none" class="connection stroke-B1" style="stroke-width:2;" marker-end="url(#mk-3488378134)" mask="url(#d2-1730354970)" /></g><g id="(x -&gt; g)[0]"><path d="M 244.210166 67.592325 C 273.399994 106.000000 281.000000 126.000000 281.000000 162.000000" fill="none" class="connection stroke-B1" style="stroke-width:2;" marker-end="url(#mk-3488378134)" mask="url(#d2-1730354970)" /></g><g id="(x -&gt; z)[0]"><path d="M 245.688659 51.071649 C 327.200012 102.800003 348.000000 132.600006 348.000000 157.500000 C 348.000000 182.399994 321.200012 295.799988 217.556225 349.168809" fill="none" class="connection stroke-B1" style="stroke-width:2;" marker-end="url(#mk-3488378134)" mask="url(#d2-1730354970)" /></g><mask id="d2-1730354970" maskUnits="userSpaceOnUse" x="-1" y="-1" width="350" height="400">
->>>>>>> 33280fed5 (fixed e2e tests)
 <rect x="-1" y="-1" width="350" height="400" fill="white"></rect>
 <rect x="213.500000" y="22.500000" width="8" height="21" fill="rgba(0,0,0,0.75)"></rect>
 <rect x="22.500000" y="188.500000" width="9" height="21" fill="rgba(0,0,0,0.75)"></rect>

e2etests/testdata/patterns/root-dots/dagre/sketch.exp.svg

@@ -1,22 +1,6 @@
-<<<<<<< HEAD
+<?xml version="1.0" encoding="utf-8"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" d2Version="v0.6.8-HEAD" preserveAspectRatio="xMinYMin meet" viewBox="0 0 350 400"><svg id="d2-svg" class="d2-4295728" width="350" height="400" viewBox="-1 -1 350 400"><rect x="-1.000000" y="-1.000000" width="350.000000" height="400.000000" rx="0.000000" fill="#FFFFFF" class=" fill-N7" stroke-width="0" /><rect x="-1.000000" y="-1.000000" width="350.000000" height="400.000000" rx="0.000000" class="dots-overlay" stroke-width="0" /><style type="text/css"><![CDATA[
-<<<<<<< HEAD
-<?xml version="1.0" encoding="utf-8"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" d2Version="v0.6.8-HEAD" preserveAspectRatio="xMinYMin meet" viewBox="0 0 350 400"><svg id="d2-svg" class="d2-2102253258" width="350" height="400" viewBox="-1 -1 350 400"><rect x="-1.000000" y="-1.000000" width="350.000000" height="400.000000" rx="0.000000" fill="#FFFFFF" class=" fill-N7" stroke-width="0" /><rect x="-1.000000" y="-1.000000" width="350.000000" height="400.000000" rx="0.000000" class="dots-overlay" stroke-width="0" /><style type="text/css"><![CDATA[
-.d2-2102253258 .text-bold {
-	font-family: "d2-2102253258-font-bold";
-||||||| parent of 33280fed5 (fixed e2e tests)
-<?xml version="1.0" encoding="utf-8"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" d2Version="v0.6.6-HEAD" preserveAspectRatio="xMinYMin meet" viewBox="0 0 350 400"><svg id="d2-svg" class="d2-2102253258" width="350" height="400" viewBox="-1 -1 350 400"><rect x="-1.000000" y="-1.000000" width="350.000000" height="400.000000" rx="0.000000" class=" fill-N7" stroke-width="0" /><rect x="-1.000000" y="-1.000000" width="350.000000" height="400.000000" rx="0.000000" class="dots-overlay" stroke-width="0" /><style type="text/css"><![CDATA[
-.d2-2102253258 .text-bold {
-	font-family: "d2-2102253258-font-bold";
-=======
-<?xml version="1.0" encoding="utf-8"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" d2Version="v0.6.5-HEAD" preserveAspectRatio="xMinYMin meet" viewBox="0 0 350 400"><svg id="d2-svg" class="d2-4295728" width="350" height="400" viewBox="-1 -1 350 400"><rect x="-1.000000" y="-1.000000" width="350.000000" height="400.000000" rx="0.000000" class=" fill-N7" stroke-width="0" /><rect x="-1.000000" y="-1.000000" width="350.000000" height="400.000000" rx="0.000000" class="dots-overlay" stroke-width="0" /><style type="text/css"><![CDATA[
-||||||| parent of cb2f2823c (Fix changes)
-<?xml version="1.0" encoding="utf-8"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" d2Version="v0.6.5-HEAD" preserveAspectRatio="xMinYMin meet" viewBox="0 0 350 400"><svg id="d2-svg" class="d2-4295728" width="350" height="400" viewBox="-1 -1 350 400"><rect x="-1.000000" y="-1.000000" width="350.000000" height="400.000000" rx="0.000000" class=" fill-N7" stroke-width="0" /><rect x="-1.000000" y="-1.000000" width="350.000000" height="400.000000" rx="0.000000" class="dots-overlay" stroke-width="0" /><style type="text/css"><![CDATA[
-=======
-<?xml version="1.0" encoding="utf-8"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" d2Version="v0.6.6-HEAD" preserveAspectRatio="xMinYMin meet" viewBox="0 0 350 400"><svg id="d2-svg" class="d2-4295728" width="350" height="400" viewBox="-1 -1 350 400"><rect x="-1.000000" y="-1.000000" width="350.000000" height="400.000000" rx="0.000000" class=" fill-N7" stroke-width="0" /><rect x="-1.000000" y="-1.000000" width="350.000000" height="400.000000" rx="0.000000" class="dots-overlay" stroke-width="0" /><style type="text/css"><![CDATA[
->>>>>>> cb2f2823c (Fix changes)
 .d2-4295728 .text-bold {
 	font-family: "d2-4295728-font-bold";
->>>>>>> 33280fed5 (fixed e2e tests)
 }
 @font-face {
 	font-family: d2-4295728-font-bold;
@@ -138,13 +122,7 @@
 <rect x="7" y="7" width="1" height="1" fill="#0A0F25"/>
 </g>
 </pattern>
-<<<<<<< HEAD
+</defs><g id="x"><g class="shape" ><rect x="191.000000" y="0.000000" width="53.000000" height="66.000000" stroke="#0D32B2" fill="#F7F8FE" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="217.500000" y="38.500000" fill="#0A0F25" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">x</text></g><g id="y"><g class="shape" ><rect x="0.000000" y="166.000000" width="54.000000" height="66.000000" stroke="#0D32B2" fill="#F7F8FE" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="27.000000" y="204.500000" fill="#0A0F25" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">y</text></g><g id="z"><g class="shape" ><rect x="162.000000" y="332.000000" width="52.000000" height="66.000000" stroke="#0D32B2" fill="#F7F8FE" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="188.000000" y="370.500000" fill="#0A0F25" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">z</text></g><g id="abcd"><g class="shape" ><rect x="114.000000" y="166.000000" width="80.000000" height="66.000000" stroke="#0D32B2" fill="#F7F8FE" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="154.000000" y="204.500000" fill="#0A0F25" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">abcd</text></g><g id="g"><g class="shape" ><rect x="254.000000" y="166.000000" width="54.000000" height="66.000000" stroke="#0D32B2" fill="#F7F8FE" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="281.000000" y="204.500000" fill="#0A0F25" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">g</text></g><g id="(x -&gt; y)[0]"><marker id="mk-3488378134" markerWidth="10.000000" markerHeight="12.000000" refX="7.000000" refY="6.000000" viewBox="0.000000 0.000000 10.000000 12.000000" orient="auto" markerUnits="userSpaceOnUse"> <polygon points="0.000000,0.000000 10.000000,6.000000 0.000000,12.000000" fill="#0D32B2" class="connection fill-B1" stroke-width="2" /> </marker><path d="M 189.164614 45.794582 C 59.799000 101.800003 27.000000 126.000000 27.000000 162.000000" stroke="#0D32B2" fill="none" class="connection stroke-B1" style="stroke-width:2;" marker-end="url(#mk-3488378134)" mask="url(#d2-4295728)" /></g><g id="(y -&gt; z)[0]"><path d="M 27.000000 234.000000 C 27.000000 272.000000 53.900002 295.910004 157.946979 349.716585" stroke="#0D32B2" fill="none" class="connection stroke-B1" style="stroke-width:2;" marker-end="url(#mk-3488378134)" mask="url(#d2-4295728)" /></g><g id="(x -&gt; abcd)[0]"><path d="M 190.789834 67.592325 C 161.600006 106.000000 154.000000 126.000000 154.000000 162.000000" stroke="#0D32B2" fill="none" class="connection stroke-B1" style="stroke-width:2;" marker-end="url(#mk-3488378134)" mask="url(#d2-4295728)" /></g><g id="(x -&gt; g)[0]"><path d="M 244.210166 67.592325 C 273.399994 106.000000 281.000000 126.000000 281.000000 162.000000" stroke="#0D32B2" fill="none" class="connection stroke-B1" style="stroke-width:2;" marker-end="url(#mk-3488378134)" mask="url(#d2-4295728)" /></g><g id="(x -&gt; z)[0]"><path d="M 245.688659 51.071649 C 327.200012 102.800003 348.000000 132.600006 348.000000 157.500000 C 348.000000 182.399994 321.200012 295.799988 217.556225 349.168809" stroke="#0D32B2" fill="none" class="connection stroke-B1" style="stroke-width:2;" marker-end="url(#mk-3488378134)" mask="url(#d2-4295728)" /></g><mask id="d2-4295728" maskUnits="userSpaceOnUse" x="-1" y="-1" width="350" height="400">
-</defs><g id="x"><g class="shape" ><rect x="191.000000" y="0.000000" width="53.000000" height="66.000000" stroke="#0D32B2" fill="#F7F8FE" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="217.500000" y="38.500000" fill="#0A0F25" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">x</text></g><g id="y"><g class="shape" ><rect x="0.000000" y="166.000000" width="54.000000" height="66.000000" stroke="#0D32B2" fill="#F7F8FE" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="27.000000" y="204.500000" fill="#0A0F25" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">y</text></g><g id="z"><g class="shape" ><rect x="162.000000" y="332.000000" width="52.000000" height="66.000000" stroke="#0D32B2" fill="#F7F8FE" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="188.000000" y="370.500000" fill="#0A0F25" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">z</text></g><g id="abcd"><g class="shape" ><rect x="114.000000" y="166.000000" width="80.000000" height="66.000000" stroke="#0D32B2" fill="#F7F8FE" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="154.000000" y="204.500000" fill="#0A0F25" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">abcd</text></g><g id="g"><g class="shape" ><rect x="254.000000" y="166.000000" width="54.000000" height="66.000000" stroke="#0D32B2" fill="#F7F8FE" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="281.000000" y="204.500000" fill="#0A0F25" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">g</text></g><g id="(x -&gt; y)[0]"><marker id="mk-3488378134" markerWidth="10.000000" markerHeight="12.000000" refX="7.000000" refY="6.000000" viewBox="0.000000 0.000000 10.000000 12.000000" orient="auto" markerUnits="userSpaceOnUse"> <polygon points="0.000000,0.000000 10.000000,6.000000 0.000000,12.000000" fill="#0D32B2" class="connection fill-B1" stroke-width="2" /> </marker><path d="M 189.164614 45.794582 C 59.799000 101.800003 27.000000 126.000000 27.000000 162.000000" stroke="#0D32B2" fill="none" class="connection stroke-B1" style="stroke-width:2;" marker-end="url(#mk-3488378134)" mask="url(#d2-2102253258)" /></g><g id="(y -&gt; z)[0]"><path d="M 27.000000 234.000000 C 27.000000 272.000000 53.900002 295.910004 157.946979 349.716585" stroke="#0D32B2" fill="none" class="connection stroke-B1" style="stroke-width:2;" marker-end="url(#mk-3488378134)" mask="url(#d2-2102253258)" /></g><g id="(x -&gt; abcd)[0]"><path d="M 190.789834 67.592325 C 161.600006 106.000000 154.000000 126.000000 154.000000 162.000000" stroke="#0D32B2" fill="none" class="connection stroke-B1" style="stroke-width:2;" marker-end="url(#mk-3488378134)" mask="url(#d2-2102253258)" /></g><g id="(x -&gt; g)[0]"><path d="M 244.210166 67.592325 C 273.399994 106.000000 281.000000 126.000000 281.000000 162.000000" stroke="#0D32B2" fill="none" class="connection stroke-B1" style="stroke-width:2;" marker-end="url(#mk-3488378134)" mask="url(#d2-2102253258)" /></g><g id="(x -&gt; z)[0]"><path d="M 245.688659 51.071649 C 327.200012 102.800003 348.000000 132.600006 348.000000 157.500000 C 348.000000 182.399994 321.200012 295.799988 217.556225 349.168809" stroke="#0D32B2" fill="none" class="connection stroke-B1" style="stroke-width:2;" marker-end="url(#mk-3488378134)" mask="url(#d2-2102253258)" /></g><mask id="d2-2102253258" maskUnits="userSpaceOnUse" x="-1" y="-1" width="350" height="400">
-||||||| parent of 33280fed5 (fixed e2e tests)
-</defs><g id="x"><g class="shape" ><rect x="191.000000" y="0.000000" width="53.000000" height="66.000000" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="217.500000" y="38.500000" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">x</text></g><g id="y"><g class="shape" ><rect x="0.000000" y="166.000000" width="54.000000" height="66.000000" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="27.000000" y="204.500000" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">y</text></g><g id="z"><g class="shape" ><rect x="162.000000" y="332.000000" width="52.000000" height="66.000000" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="188.000000" y="370.500000" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">z</text></g><g id="abcd"><g class="shape" ><rect x="114.000000" y="166.000000" width="80.000000" height="66.000000" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="154.000000" y="204.500000" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">abcd</text></g><g id="g"><g class="shape" ><rect x="254.000000" y="166.000000" width="54.000000" height="66.000000" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="281.000000" y="204.500000" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">g</text></g><g id="(x -&gt; y)[0]"><marker id="mk-3488378134" markerWidth="10.000000" markerHeight="12.000000" refX="7.000000" refY="6.000000" viewBox="0.000000 0.000000 10.000000 12.000000" orient="auto" markerUnits="userSpaceOnUse"> <polygon points="0.000000,0.000000 10.000000,6.000000 0.000000,12.000000" class="connection fill-B1" stroke-width="2" /> </marker><path d="M 189.164614 45.794582 C 59.799000 101.800003 27.000000 126.000000 27.000000 162.000000" fill="none" class="connection stroke-B1" style="stroke-width:2;" marker-end="url(#mk-3488378134)" mask="url(#d2-2102253258)" /></g><g id="(y -&gt; z)[0]"><path d="M 27.000000 234.000000 C 27.000000 272.000000 53.900002 295.910004 157.946979 349.716585" fill="none" class="connection stroke-B1" style="stroke-width:2;" marker-end="url(#mk-3488378134)" mask="url(#d2-2102253258)" /></g><g id="(x -&gt; abcd)[0]"><path d="M 190.789834 67.592325 C 161.600006 106.000000 154.000000 126.000000 154.000000 162.000000" fill="none" class="connection stroke-B1" style="stroke-width:2;" marker-end="url(#mk-3488378134)" mask="url(#d2-2102253258)" /></g><g id="(x -&gt; g)[0]"><path d="M 244.210166 67.592325 C 273.399994 106.000000 281.000000 126.000000 281.000000 162.000000" fill="none" class="connection stroke-B1" style="stroke-width:2;" marker-end="url(#mk-3488378134)" mask="url(#d2-2102253258)" /></g><g id="(x -&gt; z)[0]"><path d="M 245.688659 51.071649 C 327.200012 102.800003 348.000000 132.600006 348.000000 157.500000 C 348.000000 182.399994 321.200012 295.799988 217.556225 349.168809" fill="none" class="connection stroke-B1" style="stroke-width:2;" marker-end="url(#mk-3488378134)" mask="url(#d2-2102253258)" /></g><mask id="d2-2102253258" maskUnits="userSpaceOnUse" x="-1" y="-1" width="350" height="400">
-=======
-</defs><g id="x"><g class="shape" ><rect x="191.000000" y="0.000000" width="53.000000" height="66.000000" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="217.500000" y="38.500000" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">x</text></g><g id="y"><g class="shape" ><rect x="0.000000" y="166.000000" width="54.000000" height="66.000000" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="27.000000" y="204.500000" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">y</text></g><g id="z"><g class="shape" ><rect x="162.000000" y="332.000000" width="52.000000" height="66.000000" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="188.000000" y="370.500000" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">z</text></g><g id="abcd"><g class="shape" ><rect x="114.000000" y="166.000000" width="80.000000" height="66.000000" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="154.000000" y="204.500000" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">abcd</text></g><g id="g"><g class="shape" ><rect x="254.000000" y="166.000000" width="54.000000" height="66.000000" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="281.000000" y="204.500000" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">g</text></g><g id="(x -&gt; y)[0]"><marker id="mk-3488378134" markerWidth="10.000000" markerHeight="12.000000" refX="7.000000" refY="6.000000" viewBox="0.000000 0.000000 10.000000 12.000000" orient="auto" markerUnits="userSpaceOnUse"> <polygon points="0.000000,0.000000 10.000000,6.000000 0.000000,12.000000" class="connection fill-B1" stroke-width="2" /> </marker><path d="M 189.164614 45.794582 C 59.799000 101.800003 27.000000 126.000000 27.000000 162.000000" fill="none" class="connection stroke-B1" style="stroke-width:2;" marker-end="url(#mk-3488378134)" mask="url(#d2-4295728)" /></g><g id="(y -&gt; z)[0]"><path d="M 27.000000 234.000000 C 27.000000 272.000000 53.900002 295.910004 157.946979 349.716585" fill="none" class="connection stroke-B1" style="stroke-width:2;" marker-end="url(#mk-3488378134)" mask="url(#d2-4295728)" /></g><g id="(x -&gt; abcd)[0]"><path d="M 190.789834 67.592325 C 161.600006 106.000000 154.000000 126.000000 154.000000 162.000000" fill="none" class="connection stroke-B1" style="stroke-width:2;" marker-end="url(#mk-3488378134)" mask="url(#d2-4295728)" /></g><g id="(x -&gt; g)[0]"><path d="M 244.210166 67.592325 C 273.399994 106.000000 281.000000 126.000000 281.000000 162.000000" fill="none" class="connection stroke-B1" style="stroke-width:2;" marker-end="url(#mk-3488378134)" mask="url(#d2-4295728)" /></g><g id="(x -&gt; z)[0]"><path d="M 245.688659 51.071649 C 327.200012 102.800003 348.000000 132.600006 348.000000 157.500000 C 348.000000 182.399994 321.200012 295.799988 217.556225 349.168809" fill="none" class="connection stroke-B1" style="stroke-width:2;" marker-end="url(#mk-3488378134)" mask="url(#d2-4295728)" /></g><mask id="d2-4295728" maskUnits="userSpaceOnUse" x="-1" y="-1" width="350" height="400">
->>>>>>> 33280fed5 (fixed e2e tests)
 <rect x="-1" y="-1" width="350" height="400" fill="white"></rect>
 <rect x="213.500000" y="22.500000" width="8" height="21" fill="rgba(0,0,0,0.75)"></rect>
 <rect x="22.500000" y="188.500000" width="9" height="21" fill="rgba(0,0,0,0.75)"></rect>

e2etests/testdata/patterns/shape/dagre/sketch.exp.svg

@@ -1,22 +1,6 @@
-<<<<<<< HEAD
+<?xml version="1.0" encoding="utf-8"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" d2Version="v0.6.8-HEAD" preserveAspectRatio="xMinYMin meet" viewBox="0 0 350 400"><svg id="d2-svg" class="d2-550601415" width="350" height="400" viewBox="-1 -1 350 400"><rect x="-1.000000" y="-1.000000" width="350.000000" height="400.000000" rx="0.000000" fill="#FFFFFF" class=" fill-N7" stroke-width="0" /><style type="text/css"><![CDATA[
-<<<<<<< HEAD
-<?xml version="1.0" encoding="utf-8"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" d2Version="v0.6.8-HEAD" preserveAspectRatio="xMinYMin meet" viewBox="0 0 350 400"><svg id="d2-svg" class="d2-1252569269" width="350" height="400" viewBox="-1 -1 350 400"><rect x="-1.000000" y="-1.000000" width="350.000000" height="400.000000" rx="0.000000" fill="#FFFFFF" class=" fill-N7" stroke-width="0" /><style type="text/css"><![CDATA[
-.d2-1252569269 .text-bold {
-	font-family: "d2-1252569269-font-bold";
-||||||| parent of 33280fed5 (fixed e2e tests)
-<?xml version="1.0" encoding="utf-8"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" d2Version="v0.6.6-HEAD" preserveAspectRatio="xMinYMin meet" viewBox="0 0 350 400"><svg id="d2-svg" class="d2-1252569269" width="350" height="400" viewBox="-1 -1 350 400"><rect x="-1.000000" y="-1.000000" width="350.000000" height="400.000000" rx="0.000000" class=" fill-N7" stroke-width="0" /><style type="text/css"><![CDATA[
-.d2-1252569269 .text-bold {
-	font-family: "d2-1252569269-font-bold";
-=======
-<?xml version="1.0" encoding="utf-8"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" d2Version="v0.6.5-HEAD" preserveAspectRatio="xMinYMin meet" viewBox="0 0 350 400"><svg id="d2-svg" class="d2-550601415" width="350" height="400" viewBox="-1 -1 350 400"><rect x="-1.000000" y="-1.000000" width="350.000000" height="400.000000" rx="0.000000" class=" fill-N7" stroke-width="0" /><style type="text/css"><![CDATA[
-||||||| parent of cb2f2823c (Fix changes)
-<?xml version="1.0" encoding="utf-8"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" d2Version="v0.6.5-HEAD" preserveAspectRatio="xMinYMin meet" viewBox="0 0 350 400"><svg id="d2-svg" class="d2-550601415" width="350" height="400" viewBox="-1 -1 350 400"><rect x="-1.000000" y="-1.000000" width="350.000000" height="400.000000" rx="0.000000" class=" fill-N7" stroke-width="0" /><style type="text/css"><![CDATA[
-=======
-<?xml version="1.0" encoding="utf-8"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" d2Version="v0.6.6-HEAD" preserveAspectRatio="xMinYMin meet" viewBox="0 0 350 400"><svg id="d2-svg" class="d2-550601415" width="350" height="400" viewBox="-1 -1 350 400"><rect x="-1.000000" y="-1.000000" width="350.000000" height="400.000000" rx="0.000000" class=" fill-N7" stroke-width="0" /><style type="text/css"><![CDATA[
->>>>>>> cb2f2823c (Fix changes)
 .d2-550601415 .text-bold {
 	font-family: "d2-550601415-font-bold";
->>>>>>> 33280fed5 (fixed e2e tests)
 }
 @font-face {
 	font-family: d2-550601415-font-bold;
@@ -138,13 +122,7 @@
 <rect x="7" y="7" width="1" height="1" fill="#0A0F25"/>
 </g>
 </pattern>
-<<<<<<< HEAD
+</defs><g id="x"><g class="shape" ><rect x="191.000000" y="0.000000" width="53.000000" height="66.000000" stroke="#0D32B2" fill="#F7F8FE" class=" stroke-B1 fill-B6" style="stroke-width:2;" /><rect x="191.000000" y="0.000000" width="53.000000" height="66.000000" class="dots-overlay" style="stroke-width:2;" /></g><text x="217.500000" y="38.500000" fill="#0A0F25" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">x</text></g><g id="y"><g class="shape" ><rect x="0.000000" y="166.000000" width="54.000000" height="66.000000" stroke="#0D32B2" fill="#F7F8FE" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="27.000000" y="204.500000" fill="#0A0F25" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">y</text></g><g id="z"><g class="shape" ><rect x="162.000000" y="332.000000" width="52.000000" height="66.000000" stroke="#0D32B2" fill="#F7F8FE" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="188.000000" y="370.500000" fill="#0A0F25" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">z</text></g><g id="abcd"><g class="shape" ><rect x="114.000000" y="166.000000" width="80.000000" height="66.000000" stroke="#0D32B2" fill="#F7F8FE" class=" stroke-B1 fill-B6" style="stroke-width:2;" /><rect x="114.000000" y="166.000000" width="80.000000" height="66.000000" class="dots-overlay" style="stroke-width:2;" /></g><text x="154.000000" y="204.500000" fill="#0A0F25" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">abcd</text></g><g id="g"><g class="shape" ><rect x="254.000000" y="166.000000" width="54.000000" height="66.000000" stroke="#0D32B2" fill="#F7F8FE" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="281.000000" y="204.500000" fill="#0A0F25" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">g</text></g><g id="(x -&gt; y)[0]"><marker id="mk-3488378134" markerWidth="10.000000" markerHeight="12.000000" refX="7.000000" refY="6.000000" viewBox="0.000000 0.000000 10.000000 12.000000" orient="auto" markerUnits="userSpaceOnUse"> <polygon points="0.000000,0.000000 10.000000,6.000000 0.000000,12.000000" fill="#0D32B2" class="connection fill-B1" stroke-width="2" /> </marker><path d="M 189.164614 45.794582 C 59.799000 101.800003 27.000000 126.000000 27.000000 162.000000" stroke="#0D32B2" fill="none" class="connection stroke-B1" style="stroke-width:2;" marker-end="url(#mk-3488378134)" mask="url(#d2-550601415)" /></g><g id="(y -&gt; z)[0]"><path d="M 27.000000 234.000000 C 27.000000 272.000000 53.900002 295.910004 157.946979 349.716585" stroke="#0D32B2" fill="none" class="connection stroke-B1" style="stroke-width:2;" marker-end="url(#mk-3488378134)" mask="url(#d2-550601415)" /></g><g id="(x -&gt; abcd)[0]"><path d="M 190.789834 67.592325 C 161.600006 106.000000 154.000000 126.000000 154.000000 162.000000" stroke="#0D32B2" fill="none" class="connection stroke-B1" style="stroke-width:2;" marker-end="url(#mk-3488378134)" mask="url(#d2-550601415)" /></g><g id="(x -&gt; g)[0]"><path d="M 244.210166 67.592325 C 273.399994 106.000000 281.000000 126.000000 281.000000 162.000000" stroke="#0D32B2" fill="none" class="connection stroke-B1" style="stroke-width:2;" marker-end="url(#mk-3488378134)" mask="url(#d2-550601415)" /></g><g id="(x -&gt; z)[0]"><path d="M 245.688659 51.071649 C 327.200012 102.800003 348.000000 132.600006 348.000000 157.500000 C 348.000000 182.399994 321.200012 295.799988 217.556225 349.168809" stroke="#0D32B2" fill="none" class="connection stroke-B1" style="stroke-width:2;" marker-end="url(#mk-3488378134)" mask="url(#d2-550601415)" /></g><mask id="d2-550601415" maskUnits="userSpaceOnUse" x="-1" y="-1" width="350" height="400">
-</defs><g id="x"><g class="shape" ><rect x="191.000000" y="0.000000" width="53.000000" height="66.000000" stroke="#0D32B2" fill="#F7F8FE" class=" stroke-B1 fill-B6" style="stroke-width:2;" /><rect x="191.000000" y="0.000000" width="53.000000" height="66.000000" class="dots-overlay" style="stroke-width:2;" /></g><text x="217.500000" y="38.500000" fill="#0A0F25" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">x</text></g><g id="y"><g class="shape" ><rect x="0.000000" y="166.000000" width="54.000000" height="66.000000" stroke="#0D32B2" fill="#F7F8FE" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="27.000000" y="204.500000" fill="#0A0F25" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">y</text></g><g id="z"><g class="shape" ><rect x="162.000000" y="332.000000" width="52.000000" height="66.000000" stroke="#0D32B2" fill="#F7F8FE" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="188.000000" y="370.500000" fill="#0A0F25" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">z</text></g><g id="abcd"><g class="shape" ><rect x="114.000000" y="166.000000" width="80.000000" height="66.000000" stroke="#0D32B2" fill="#F7F8FE" class=" stroke-B1 fill-B6" style="stroke-width:2;" /><rect x="114.000000" y="166.000000" width="80.000000" height="66.000000" class="dots-overlay" style="stroke-width:2;" /></g><text x="154.000000" y="204.500000" fill="#0A0F25" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">abcd</text></g><g id="g"><g class="shape" ><rect x="254.000000" y="166.000000" width="54.000000" height="66.000000" stroke="#0D32B2" fill="#F7F8FE" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="281.000000" y="204.500000" fill="#0A0F25" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">g</text></g><g id="(x -&gt; y)[0]"><marker id="mk-3488378134" markerWidth="10.000000" markerHeight="12.000000" refX="7.000000" refY="6.000000" viewBox="0.000000 0.000000 10.000000 12.000000" orient="auto" markerUnits="userSpaceOnUse"> <polygon points="0.000000,0.000000 10.000000,6.000000 0.000000,12.000000" fill="#0D32B2" class="connection fill-B1" stroke-width="2" /> </marker><path d="M 189.164614 45.794582 C 59.799000 101.800003 27.000000 126.000000 27.000000 162.000000" stroke="#0D32B2" fill="none" class="connection stroke-B1" style="stroke-width:2;" marker-end="url(#mk-3488378134)" mask="url(#d2-1252569269)" /></g><g id="(y -&gt; z)[0]"><path d="M 27.000000 234.000000 C 27.000000 272.000000 53.900002 295.910004 157.946979 349.716585" stroke="#0D32B2" fill="none" class="connection stroke-B1" style="stroke-width:2;" marker-end="url(#mk-3488378134)" mask="url(#d2-1252569269)" /></g><g id="(x -&gt; abcd)[0]"><path d="M 190.789834 67.592325 C 161.600006 106.000000 154.000000 126.000000 154.000000 162.000000" stroke="#0D32B2" fill="none" class="connection stroke-B1" style="stroke-width:2;" marker-end="url(#mk-3488378134)" mask="url(#d2-1252569269)" /></g><g id="(x -&gt; g)[0]"><path d="M 244.210166 67.592325 C 273.399994 106.000000 281.000000 126.000000 281.000000 162.000000" stroke="#0D32B2" fill="none" class="connection stroke-B1" style="stroke-width:2;" marker-end="url(#mk-3488378134)" mask="url(#d2-1252569269)" /></g><g id="(x -&gt; z)[0]"><path d="M 245.688659 51.071649 C 327.200012 102.800003 348.000000 132.600006 348.000000 157.500000 C 348.000000 182.399994 321.200012 295.799988 217.556225 349.168809" stroke="#0D32B2" fill="none" class="connection stroke-B1" style="stroke-width:2;" marker-end="url(#mk-3488378134)" mask="url(#d2-1252569269)" /></g><mask id="d2-1252569269" maskUnits="userSpaceOnUse" x="-1" y="-1" width="350" height="400">
-||||||| parent of 33280fed5 (fixed e2e tests)
-</defs><g id="x"><g class="shape" ><rect x="191.000000" y="0.000000" width="53.000000" height="66.000000" class=" stroke-B1 fill-B6" style="stroke-width:2;" /><rect x="191.000000" y="0.000000" width="53.000000" height="66.000000" class="dots-overlay" style="stroke-width:2;" /></g><text x="217.500000" y="38.500000" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">x</text></g><g id="y"><g class="shape" ><rect x="0.000000" y="166.000000" width="54.000000" height="66.000000" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="27.000000" y="204.500000" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">y</text></g><g id="z"><g class="shape" ><rect x="162.000000" y="332.000000" width="52.000000" height="66.000000" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="188.000000" y="370.500000" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">z</text></g><g id="abcd"><g class="shape" ><rect x="114.000000" y="166.000000" width="80.000000" height="66.000000" class=" stroke-B1 fill-B6" style="stroke-width:2;" /><rect x="114.000000" y="166.000000" width="80.000000" height="66.000000" class="dots-overlay" style="stroke-width:2;" /></g><text x="154.000000" y="204.500000" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">abcd</text></g><g id="g"><g class="shape" ><rect x="254.000000" y="166.000000" width="54.000000" height="66.000000" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="281.000000" y="204.500000" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">g</text></g><g id="(x -&gt; y)[0]"><marker id="mk-3488378134" markerWidth="10.000000" markerHeight="12.000000" refX="7.000000" refY="6.000000" viewBox="0.000000 0.000000 10.000000 12.000000" orient="auto" markerUnits="userSpaceOnUse"> <polygon points="0.000000,0.000000 10.000000,6.000000 0.000000,12.000000" class="connection fill-B1" stroke-width="2" /> </marker><path d="M 189.164614 45.794582 C 59.799000 101.800003 27.000000 126.000000 27.000000 162.000000" fill="none" class="connection stroke-B1" style="stroke-width:2;" marker-end="url(#mk-3488378134)" mask="url(#d2-1252569269)" /></g><g id="(y -&gt; z)[0]"><path d="M 27.000000 234.000000 C 27.000000 272.000000 53.900002 295.910004 157.946979 349.716585" fill="none" class="connection stroke-B1" style="stroke-width:2;" marker-end="url(#mk-3488378134)" mask="url(#d2-1252569269)" /></g><g id="(x -&gt; abcd)[0]"><path d="M 190.789834 67.592325 C 161.600006 106.000000 154.000000 126.000000 154.000000 162.000000" fill="none" class="connection stroke-B1" style="stroke-width:2;" marker-end="url(#mk-3488378134)" mask="url(#d2-1252569269)" /></g><g id="(x -&gt; g)[0]"><path d="M 244.210166 67.592325 C 273.399994 106.000000 281.000000 126.000000 281.000000 162.000000" fill="none" class="connection stroke-B1" style="stroke-width:2;" marker-end="url(#mk-3488378134)" mask="url(#d2-1252569269)" /></g><g id="(x -&gt; z)[0]"><path d="M 245.688659 51.071649 C 327.200012 102.800003 348.000000 132.600006 348.000000 157.500000 C 348.000000 182.399994 321.200012 295.799988 217.556225 349.168809" fill="none" class="connection stroke-B1" style="stroke-width:2;" marker-end="url(#mk-3488378134)" mask="url(#d2-1252569269)" /></g><mask id="d2-1252569269" maskUnits="userSpaceOnUse" x="-1" y="-1" width="350" height="400">
-=======
-</defs><g id="x"><g class="shape" ><rect x="191.000000" y="0.000000" width="53.000000" height="66.000000" class=" stroke-B1 fill-B6" style="stroke-width:2;" /><rect x="191.000000" y="0.000000" width="53.000000" height="66.000000" class="dots-overlay" style="stroke-width:2;" /></g><text x="217.500000" y="38.500000" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">x</text></g><g id="y"><g class="shape" ><rect x="0.000000" y="166.000000" width="54.000000" height="66.000000" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="27.000000" y="204.500000" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">y</text></g><g id="z"><g class="shape" ><rect x="162.000000" y="332.000000" width="52.000000" height="66.000000" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="188.000000" y="370.500000" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">z</text></g><g id="abcd"><g class="shape" ><rect x="114.000000" y="166.000000" width="80.000000" height="66.000000" class=" stroke-B1 fill-B6" style="stroke-width:2;" /><rect x="114.000000" y="166.000000" width="80.000000" height="66.000000" class="dots-overlay" style="stroke-width:2;" /></g><text x="154.000000" y="204.500000" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">abcd</text></g><g id="g"><g class="shape" ><rect x="254.000000" y="166.000000" width="54.000000" height="66.000000" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="281.000000" y="204.500000" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">g</text></g><g id="(x -&gt; y)[0]"><marker id="mk-3488378134" markerWidth="10.000000" markerHeight="12.000000" refX="7.000000" refY="6.000000" viewBox="0.000000 0.000000 10.000000 12.000000" orient="auto" markerUnits="userSpaceOnUse"> <polygon points="0.000000,0.000000 10.000000,6.000000 0.000000,12.000000" class="connection fill-B1" stroke-width="2" /> </marker><path d="M 189.164614 45.794582 C 59.799000 101.800003 27.000000 126.000000 27.000000 162.000000" fill="none" class="connection stroke-B1" style="stroke-width:2;" marker-end="url(#mk-3488378134)" mask="url(#d2-550601415)" /></g><g id="(y -&gt; z)[0]"><path d="M 27.000000 234.000000 C 27.000000 272.000000 53.900002 295.910004 157.946979 349.716585" fill="none" class="connection stroke-B1" style="stroke-width:2;" marker-end="url(#mk-3488378134)" mask="url(#d2-550601415)" /></g><g id="(x -&gt; abcd)[0]"><path d="M 190.789834 67.592325 C 161.600006 106.000000 154.000000 126.000000 154.000000 162.000000" fill="none" class="connection stroke-B1" style="stroke-width:2;" marker-end="url(#mk-3488378134)" mask="url(#d2-550601415)" /></g><g id="(x -&gt; g)[0]"><path d="M 244.210166 67.592325 C 273.399994 106.000000 281.000000 126.000000 281.000000 162.000000" fill="none" class="connection stroke-B1" style="stroke-width:2;" marker-end="url(#mk-3488378134)" mask="url(#d2-550601415)" /></g><g id="(x -&gt; z)[0]"><path d="M 245.688659 51.071649 C 327.200012 102.800003 348.000000 132.600006 348.000000 157.500000 C 348.000000 182.399994 321.200012 295.799988 217.556225 349.168809" fill="none" class="connection stroke-B1" style="stroke-width:2;" marker-end="url(#mk-3488378134)" mask="url(#d2-550601415)" /></g><mask id="d2-550601415" maskUnits="userSpaceOnUse" x="-1" y="-1" width="350" height="400">
->>>>>>> 33280fed5 (fixed e2e tests)
 <rect x="-1" y="-1" width="350" height="400" fill="white"></rect>
 <rect x="213.500000" y="22.500000" width="8" height="21" fill="rgba(0,0,0,0.75)"></rect>
 <rect x="22.500000" y="188.500000" width="9" height="21" fill="rgba(0,0,0,0.75)"></rect>

e2etests/testdata/regression/arrowhead_font_color/dagre/sketch.exp.svg

@@ -1,22 +1,6 @@
-<<<<<<< HEAD
+<?xml version="1.0" encoding="utf-8"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" d2Version="v0.6.8-HEAD" preserveAspectRatio="xMinYMin meet" viewBox="0 0 209 68"><svg id="d2-svg" class="d2-3801853211" width="209" height="68" viewBox="-1 -1 209 68"><rect x="-1.000000" y="-1.000000" width="209.000000" height="68.000000" rx="0.000000" fill="#FFFFFF" class=" fill-N7" stroke-width="0" /><style type="text/css"><![CDATA[
-<<<<<<< HEAD
-<?xml version="1.0" encoding="utf-8"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" d2Version="v0.6.8-HEAD" preserveAspectRatio="xMinYMin meet" viewBox="0 0 209 68"><svg id="d2-svg" class="d2-344710325" width="209" height="68" viewBox="-1 -1 209 68"><rect x="-1.000000" y="-1.000000" width="209.000000" height="68.000000" rx="0.000000" fill="#FFFFFF" class=" fill-N7" stroke-width="0" /><style type="text/css"><![CDATA[
-.d2-344710325 .text-bold {
-	font-family: "d2-344710325-font-bold";
-||||||| parent of 33280fed5 (fixed e2e tests)
-<?xml version="1.0" encoding="utf-8"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" d2Version="v0.6.6-HEAD" preserveAspectRatio="xMinYMin meet" viewBox="0 0 209 68"><svg id="d2-svg" class="d2-344710325" width="209" height="68" viewBox="-1 -1 209 68"><rect x="-1.000000" y="-1.000000" width="209.000000" height="68.000000" rx="0.000000" class=" fill-N7" stroke-width="0" /><style type="text/css"><![CDATA[
-.d2-344710325 .text-bold {
-	font-family: "d2-344710325-font-bold";
-=======
-<?xml version="1.0" encoding="utf-8"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" d2Version="v0.6.5-HEAD" preserveAspectRatio="xMinYMin meet" viewBox="0 0 209 68"><svg id="d2-svg" class="d2-3801853211" width="209" height="68" viewBox="-1 -1 209 68"><rect x="-1.000000" y="-1.000000" width="209.000000" height="68.000000" rx="0.000000" class=" fill-N7" stroke-width="0" /><style type="text/css"><![CDATA[
-||||||| parent of cb2f2823c (Fix changes)
-<?xml version="1.0" encoding="utf-8"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" d2Version="v0.6.5-HEAD" preserveAspectRatio="xMinYMin meet" viewBox="0 0 209 68"><svg id="d2-svg" class="d2-3801853211" width="209" height="68" viewBox="-1 -1 209 68"><rect x="-1.000000" y="-1.000000" width="209.000000" height="68.000000" rx="0.000000" class=" fill-N7" stroke-width="0" /><style type="text/css"><![CDATA[
-=======
-<?xml version="1.0" encoding="utf-8"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" d2Version="v0.6.6-HEAD" preserveAspectRatio="xMinYMin meet" viewBox="0 0 209 68"><svg id="d2-svg" class="d2-3801853211" width="209" height="68" viewBox="-1 -1 209 68"><rect x="-1.000000" y="-1.000000" width="209.000000" height="68.000000" rx="0.000000" class=" fill-N7" stroke-width="0" /><style type="text/css"><![CDATA[
->>>>>>> cb2f2823c (Fix changes)
 .d2-3801853211 .text-bold {
 	font-family: "d2-3801853211-font-bold";
->>>>>>> 33280fed5 (fixed e2e tests)
 }
 @font-face {
 	font-family: d2-3801853211-font-bold;
@@ -41,153 +25,6 @@
   opacity: 0.5;
 }
 
-<<<<<<< HEAD
-		.d2-344710325 .fill-N1{fill:#0A0F25;}
-		.d2-344710325 .fill-N2{fill:#676C7E;}
-		.d2-344710325 .fill-N3{fill:#9499AB;}
-		.d2-344710325 .fill-N4{fill:#CFD2DD;}
-		.d2-344710325 .fill-N5{fill:#DEE1EB;}
-		.d2-344710325 .fill-N6{fill:#EEF1F8;}
-		.d2-344710325 .fill-N7{fill:#FFFFFF;}
-		.d2-344710325 .fill-B1{fill:#0D32B2;}
-		.d2-344710325 .fill-B2{fill:#0D32B2;}
-		.d2-344710325 .fill-B3{fill:#E3E9FD;}
-		.d2-344710325 .fill-B4{fill:#E3E9FD;}
-		.d2-344710325 .fill-B5{fill:#EDF0FD;}
-		.d2-344710325 .fill-B6{fill:#F7F8FE;}
-		.d2-344710325 .fill-AA2{fill:#4A6FF3;}
-		.d2-344710325 .fill-AA4{fill:#EDF0FD;}
-		.d2-344710325 .fill-AA5{fill:#F7F8FE;}
-		.d2-344710325 .fill-AB4{fill:#EDF0FD;}
-		.d2-344710325 .fill-AB5{fill:#F7F8FE;}
-		.d2-344710325 .stroke-N1{stroke:#0A0F25;}
-		.d2-344710325 .stroke-N2{stroke:#676C7E;}
-		.d2-344710325 .stroke-N3{stroke:#9499AB;}
-		.d2-344710325 .stroke-N4{stroke:#CFD2DD;}
-		.d2-344710325 .stroke-N5{stroke:#DEE1EB;}
-		.d2-344710325 .stroke-N6{stroke:#EEF1F8;}
-		.d2-344710325 .stroke-N7{stroke:#FFFFFF;}
-		.d2-344710325 .stroke-B1{stroke:#0D32B2;}
-		.d2-344710325 .stroke-B2{stroke:#0D32B2;}
-		.d2-344710325 .stroke-B3{stroke:#E3E9FD;}
-		.d2-344710325 .stroke-B4{stroke:#E3E9FD;}
-		.d2-344710325 .stroke-B5{stroke:#EDF0FD;}
-		.d2-344710325 .stroke-B6{stroke:#F7F8FE;}
-		.d2-344710325 .stroke-AA2{stroke:#4A6FF3;}
-		.d2-344710325 .stroke-AA4{stroke:#EDF0FD;}
-		.d2-344710325 .stroke-AA5{stroke:#F7F8FE;}
-		.d2-344710325 .stroke-AB4{stroke:#EDF0FD;}
-		.d2-344710325 .stroke-AB5{stroke:#F7F8FE;}
-		.d2-344710325 .background-color-N1{background-color:#0A0F25;}
-		.d2-344710325 .background-color-N2{background-color:#676C7E;}
-		.d2-344710325 .background-color-N3{background-color:#9499AB;}
-		.d2-344710325 .background-color-N4{background-color:#CFD2DD;}
-		.d2-344710325 .background-color-N5{background-color:#DEE1EB;}
-		.d2-344710325 .background-color-N6{background-color:#EEF1F8;}
-		.d2-344710325 .background-color-N7{background-color:#FFFFFF;}
-		.d2-344710325 .background-color-B1{background-color:#0D32B2;}
-		.d2-344710325 .background-color-B2{background-color:#0D32B2;}
-		.d2-344710325 .background-color-B3{background-color:#E3E9FD;}
-		.d2-344710325 .background-color-B4{background-color:#E3E9FD;}
-		.d2-344710325 .background-color-B5{background-color:#EDF0FD;}
-		.d2-344710325 .background-color-B6{background-color:#F7F8FE;}
-		.d2-344710325 .background-color-AA2{background-color:#4A6FF3;}
-		.d2-344710325 .background-color-AA4{background-color:#EDF0FD;}
-		.d2-344710325 .background-color-AA5{background-color:#F7F8FE;}
-		.d2-344710325 .background-color-AB4{background-color:#EDF0FD;}
-		.d2-344710325 .background-color-AB5{background-color:#F7F8FE;}
-		.d2-344710325 .color-N1{color:#0A0F25;}
-		.d2-344710325 .color-N2{color:#676C7E;}
-		.d2-344710325 .color-N3{color:#9499AB;}
-		.d2-344710325 .color-N4{color:#CFD2DD;}
-		.d2-344710325 .color-N5{color:#DEE1EB;}
-		.d2-344710325 .color-N6{color:#EEF1F8;}
-		.d2-344710325 .color-N7{color:#FFFFFF;}
-		.d2-344710325 .color-B1{color:#0D32B2;}
-		.d2-344710325 .color-B2{color:#0D32B2;}
-		.d2-344710325 .color-B3{color:#E3E9FD;}
-		.d2-344710325 .color-B4{color:#E3E9FD;}
-		.d2-344710325 .color-B5{color:#EDF0FD;}
-		.d2-344710325 .color-B6{color:#F7F8FE;}
-		.d2-344710325 .color-AA2{color:#4A6FF3;}
-		.d2-344710325 .color-AA4{color:#EDF0FD;}
-		.d2-344710325 .color-AA5{color:#F7F8FE;}
-		.d2-344710325 .color-AB4{color:#EDF0FD;}
-		.d2-344710325 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]></style><g id="x"><g class="shape" ><rect x="0.000000" y="0.000000" width="53.000000" height="66.000000" stroke="#0D32B2" fill="#F7F8FE" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="26.500000" y="38.500000" fill="#0A0F25" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">x</text></g><g id="y"><g class="shape" ><rect x="153.000000" y="0.000000" width="54.000000" height="66.000000" stroke="#0D32B2" fill="#F7F8FE" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="180.000000" y="38.500000" fill="#0A0F25" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">y</text></g><g id="(x &lt;-&gt; y)[0]"><marker id="mk-2451250203" markerWidth="10.000000" markerHeight="12.000000" refX="3.000000" refY="6.000000" viewBox="0.000000 0.000000 10.000000 12.000000" orient="auto" markerUnits="userSpaceOnUse"> <polygon points="10.000000,0.000000 0.000000,6.000000 10.000000,12.000000" fill="#0D32B2" class="connection fill-B1" stroke-width="2" /> </marker><marker id="mk-3488378134" markerWidth="10.000000" markerHeight="12.000000" refX="7.000000" refY="6.000000" viewBox="0.000000 0.000000 10.000000 12.000000" orient="auto" markerUnits="userSpaceOnUse"> <polygon points="0.000000,0.000000 10.000000,6.000000 0.000000,12.000000" fill="#0D32B2" class="connection fill-B1" stroke-width="2" /> </marker><path d="M 57.000000 33.000000 C 93.000000 33.000000 113.000000 33.000000 149.000000 33.000000" stroke="#0D32B2" fill="none" class="connection stroke-B1" style="stroke-width:2;" marker-start="url(#mk-2451250203)" marker-end="url(#mk-3488378134)" mask="url(#d2-344710325)" /><text x="72.500000" y="20.000000" fill="green" class="text-italic" style="text-anchor:middle;font-size:16px">eth1</text><text x="133.000000" y="20.000000" fill="red" class="text-italic" style="text-anchor:middle;font-size:16px">eth2</text></g><mask id="d2-344710325" maskUnits="userSpaceOnUse" x="-1" y="-1" width="209" height="68">
-||||||| parent of 33280fed5 (fixed e2e tests)
-		.d2-344710325 .fill-N1{fill:#0A0F25;}
-		.d2-344710325 .fill-N2{fill:#676C7E;}
-		.d2-344710325 .fill-N3{fill:#9499AB;}
-		.d2-344710325 .fill-N4{fill:#CFD2DD;}
-		.d2-344710325 .fill-N5{fill:#DEE1EB;}
-		.d2-344710325 .fill-N6{fill:#EEF1F8;}
-		.d2-344710325 .fill-N7{fill:#FFFFFF;}
-		.d2-344710325 .fill-B1{fill:#0D32B2;}
-		.d2-344710325 .fill-B2{fill:#0D32B2;}
-		.d2-344710325 .fill-B3{fill:#E3E9FD;}
-		.d2-344710325 .fill-B4{fill:#E3E9FD;}
-		.d2-344710325 .fill-B5{fill:#EDF0FD;}
-		.d2-344710325 .fill-B6{fill:#F7F8FE;}
-		.d2-344710325 .fill-AA2{fill:#4A6FF3;}
-		.d2-344710325 .fill-AA4{fill:#EDF0FD;}
-		.d2-344710325 .fill-AA5{fill:#F7F8FE;}
-		.d2-344710325 .fill-AB4{fill:#EDF0FD;}
-		.d2-344710325 .fill-AB5{fill:#F7F8FE;}
-		.d2-344710325 .stroke-N1{stroke:#0A0F25;}
-		.d2-344710325 .stroke-N2{stroke:#676C7E;}
-		.d2-344710325 .stroke-N3{stroke:#9499AB;}
-		.d2-344710325 .stroke-N4{stroke:#CFD2DD;}
-		.d2-344710325 .stroke-N5{stroke:#DEE1EB;}
-		.d2-344710325 .stroke-N6{stroke:#EEF1F8;}
-		.d2-344710325 .stroke-N7{stroke:#FFFFFF;}
-		.d2-344710325 .stroke-B1{stroke:#0D32B2;}
-		.d2-344710325 .stroke-B2{stroke:#0D32B2;}
-		.d2-344710325 .stroke-B3{stroke:#E3E9FD;}
-		.d2-344710325 .stroke-B4{stroke:#E3E9FD;}
-		.d2-344710325 .stroke-B5{stroke:#EDF0FD;}
-		.d2-344710325 .stroke-B6{stroke:#F7F8FE;}
-		.d2-344710325 .stroke-AA2{stroke:#4A6FF3;}
-		.d2-344710325 .stroke-AA4{stroke:#EDF0FD;}
-		.d2-344710325 .stroke-AA5{stroke:#F7F8FE;}
-		.d2-344710325 .stroke-AB4{stroke:#EDF0FD;}
-		.d2-344710325 .stroke-AB5{stroke:#F7F8FE;}
-		.d2-344710325 .background-color-N1{background-color:#0A0F25;}
-		.d2-344710325 .background-color-N2{background-color:#676C7E;}
-		.d2-344710325 .background-color-N3{background-color:#9499AB;}
-		.d2-344710325 .background-color-N4{background-color:#CFD2DD;}
-		.d2-344710325 .background-color-N5{background-color:#DEE1EB;}
-		.d2-344710325 .background-color-N6{background-color:#EEF1F8;}
-		.d2-344710325 .background-color-N7{background-color:#FFFFFF;}
-		.d2-344710325 .background-color-B1{background-color:#0D32B2;}
-		.d2-344710325 .background-color-B2{background-color:#0D32B2;}
-		.d2-344710325 .background-color-B3{background-color:#E3E9FD;}
-		.d2-344710325 .background-color-B4{background-color:#E3E9FD;}
-		.d2-344710325 .background-color-B5{background-color:#EDF0FD;}
-		.d2-344710325 .background-color-B6{background-color:#F7F8FE;}
-		.d2-344710325 .background-color-AA2{background-color:#4A6FF3;}
-		.d2-344710325 .background-color-AA4{background-color:#EDF0FD;}
-		.d2-344710325 .background-color-AA5{background-color:#F7F8FE;}
-		.d2-344710325 .background-color-AB4{background-color:#EDF0FD;}
-		.d2-344710325 .background-color-AB5{background-color:#F7F8FE;}
-		.d2-344710325 .color-N1{color:#0A0F25;}
-		.d2-344710325 .color-N2{color:#676C7E;}
-		.d2-344710325 .color-N3{color:#9499AB;}
-		.d2-344710325 .color-N4{color:#CFD2DD;}
-		.d2-344710325 .color-N5{color:#DEE1EB;}
-		.d2-344710325 .color-N6{color:#EEF1F8;}
-		.d2-344710325 .color-N7{color:#FFFFFF;}
-		.d2-344710325 .color-B1{color:#0D32B2;}
-		.d2-344710325 .color-B2{color:#0D32B2;}
-		.d2-344710325 .color-B3{color:#E3E9FD;}
-		.d2-344710325 .color-B4{color:#E3E9FD;}
-		.d2-344710325 .color-B5{color:#EDF0FD;}
-		.d2-344710325 .color-B6{color:#F7F8FE;}
-		.d2-344710325 .color-AA2{color:#4A6FF3;}
-		.d2-344710325 .color-AA4{color:#EDF0FD;}
-		.d2-344710325 .color-AA5{color:#F7F8FE;}
-		.d2-344710325 .color-AB4{color:#EDF0FD;}
-		.d2-344710325 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]></style><g id="x"><g class="shape" ><rect x="0.000000" y="0.000000" width="53.000000" height="66.000000" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="26.500000" y="38.500000" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">x</text></g><g id="y"><g class="shape" ><rect x="153.000000" y="0.000000" width="54.000000" height="66.000000" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="180.000000" y="38.500000" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">y</text></g><g id="(x &lt;-&gt; y)[0]"><marker id="mk-2451250203" markerWidth="10.000000" markerHeight="12.000000" refX="3.000000" refY="6.000000" viewBox="0.000000 0.000000 10.000000 12.000000" orient="auto" markerUnits="userSpaceOnUse"> <polygon points="10.000000,0.000000 0.000000,6.000000 10.000000,12.000000" class="connection fill-B1" stroke-width="2" /> </marker><marker id="mk-3488378134" markerWidth="10.000000" markerHeight="12.000000" refX="7.000000" refY="6.000000" viewBox="0.000000 0.000000 10.000000 12.000000" orient="auto" markerUnits="userSpaceOnUse"> <polygon points="0.000000,0.000000 10.000000,6.000000 0.000000,12.000000" class="connection fill-B1" stroke-width="2" /> </marker><path d="M 57.000000 33.000000 C 93.000000 33.000000 113.000000 33.000000 149.000000 33.000000" fill="none" class="connection stroke-B1" style="stroke-width:2;" marker-start="url(#mk-2451250203)" marker-end="url(#mk-3488378134)" mask="url(#d2-344710325)" /><text x="72.500000" y="20.000000" fill="green" class="text-italic" style="text-anchor:middle;font-size:16px">eth1</text><text x="133.000000" y="20.000000" fill="red" class="text-italic" style="text-anchor:middle;font-size:16px">eth2</text></g><mask id="d2-344710325" maskUnits="userSpaceOnUse" x="-1" y="-1" width="209" height="68">
-=======
 		.d2-3801853211 .fill-N1{fill:#0A0F25;}
 		.d2-3801853211 .fill-N2{fill:#676C7E;}
 		.d2-3801853211 .fill-N3{fill:#9499AB;}
@@ -259,8 +96,7 @@
 		.d2-3801853211 .color-AA4{color:#EDF0FD;}
 		.d2-3801853211 .color-AA5{color:#F7F8FE;}
 		.d2-3801853211 .color-AB4{color:#EDF0FD;}
-		.d2-3801853211 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]></style><g id="x"><g class="shape" ><rect x="0.000000" y="0.000000" width="53.000000" height="66.000000" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="26.500000" y="38.500000" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">x</text></g><g id="y"><g class="shape" ><rect x="153.000000" y="0.000000" width="54.000000" height="66.000000" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="180.000000" y="38.500000" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">y</text></g><g id="(x &lt;-&gt; y)[0]"><marker id="mk-2451250203" markerWidth="10.000000" markerHeight="12.000000" refX="3.000000" refY="6.000000" viewBox="0.000000 0.000000 10.000000 12.000000" orient="auto" markerUnits="userSpaceOnUse"> <polygon points="10.000000,0.000000 0.000000,6.000000 10.000000,12.000000" class="connection fill-B1" stroke-width="2" /> </marker><marker id="mk-3488378134" markerWidth="10.000000" markerHeight="12.000000" refX="7.000000" refY="6.000000" viewBox="0.000000 0.000000 10.000000 12.000000" orient="auto" markerUnits="userSpaceOnUse"> <polygon points="0.000000,0.000000 10.000000,6.000000 0.000000,12.000000" class="connection fill-B1" stroke-width="2" /> </marker><path d="M 57.000000 33.000000 C 93.000000 33.000000 113.000000 33.000000 149.000000 33.000000" fill="none" class="connection stroke-B1" style="stroke-width:2;" marker-start="url(#mk-2451250203)" marker-end="url(#mk-3488378134)" mask="url(#d2-3801853211)" /><text x="72.500000" y="20.000000" fill="green" class="text-italic" style="text-anchor:middle;font-size:16px">eth1</text><text x="133.000000" y="20.000000" fill="red" class="text-italic" style="text-anchor:middle;font-size:16px">eth2</text></g><mask id="d2-3801853211" maskUnits="userSpaceOnUse" x="-1" y="-1" width="209" height="68">
+		.d2-3801853211 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]></style><g id="x"><g class="shape" ><rect x="0.000000" y="0.000000" width="53.000000" height="66.000000" stroke="#0D32B2" fill="#F7F8FE" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="26.500000" y="38.500000" fill="#0A0F25" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">x</text></g><g id="y"><g class="shape" ><rect x="153.000000" y="0.000000" width="54.000000" height="66.000000" stroke="#0D32B2" fill="#F7F8FE" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="180.000000" y="38.500000" fill="#0A0F25" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">y</text></g><g id="(x &lt;-&gt; y)[0]"><marker id="mk-2451250203" markerWidth="10.000000" markerHeight="12.000000" refX="3.000000" refY="6.000000" viewBox="0.000000 0.000000 10.000000 12.000000" orient="auto" markerUnits="userSpaceOnUse"> <polygon points="10.000000,0.000000 0.000000,6.000000 10.000000,12.000000" fill="#0D32B2" class="connection fill-B1" stroke-width="2" /> </marker><marker id="mk-3488378134" markerWidth="10.000000" markerHeight="12.000000" refX="7.000000" refY="6.000000" viewBox="0.000000 0.000000 10.000000 12.000000" orient="auto" markerUnits="userSpaceOnUse"> <polygon points="0.000000,0.000000 10.000000,6.000000 0.000000,12.000000" fill="#0D32B2" class="connection fill-B1" stroke-width="2" /> </marker><path d="M 57.000000 33.000000 C 93.000000 33.000000 113.000000 33.000000 149.000000 33.000000" stroke="#0D32B2" fill="none" class="connection stroke-B1" style="stroke-width:2;" marker-start="url(#mk-2451250203)" marker-end="url(#mk-3488378134)" mask="url(#d2-3801853211)" /><text x="72.500000" y="20.000000" fill="green" class="text-italic" style="text-anchor:middle;font-size:16px">eth1</text><text x="133.000000" y="20.000000" fill="red" class="text-italic" style="text-anchor:middle;font-size:16px">eth2</text></g><mask id="d2-3801853211" maskUnits="userSpaceOnUse" x="-1" y="-1" width="209" height="68">
->>>>>>> 33280fed5 (fixed e2e tests)
 <rect x="-1" y="-1" width="209" height="68" fill="white"></rect>
 <rect x="22.500000" y="22.500000" width="8" height="21" fill="rgba(0,0,0,0.75)"></rect>
 <rect x="175.500000" y="22.500000" width="9" height="21" fill="rgba(0,0,0,0.75)"></rect>

e2etests/testdata/regression/arrowhead_font_color/elk/sketch.exp.svg

@@ -1,22 +1,6 @@
-<<<<<<< HEAD
+<?xml version="1.0" encoding="utf-8"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" d2Version="v0.6.8-HEAD" preserveAspectRatio="xMinYMin meet" viewBox="0 0 179 68"><svg id="d2-svg" class="d2-142564125" width="179" height="68" viewBox="11 11 179 68"><rect x="11.000000" y="11.000000" width="179.000000" height="68.000000" rx="0.000000" fill="#FFFFFF" class=" fill-N7" stroke-width="0" /><style type="text/css"><![CDATA[
-<<<<<<< HEAD
-<?xml version="1.0" encoding="utf-8"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" d2Version="v0.6.8-HEAD" preserveAspectRatio="xMinYMin meet" viewBox="0 0 179 68"><svg id="d2-svg" class="d2-1665242727" width="179" height="68" viewBox="11 11 179 68"><rect x="11.000000" y="11.000000" width="179.000000" height="68.000000" rx="0.000000" fill="#FFFFFF" class=" fill-N7" stroke-width="0" /><style type="text/css"><![CDATA[
-.d2-1665242727 .text-bold {
-	font-family: "d2-1665242727-font-bold";
-||||||| parent of 33280fed5 (fixed e2e tests)
-<?xml version="1.0" encoding="utf-8"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" d2Version="v0.6.6-HEAD" preserveAspectRatio="xMinYMin meet" viewBox="0 0 179 68"><svg id="d2-svg" class="d2-1665242727" width="179" height="68" viewBox="11 11 179 68"><rect x="11.000000" y="11.000000" width="179.000000" height="68.000000" rx="0.000000" class=" fill-N7" stroke-width="0" /><style type="text/css"><![CDATA[
-.d2-1665242727 .text-bold {
-	font-family: "d2-1665242727-font-bold";
-=======
-<?xml version="1.0" encoding="utf-8"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" d2Version="v0.6.5-HEAD" preserveAspectRatio="xMinYMin meet" viewBox="0 0 179 68"><svg id="d2-svg" class="d2-142564125" width="179" height="68" viewBox="11 11 179 68"><rect x="11.000000" y="11.000000" width="179.000000" height="68.000000" rx="0.000000" class=" fill-N7" stroke-width="0" /><style type="text/css"><![CDATA[
-||||||| parent of cb2f2823c (Fix changes)
-<?xml version="1.0" encoding="utf-8"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" d2Version="v0.6.5-HEAD" preserveAspectRatio="xMinYMin meet" viewBox="0 0 179 68"><svg id="d2-svg" class="d2-142564125" width="179" height="68" viewBox="11 11 179 68"><rect x="11.000000" y="11.000000" width="179.000000" height="68.000000" rx="0.000000" class=" fill-N7" stroke-width="0" /><style type="text/css"><![CDATA[
-=======
-<?xml version="1.0" encoding="utf-8"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" d2Version="v0.6.6-HEAD" preserveAspectRatio="xMinYMin meet" viewBox="0 0 179 68"><svg id="d2-svg" class="d2-142564125" width="179" height="68" viewBox="11 11 179 68"><rect x="11.000000" y="11.000000" width="179.000000" height="68.000000" rx="0.000000" class=" fill-N7" stroke-width="0" /><style type="text/css"><![CDATA[
->>>>>>> cb2f2823c (Fix changes)
 .d2-142564125 .text-bold {
 	font-family: "d2-142564125-font-bold";
->>>>>>> 33280fed5 (fixed e2e tests)
 }
 @font-face {
 	font-family: d2-142564125-font-bold;
@@ -41,153 +25,6 @@
   opacity: 0.5;
 }
 
-<<<<<<< HEAD
-		.d2-1665242727 .fill-N1{fill:#0A0F25;}
-		.d2-1665242727 .fill-N2{fill:#676C7E;}
-		.d2-1665242727 .fill-N3{fill:#9499AB;}
-		.d2-1665242727 .fill-N4{fill:#CFD2DD;}
-		.d2-1665242727 .fill-N5{fill:#DEE1EB;}
-		.d2-1665242727 .fill-N6{fill:#EEF1F8;}
-		.d2-1665242727 .fill-N7{fill:#FFFFFF;}
-		.d2-1665242727 .fill-B1{fill:#0D32B2;}
-		.d2-1665242727 .fill-B2{fill:#0D32B2;}
-		.d2-1665242727 .fill-B3{fill:#E3E9FD;}
-		.d2-1665242727 .fill-B4{fill:#E3E9FD;}
-		.d2-1665242727 .fill-B5{fill:#EDF0FD;}
-		.d2-1665242727 .fill-B6{fill:#F7F8FE;}
-		.d2-1665242727 .fill-AA2{fill:#4A6FF3;}
-		.d2-1665242727 .fill-AA4{fill:#EDF0FD;}
-		.d2-1665242727 .fill-AA5{fill:#F7F8FE;}
-		.d2-1665242727 .fill-AB4{fill:#EDF0FD;}
-		.d2-1665242727 .fill-AB5{fill:#F7F8FE;}
-		.d2-1665242727 .stroke-N1{stroke:#0A0F25;}
-		.d2-1665242727 .stroke-N2{stroke:#676C7E;}
-		.d2-1665242727 .stroke-N3{stroke:#9499AB;}
-		.d2-1665242727 .stroke-N4{stroke:#CFD2DD;}
-		.d2-1665242727 .stroke-N5{stroke:#DEE1EB;}
-		.d2-1665242727 .stroke-N6{stroke:#EEF1F8;}
-		.d2-1665242727 .stroke-N7{stroke:#FFFFFF;}
-		.d2-1665242727 .stroke-B1{stroke:#0D32B2;}
-		.d2-1665242727 .stroke-B2{stroke:#0D32B2;}
-		.d2-1665242727 .stroke-B3{stroke:#E3E9FD;}
-		.d2-1665242727 .stroke-B4{stroke:#E3E9FD;}
-		.d2-1665242727 .stroke-B5{stroke:#EDF0FD;}
-		.d2-1665242727 .stroke-B6{stroke:#F7F8FE;}
-		.d2-1665242727 .stroke-AA2{stroke:#4A6FF3;}
-		.d2-1665242727 .stroke-AA4{stroke:#EDF0FD;}
-		.d2-1665242727 .stroke-AA5{stroke:#F7F8FE;}
-		.d2-1665242727 .stroke-AB4{stroke:#EDF0FD;}
-		.d2-1665242727 .stroke-AB5{stroke:#F7F8FE;}
-		.d2-1665242727 .background-color-N1{background-color:#0A0F25;}
-		.d2-1665242727 .background-color-N2{background-color:#676C7E;}
-		.d2-1665242727 .background-color-N3{background-color:#9499AB;}
-		.d2-1665242727 .background-color-N4{background-color:#CFD2DD;}
-		.d2-1665242727 .background-color-N5{background-color:#DEE1EB;}
-		.d2-1665242727 .background-color-N6{background-color:#EEF1F8;}
-		.d2-1665242727 .background-color-N7{background-color:#FFFFFF;}
-		.d2-1665242727 .background-color-B1{background-color:#0D32B2;}
-		.d2-1665242727 .background-color-B2{background-color:#0D32B2;}
-		.d2-1665242727 .background-color-B3{background-color:#E3E9FD;}
-		.d2-1665242727 .background-color-B4{background-color:#E3E9FD;}
-		.d2-1665242727 .background-color-B5{background-color:#EDF0FD;}
-		.d2-1665242727 .background-color-B6{background-color:#F7F8FE;}
-		.d2-1665242727 .background-color-AA2{background-color:#4A6FF3;}
-		.d2-1665242727 .background-color-AA4{background-color:#EDF0FD;}
-		.d2-1665242727 .background-color-AA5{background-color:#F7F8FE;}
-		.d2-1665242727 .background-color-AB4{background-color:#EDF0FD;}
-		.d2-1665242727 .background-color-AB5{background-color:#F7F8FE;}
-		.d2-1665242727 .color-N1{color:#0A0F25;}
-		.d2-1665242727 .color-N2{color:#676C7E;}
-		.d2-1665242727 .color-N3{color:#9499AB;}
-		.d2-1665242727 .color-N4{color:#CFD2DD;}
-		.d2-1665242727 .color-N5{color:#DEE1EB;}
-		.d2-1665242727 .color-N6{color:#EEF1F8;}
-		.d2-1665242727 .color-N7{color:#FFFFFF;}
-		.d2-1665242727 .color-B1{color:#0D32B2;}
-		.d2-1665242727 .color-B2{color:#0D32B2;}
-		.d2-1665242727 .color-B3{color:#E3E9FD;}
-		.d2-1665242727 .color-B4{color:#E3E9FD;}
-		.d2-1665242727 .color-B5{color:#EDF0FD;}
-		.d2-1665242727 .color-B6{color:#F7F8FE;}
-		.d2-1665242727 .color-AA2{color:#4A6FF3;}
-		.d2-1665242727 .color-AA4{color:#EDF0FD;}
-		.d2-1665242727 .color-AA5{color:#F7F8FE;}
-		.d2-1665242727 .color-AB4{color:#EDF0FD;}
-		.d2-1665242727 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]></style><g id="x"><g class="shape" ><rect x="12.000000" y="12.000000" width="53.000000" height="66.000000" stroke="#0D32B2" fill="#F7F8FE" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="38.500000" y="50.500000" fill="#0A0F25" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">x</text></g><g id="y"><g class="shape" ><rect x="135.000000" y="12.000000" width="54.000000" height="66.000000" stroke="#0D32B2" fill="#F7F8FE" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="162.000000" y="50.500000" fill="#0A0F25" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">y</text></g><g id="(x &lt;-&gt; y)[0]"><marker id="mk-2451250203" markerWidth="10.000000" markerHeight="12.000000" refX="3.000000" refY="6.000000" viewBox="0.000000 0.000000 10.000000 12.000000" orient="auto" markerUnits="userSpaceOnUse"> <polygon points="10.000000,0.000000 0.000000,6.000000 10.000000,12.000000" fill="#0D32B2" class="connection fill-B1" stroke-width="2" /> </marker><marker id="mk-3488378134" markerWidth="10.000000" markerHeight="12.000000" refX="7.000000" refY="6.000000" viewBox="0.000000 0.000000 10.000000 12.000000" orient="auto" markerUnits="userSpaceOnUse"> <polygon points="0.000000,0.000000 10.000000,6.000000 0.000000,12.000000" fill="#0D32B2" class="connection fill-B1" stroke-width="2" /> </marker><path d="M 69.000000 45.000000 L 131.000000 45.000000" stroke="#0D32B2" fill="none" class="connection stroke-B1" style="stroke-width:2;" marker-start="url(#mk-2451250203)" marker-end="url(#mk-3488378134)" mask="url(#d2-1665242727)" /><text x="84.500000" y="32.000000" fill="green" class="text-italic" style="text-anchor:middle;font-size:16px">eth1</text><text x="115.000000" y="32.000000" fill="red" class="text-italic" style="text-anchor:middle;font-size:16px">eth2</text></g><mask id="d2-1665242727" maskUnits="userSpaceOnUse" x="11" y="11" width="179" height="68">
-||||||| parent of 33280fed5 (fixed e2e tests)
-		.d2-1665242727 .fill-N1{fill:#0A0F25;}
-		.d2-1665242727 .fill-N2{fill:#676C7E;}
-		.d2-1665242727 .fill-N3{fill:#9499AB;}
-		.d2-1665242727 .fill-N4{fill:#CFD2DD;}
-		.d2-1665242727 .fill-N5{fill:#DEE1EB;}
-		.d2-1665242727 .fill-N6{fill:#EEF1F8;}
-		.d2-1665242727 .fill-N7{fill:#FFFFFF;}
-		.d2-1665242727 .fill-B1{fill:#0D32B2;}
-		.d2-1665242727 .fill-B2{fill:#0D32B2;}
-		.d2-1665242727 .fill-B3{fill:#E3E9FD;}
-		.d2-1665242727 .fill-B4{fill:#E3E9FD;}
-		.d2-1665242727 .fill-B5{fill:#EDF0FD;}
-		.d2-1665242727 .fill-B6{fill:#F7F8FE;}
-		.d2-1665242727 .fill-AA2{fill:#4A6FF3;}
-		.d2-1665242727 .fill-AA4{fill:#EDF0FD;}
-		.d2-1665242727 .fill-AA5{fill:#F7F8FE;}
-		.d2-1665242727 .fill-AB4{fill:#EDF0FD;}
-		.d2-1665242727 .fill-AB5{fill:#F7F8FE;}
-		.d2-1665242727 .stroke-N1{stroke:#0A0F25;}
-		.d2-1665242727 .stroke-N2{stroke:#676C7E;}
-		.d2-1665242727 .stroke-N3{stroke:#9499AB;}
-		.d2-1665242727 .stroke-N4{stroke:#CFD2DD;}
-		.d2-1665242727 .stroke-N5{stroke:#DEE1EB;}
-		.d2-1665242727 .stroke-N6{stroke:#EEF1F8;}
-		.d2-1665242727 .stroke-N7{stroke:#FFFFFF;}
-		.d2-1665242727 .stroke-B1{stroke:#0D32B2;}
-		.d2-1665242727 .stroke-B2{stroke:#0D32B2;}
-		.d2-1665242727 .stroke-B3{stroke:#E3E9FD;}
-		.d2-1665242727 .stroke-B4{stroke:#E3E9FD;}
-		.d2-1665242727 .stroke-B5{stroke:#EDF0FD;}
-		.d2-1665242727 .stroke-B6{stroke:#F7F8FE;}
-		.d2-1665242727 .stroke-AA2{stroke:#4A6FF3;}
-		.d2-1665242727 .stroke-AA4{stroke:#EDF0FD;}
-		.d2-1665242727 .stroke-AA5{stroke:#F7F8FE;}
-		.d2-1665242727 .stroke-AB4{stroke:#EDF0FD;}
-		.d2-1665242727 .stroke-AB5{stroke:#F7F8FE;}
-		.d2-1665242727 .background-color-N1{background-color:#0A0F25;}
-		.d2-1665242727 .background-color-N2{background-color:#676C7E;}
-		.d2-1665242727 .background-color-N3{background-color:#9499AB;}
-		.d2-1665242727 .background-color-N4{background-color:#CFD2DD;}
-		.d2-1665242727 .background-color-N5{background-color:#DEE1EB;}
-		.d2-1665242727 .background-color-N6{background-color:#EEF1F8;}
-		.d2-1665242727 .background-color-N7{background-color:#FFFFFF;}
-		.d2-1665242727 .background-color-B1{background-color:#0D32B2;}
-		.d2-1665242727 .background-color-B2{background-color:#0D32B2;}
-		.d2-1665242727 .background-color-B3{background-color:#E3E9FD;}
-		.d2-1665242727 .background-color-B4{background-color:#E3E9FD;}
-		.d2-1665242727 .background-color-B5{background-color:#EDF0FD;}
-		.d2-1665242727 .background-color-B6{background-color:#F7F8FE;}
-		.d2-1665242727 .background-color-AA2{background-color:#4A6FF3;}
-		.d2-1665242727 .background-color-AA4{background-color:#EDF0FD;}
-		.d2-1665242727 .background-color-AA5{background-color:#F7F8FE;}
-		.d2-1665242727 .background-color-AB4{background-color:#EDF0FD;}
-		.d2-1665242727 .background-color-AB5{background-color:#F7F8FE;}
-		.d2-1665242727 .color-N1{color:#0A0F25;}
-		.d2-1665242727 .color-N2{color:#676C7E;}
-		.d2-1665242727 .color-N3{color:#9499AB;}
-		.d2-1665242727 .color-N4{color:#CFD2DD;}
-		.d2-1665242727 .color-N5{color:#DEE1EB;}
-		.d2-1665242727 .color-N6{color:#EEF1F8;}
-		.d2-1665242727 .color-N7{color:#FFFFFF;}
-		.d2-1665242727 .color-B1{color:#0D32B2;}
-		.d2-1665242727 .color-B2{color:#0D32B2;}
-		.d2-1665242727 .color-B3{color:#E3E9FD;}
-		.d2-1665242727 .color-B4{color:#E3E9FD;}
-		.d2-1665242727 .color-B5{color:#EDF0FD;}
-		.d2-1665242727 .color-B6{color:#F7F8FE;}
-		.d2-1665242727 .color-AA2{color:#4A6FF3;}
-		.d2-1665242727 .color-AA4{color:#EDF0FD;}
-		.d2-1665242727 .color-AA5{color:#F7F8FE;}
-		.d2-1665242727 .color-AB4{color:#EDF0FD;}
-		.d2-1665242727 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]></style><g id="x"><g class="shape" ><rect x="12.000000" y="12.000000" width="53.000000" height="66.000000" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="38.500000" y="50.500000" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">x</text></g><g id="y"><g class="shape" ><rect x="135.000000" y="12.000000" width="54.000000" height="66.000000" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="162.000000" y="50.500000" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">y</text></g><g id="(x &lt;-&gt; y)[0]"><marker id="mk-2451250203" markerWidth="10.000000" markerHeight="12.000000" refX="3.000000" refY="6.000000" viewBox="0.000000 0.000000 10.000000 12.000000" orient="auto" markerUnits="userSpaceOnUse"> <polygon points="10.000000,0.000000 0.000000,6.000000 10.000000,12.000000" class="connection fill-B1" stroke-width="2" /> </marker><marker id="mk-3488378134" markerWidth="10.000000" markerHeight="12.000000" refX="7.000000" refY="6.000000" viewBox="0.000000 0.000000 10.000000 12.000000" orient="auto" markerUnits="userSpaceOnUse"> <polygon points="0.000000,0.000000 10.000000,6.000000 0.000000,12.000000" class="connection fill-B1" stroke-width="2" /> </marker><path d="M 69.000000 45.000000 L 131.000000 45.000000" fill="none" class="connection stroke-B1" style="stroke-width:2;" marker-start="url(#mk-2451250203)" marker-end="url(#mk-3488378134)" mask="url(#d2-1665242727)" /><text x="84.500000" y="32.000000" fill="green" class="text-italic" style="text-anchor:middle;font-size:16px">eth1</text><text x="115.000000" y="32.000000" fill="red" class="text-italic" style="text-anchor:middle;font-size:16px">eth2</text></g><mask id="d2-1665242727" maskUnits="userSpaceOnUse" x="11" y="11" width="179" height="68">
-=======
 		.d2-142564125 .fill-N1{fill:#0A0F25;}
 		.d2-142564125 .fill-N2{fill:#676C7E;}
 		.d2-142564125 .fill-N3{fill:#9499AB;}
@@ -259,8 +96,7 @@
 		.d2-142564125 .color-AA4{color:#EDF0FD;}
 		.d2-142564125 .color-AA5{color:#F7F8FE;}
 		.d2-142564125 .color-AB4{color:#EDF0FD;}
-		.d2-142564125 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]></style><g id="x"><g class="shape" ><rect x="12.000000" y="12.000000" width="53.000000" height="66.000000" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="38.500000" y="50.500000" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">x</text></g><g id="y"><g class="shape" ><rect x="135.000000" y="12.000000" width="54.000000" height="66.000000" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="162.000000" y="50.500000" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">y</text></g><g id="(x &lt;-&gt; y)[0]"><marker id="mk-2451250203" markerWidth="10.000000" markerHeight="12.000000" refX="3.000000" refY="6.000000" viewBox="0.000000 0.000000 10.000000 12.000000" orient="auto" markerUnits="userSpaceOnUse"> <polygon points="10.000000,0.000000 0.000000,6.000000 10.000000,12.000000" class="connection fill-B1" stroke-width="2" /> </marker><marker id="mk-3488378134" markerWidth="10.000000" markerHeight="12.000000" refX="7.000000" refY="6.000000" viewBox="0.000000 0.000000 10.000000 12.000000" orient="auto" markerUnits="userSpaceOnUse"> <polygon points="0.000000,0.000000 10.000000,6.000000 0.000000,12.000000" class="connection fill-B1" stroke-width="2" /> </marker><path d="M 69.000000 45.000000 L 131.000000 45.000000" fill="none" class="connection stroke-B1" style="stroke-width:2;" marker-start="url(#mk-2451250203)" marker-end="url(#mk-3488378134)" mask="url(#d2-142564125)" /><text x="84.500000" y="32.000000" fill="green" class="text-italic" style="text-anchor:middle;font-size:16px">eth1</text><text x="115.000000" y="32.000000" fill="red" class="text-italic" style="text-anchor:middle;font-size:16px">eth2</text></g><mask id="d2-142564125" maskUnits="userSpaceOnUse" x="11" y="11" width="179" height="68">
+		.d2-142564125 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]></style><g id="x"><g class="shape" ><rect x="12.000000" y="12.000000" width="53.000000" height="66.000000" stroke="#0D32B2" fill="#F7F8FE" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="38.500000" y="50.500000" fill="#0A0F25" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">x</text></g><g id="y"><g class="shape" ><rect x="135.000000" y="12.000000" width="54.000000" height="66.000000" stroke="#0D32B2" fill="#F7F8FE" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="162.000000" y="50.500000" fill="#0A0F25" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">y</text></g><g id="(x &lt;-&gt; y)[0]"><marker id="mk-2451250203" markerWidth="10.000000" markerHeight="12.000000" refX="3.000000" refY="6.000000" viewBox="0.000000 0.000000 10.000000 12.000000" orient="auto" markerUnits="userSpaceOnUse"> <polygon points="10.000000,0.000000 0.000000,6.000000 10.000000,12.000000" fill="#0D32B2" class="connection fill-B1" stroke-width="2" /> </marker><marker id="mk-3488378134" markerWidth="10.000000" markerHeight="12.000000" refX="7.000000" refY="6.000000" viewBox="0.000000 0.000000 10.000000 12.000000" orient="auto" markerUnits="userSpaceOnUse"> <polygon points="0.000000,0.000000 10.000000,6.000000 0.000000,12.000000" fill="#0D32B2" class="connection fill-B1" stroke-width="2" /> </marker><path d="M 69.000000 45.000000 L 131.000000 45.000000" stroke="#0D32B2" fill="none" class="connection stroke-B1" style="stroke-width:2;" marker-start="url(#mk-2451250203)" marker-end="url(#mk-3488378134)" mask="url(#d2-142564125)" /><text x="84.500000" y="32.000000" fill="green" class="text-italic" style="text-anchor:middle;font-size:16px">eth1</text><text x="115.000000" y="32.000000" fill="red" class="text-italic" style="text-anchor:middle;font-size:16px">eth2</text></g><mask id="d2-142564125" maskUnits="userSpaceOnUse" x="11" y="11" width="179" height="68">
->>>>>>> 33280fed5 (fixed e2e tests)
 <rect x="11" y="11" width="179" height="68" fill="white"></rect>
 <rect x="34.500000" y="34.500000" width="8" height="21" fill="rgba(0,0,0,0.75)"></rect>
 <rect x="157.500000" y="34.500000" width="9" height="21" fill="rgba(0,0,0,0.75)"></rect>

e2etests/testdata/regression/bold_edge_label/dagre/sketch.exp.svg

@@ -1,22 +1,6 @@
-<<<<<<< HEAD
+<?xml version="1.0" encoding="utf-8"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" d2Version="v0.6.8-HEAD" preserveAspectRatio="xMinYMin meet" viewBox="0 0 425 68"><svg id="d2-svg" class="d2-1239787471" width="425" height="68" viewBox="-1 -1 425 68"><rect x="-1.000000" y="-1.000000" width="425.000000" height="68.000000" rx="0.000000" fill="#FFFFFF" class=" fill-N7" stroke-width="0" /><style type="text/css"><![CDATA[
-<<<<<<< HEAD
-<?xml version="1.0" encoding="utf-8"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" d2Version="v0.6.8-HEAD" preserveAspectRatio="xMinYMin meet" viewBox="0 0 425 68"><svg id="d2-svg" class="d2-3295824007" width="425" height="68" viewBox="-1 -1 425 68"><rect x="-1.000000" y="-1.000000" width="425.000000" height="68.000000" rx="0.000000" fill="#FFFFFF" class=" fill-N7" stroke-width="0" /><style type="text/css"><![CDATA[
-.d2-3295824007 .text-bold {
-	font-family: "d2-3295824007-font-bold";
-||||||| parent of 33280fed5 (fixed e2e tests)
-<?xml version="1.0" encoding="utf-8"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" d2Version="v0.6.6-HEAD" preserveAspectRatio="xMinYMin meet" viewBox="0 0 425 68"><svg id="d2-svg" class="d2-3295824007" width="425" height="68" viewBox="-1 -1 425 68"><rect x="-1.000000" y="-1.000000" width="425.000000" height="68.000000" rx="0.000000" class=" fill-N7" stroke-width="0" /><style type="text/css"><![CDATA[
-.d2-3295824007 .text-bold {
-	font-family: "d2-3295824007-font-bold";
-=======
-<?xml version="1.0" encoding="utf-8"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" d2Version="v0.6.5-HEAD" preserveAspectRatio="xMinYMin meet" viewBox="0 0 425 68"><svg id="d2-svg" class="d2-1239787471" width="425" height="68" viewBox="-1 -1 425 68"><rect x="-1.000000" y="-1.000000" width="425.000000" height="68.000000" rx="0.000000" class=" fill-N7" stroke-width="0" /><style type="text/css"><![CDATA[
-||||||| parent of cb2f2823c (Fix changes)
-<?xml version="1.0" encoding="utf-8"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" d2Version="v0.6.5-HEAD" preserveAspectRatio="xMinYMin meet" viewBox="0 0 425 68"><svg id="d2-svg" class="d2-1239787471" width="425" height="68" viewBox="-1 -1 425 68"><rect x="-1.000000" y="-1.000000" width="425.000000" height="68.000000" rx="0.000000" class=" fill-N7" stroke-width="0" /><style type="text/css"><![CDATA[
-=======
-<?xml version="1.0" encoding="utf-8"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" d2Version="v0.6.6-HEAD" preserveAspectRatio="xMinYMin meet" viewBox="0 0 425 68"><svg id="d2-svg" class="d2-1239787471" width="425" height="68" viewBox="-1 -1 425 68"><rect x="-1.000000" y="-1.000000" width="425.000000" height="68.000000" rx="0.000000" class=" fill-N7" stroke-width="0" /><style type="text/css"><![CDATA[
->>>>>>> cb2f2823c (Fix changes)
 .d2-1239787471 .text-bold {
 	font-family: "d2-1239787471-font-bold";
->>>>>>> 33280fed5 (fixed e2e tests)
 }
 @font-face {
 	font-family: d2-1239787471-font-bold;
@@ -41,153 +25,6 @@
   opacity: 0.5;
 }
 
-<<<<<<< HEAD
-		.d2-3295824007 .fill-N1{fill:#0A0F25;}
-		.d2-3295824007 .fill-N2{fill:#676C7E;}
-		.d2-3295824007 .fill-N3{fill:#9499AB;}
-		.d2-3295824007 .fill-N4{fill:#CFD2DD;}
-		.d2-3295824007 .fill-N5{fill:#DEE1EB;}
-		.d2-3295824007 .fill-N6{fill:#EEF1F8;}
-		.d2-3295824007 .fill-N7{fill:#FFFFFF;}
-		.d2-3295824007 .fill-B1{fill:#0D32B2;}
-		.d2-3295824007 .fill-B2{fill:#0D32B2;}
-		.d2-3295824007 .fill-B3{fill:#E3E9FD;}
-		.d2-3295824007 .fill-B4{fill:#E3E9FD;}
-		.d2-3295824007 .fill-B5{fill:#EDF0FD;}
-		.d2-3295824007 .fill-B6{fill:#F7F8FE;}
-		.d2-3295824007 .fill-AA2{fill:#4A6FF3;}
-		.d2-3295824007 .fill-AA4{fill:#EDF0FD;}
-		.d2-3295824007 .fill-AA5{fill:#F7F8FE;}
-		.d2-3295824007 .fill-AB4{fill:#EDF0FD;}
-		.d2-3295824007 .fill-AB5{fill:#F7F8FE;}
-		.d2-3295824007 .stroke-N1{stroke:#0A0F25;}
-		.d2-3295824007 .stroke-N2{stroke:#676C7E;}
-		.d2-3295824007 .stroke-N3{stroke:#9499AB;}
-		.d2-3295824007 .stroke-N4{stroke:#CFD2DD;}
-		.d2-3295824007 .stroke-N5{stroke:#DEE1EB;}
-		.d2-3295824007 .stroke-N6{stroke:#EEF1F8;}
-		.d2-3295824007 .stroke-N7{stroke:#FFFFFF;}
-		.d2-3295824007 .stroke-B1{stroke:#0D32B2;}
-		.d2-3295824007 .stroke-B2{stroke:#0D32B2;}
-		.d2-3295824007 .stroke-B3{stroke:#E3E9FD;}
-		.d2-3295824007 .stroke-B4{stroke:#E3E9FD;}
-		.d2-3295824007 .stroke-B5{stroke:#EDF0FD;}
-		.d2-3295824007 .stroke-B6{stroke:#F7F8FE;}
-		.d2-3295824007 .stroke-AA2{stroke:#4A6FF3;}
-		.d2-3295824007 .stroke-AA4{stroke:#EDF0FD;}
-		.d2-3295824007 .stroke-AA5{stroke:#F7F8FE;}
-		.d2-3295824007 .stroke-AB4{stroke:#EDF0FD;}
-		.d2-3295824007 .stroke-AB5{stroke:#F7F8FE;}
-		.d2-3295824007 .background-color-N1{background-color:#0A0F25;}
-		.d2-3295824007 .background-color-N2{background-color:#676C7E;}
-		.d2-3295824007 .background-color-N3{background-color:#9499AB;}
-		.d2-3295824007 .background-color-N4{background-color:#CFD2DD;}
-		.d2-3295824007 .background-color-N5{background-color:#DEE1EB;}
-		.d2-3295824007 .background-color-N6{background-color:#EEF1F8;}
-		.d2-3295824007 .background-color-N7{background-color:#FFFFFF;}
-		.d2-3295824007 .background-color-B1{background-color:#0D32B2;}
-		.d2-3295824007 .background-color-B2{background-color:#0D32B2;}
-		.d2-3295824007 .background-color-B3{background-color:#E3E9FD;}
-		.d2-3295824007 .background-color-B4{background-color:#E3E9FD;}
-		.d2-3295824007 .background-color-B5{background-color:#EDF0FD;}
-		.d2-3295824007 .background-color-B6{background-color:#F7F8FE;}
-		.d2-3295824007 .background-color-AA2{background-color:#4A6FF3;}
-		.d2-3295824007 .background-color-AA4{background-color:#EDF0FD;}
-		.d2-3295824007 .background-color-AA5{background-color:#F7F8FE;}
-		.d2-3295824007 .background-color-AB4{background-color:#EDF0FD;}
-		.d2-3295824007 .background-color-AB5{background-color:#F7F8FE;}
-		.d2-3295824007 .color-N1{color:#0A0F25;}
-		.d2-3295824007 .color-N2{color:#676C7E;}
-		.d2-3295824007 .color-N3{color:#9499AB;}
-		.d2-3295824007 .color-N4{color:#CFD2DD;}
-		.d2-3295824007 .color-N5{color:#DEE1EB;}
-		.d2-3295824007 .color-N6{color:#EEF1F8;}
-		.d2-3295824007 .color-N7{color:#FFFFFF;}
-		.d2-3295824007 .color-B1{color:#0D32B2;}
-		.d2-3295824007 .color-B2{color:#0D32B2;}
-		.d2-3295824007 .color-B3{color:#E3E9FD;}
-		.d2-3295824007 .color-B4{color:#E3E9FD;}
-		.d2-3295824007 .color-B5{color:#EDF0FD;}
-		.d2-3295824007 .color-B6{color:#F7F8FE;}
-		.d2-3295824007 .color-AA2{color:#4A6FF3;}
-		.d2-3295824007 .color-AA4{color:#EDF0FD;}
-		.d2-3295824007 .color-AA5{color:#F7F8FE;}
-		.d2-3295824007 .color-AB4{color:#EDF0FD;}
-		.d2-3295824007 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]></style><g id="x"><g class="shape" ><rect x="0.000000" y="0.000000" width="53.000000" height="66.000000" stroke="#0D32B2" fill="#F7F8FE" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="26.500000" y="38.500000" fill="#0A0F25" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">x</text></g><g id="y"><g class="shape" ><rect x="184.000000" y="0.000000" width="54.000000" height="66.000000" stroke="#0D32B2" fill="#F7F8FE" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="211.000000" y="38.500000" fill="#0A0F25" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">y</text></g><g id="z"><g class="shape" ><rect x="371.000000" y="0.000000" width="52.000000" height="66.000000" stroke="#0D32B2" fill="#F7F8FE" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="397.000000" y="38.500000" fill="#0A0F25" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">z</text></g><g id="(x -&gt; y)[0]"><marker id="mk-3488378134" markerWidth="10.000000" markerHeight="12.000000" refX="7.000000" refY="6.000000" viewBox="0.000000 0.000000 10.000000 12.000000" orient="auto" markerUnits="userSpaceOnUse"> <polygon points="0.000000,0.000000 10.000000,6.000000 0.000000,12.000000" fill="#0D32B2" class="connection fill-B1" stroke-width="2" /> </marker><path d="M 54.500000 33.000000 C 105.300003 33.000000 131.699997 33.000000 180.500000 33.000000" stroke="#0D32B2" fill="none" class="connection stroke-B1" style="stroke-width:2;" marker-end="url(#mk-3488378134)" mask="url(#d2-3295824007)" /><text x="118.500000" y="39.000000" fill="#676C7E" class="text-italic fill-N2" style="text-anchor:middle;font-size:16px">sync</text></g><g id="(y -&gt; z)[0]"><path d="M 239.500000 33.000000 C 291.100006 33.000000 317.899994 33.000000 367.500000 33.000000" stroke="#0D32B2" fill="none" class="connection stroke-B1" style="stroke-width:2;" marker-end="url(#mk-3488378134)" mask="url(#d2-3295824007)" /><text x="304.500000" y="39.000000" fill="#676C7E" class="text-bold fill-N2" style="text-anchor:middle;font-size:16px">sync</text></g><mask id="d2-3295824007" maskUnits="userSpaceOnUse" x="-1" y="-1" width="425" height="68">
-||||||| parent of 33280fed5 (fixed e2e tests)
-		.d2-3295824007 .fill-N1{fill:#0A0F25;}
-		.d2-3295824007 .fill-N2{fill:#676C7E;}
-		.d2-3295824007 .fill-N3{fill:#9499AB;}
-		.d2-3295824007 .fill-N4{fill:#CFD2DD;}
-		.d2-3295824007 .fill-N5{fill:#DEE1EB;}
-		.d2-3295824007 .fill-N6{fill:#EEF1F8;}
-		.d2-3295824007 .fill-N7{fill:#FFFFFF;}
-		.d2-3295824007 .fill-B1{fill:#0D32B2;}
-		.d2-3295824007 .fill-B2{fill:#0D32B2;}
-		.d2-3295824007 .fill-B3{fill:#E3E9FD;}
-		.d2-3295824007 .fill-B4{fill:#E3E9FD;}
-		.d2-3295824007 .fill-B5{fill:#EDF0FD;}
-		.d2-3295824007 .fill-B6{fill:#F7F8FE;}
-		.d2-3295824007 .fill-AA2{fill:#4A6FF3;}
-		.d2-3295824007 .fill-AA4{fill:#EDF0FD;}
-		.d2-3295824007 .fill-AA5{fill:#F7F8FE;}
-		.d2-3295824007 .fill-AB4{fill:#EDF0FD;}
-		.d2-3295824007 .fill-AB5{fill:#F7F8FE;}
-		.d2-3295824007 .stroke-N1{stroke:#0A0F25;}
-		.d2-3295824007 .stroke-N2{stroke:#676C7E;}
-		.d2-3295824007 .stroke-N3{stroke:#9499AB;}
-		.d2-3295824007 .stroke-N4{stroke:#CFD2DD;}
-		.d2-3295824007 .stroke-N5{stroke:#DEE1EB;}
-		.d2-3295824007 .stroke-N6{stroke:#EEF1F8;}
-		.d2-3295824007 .stroke-N7{stroke:#FFFFFF;}
-		.d2-3295824007 .stroke-B1{stroke:#0D32B2;}
-		.d2-3295824007 .stroke-B2{stroke:#0D32B2;}
-		.d2-3295824007 .stroke-B3{stroke:#E3E9FD;}
-		.d2-3295824007 .stroke-B4{stroke:#E3E9FD;}
-		.d2-3295824007 .stroke-B5{stroke:#EDF0FD;}
-		.d2-3295824007 .stroke-B6{stroke:#F7F8FE;}
-		.d2-3295824007 .stroke-AA2{stroke:#4A6FF3;}
-		.d2-3295824007 .stroke-AA4{stroke:#EDF0FD;}
-		.d2-3295824007 .stroke-AA5{stroke:#F7F8FE;}
-		.d2-3295824007 .stroke-AB4{stroke:#EDF0FD;}
-		.d2-3295824007 .stroke-AB5{stroke:#F7F8FE;}
-		.d2-3295824007 .background-color-N1{background-color:#0A0F25;}
-		.d2-3295824007 .background-color-N2{background-color:#676C7E;}
-		.d2-3295824007 .background-color-N3{background-color:#9499AB;}
-		.d2-3295824007 .background-color-N4{background-color:#CFD2DD;}
-		.d2-3295824007 .background-color-N5{background-color:#DEE1EB;}
-		.d2-3295824007 .background-color-N6{background-color:#EEF1F8;}
-		.d2-3295824007 .background-color-N7{background-color:#FFFFFF;}
-		.d2-3295824007 .background-color-B1{background-color:#0D32B2;}
-		.d2-3295824007 .background-color-B2{background-color:#0D32B2;}
-		.d2-3295824007 .background-color-B3{background-color:#E3E9FD;}
-		.d2-3295824007 .background-color-B4{background-color:#E3E9FD;}
-		.d2-3295824007 .background-color-B5{background-color:#EDF0FD;}
-		.d2-3295824007 .background-color-B6{background-color:#F7F8FE;}
-		.d2-3295824007 .background-color-AA2{background-color:#4A6FF3;}
-		.d2-3295824007 .background-color-AA4{background-color:#EDF0FD;}
-		.d2-3295824007 .background-color-AA5{background-color:#F7F8FE;}
-		.d2-3295824007 .background-color-AB4{background-color:#EDF0FD;}
-		.d2-3295824007 .background-color-AB5{background-color:#F7F8FE;}
-		.d2-3295824007 .color-N1{color:#0A0F25;}
-		.d2-3295824007 .color-N2{color:#676C7E;}
-		.d2-3295824007 .color-N3{color:#9499AB;}
-		.d2-3295824007 .color-N4{color:#CFD2DD;}
-		.d2-3295824007 .color-N5{color:#DEE1EB;}
-		.d2-3295824007 .color-N6{color:#EEF1F8;}
-		.d2-3295824007 .color-N7{color:#FFFFFF;}
-		.d2-3295824007 .color-B1{color:#0D32B2;}
-		.d2-3295824007 .color-B2{color:#0D32B2;}
-		.d2-3295824007 .color-B3{color:#E3E9FD;}
-		.d2-3295824007 .color-B4{color:#E3E9FD;}
-		.d2-3295824007 .color-B5{color:#EDF0FD;}
-		.d2-3295824007 .color-B6{color:#F7F8FE;}
-		.d2-3295824007 .color-AA2{color:#4A6FF3;}
-		.d2-3295824007 .color-AA4{color:#EDF0FD;}
-		.d2-3295824007 .color-AA5{color:#F7F8FE;}
-		.d2-3295824007 .color-AB4{color:#EDF0FD;}
-		.d2-3295824007 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]></style><g id="x"><g class="shape" ><rect x="0.000000" y="0.000000" width="53.000000" height="66.000000" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="26.500000" y="38.500000" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">x</text></g><g id="y"><g class="shape" ><rect x="184.000000" y="0.000000" width="54.000000" height="66.000000" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="211.000000" y="38.500000" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">y</text></g><g id="z"><g class="shape" ><rect x="371.000000" y="0.000000" width="52.000000" height="66.000000" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="397.000000" y="38.500000" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">z</text></g><g id="(x -&gt; y)[0]"><marker id="mk-3488378134" markerWidth="10.000000" markerHeight="12.000000" refX="7.000000" refY="6.000000" viewBox="0.000000 0.000000 10.000000 12.000000" orient="auto" markerUnits="userSpaceOnUse"> <polygon points="0.000000,0.000000 10.000000,6.000000 0.000000,12.000000" class="connection fill-B1" stroke-width="2" /> </marker><path d="M 54.500000 33.000000 C 105.300003 33.000000 131.699997 33.000000 180.500000 33.000000" fill="none" class="connection stroke-B1" style="stroke-width:2;" marker-end="url(#mk-3488378134)" mask="url(#d2-3295824007)" /><text x="118.500000" y="39.000000" class="text-italic fill-N2" style="text-anchor:middle;font-size:16px">sync</text></g><g id="(y -&gt; z)[0]"><path d="M 239.500000 33.000000 C 291.100006 33.000000 317.899994 33.000000 367.500000 33.000000" fill="none" class="connection stroke-B1" style="stroke-width:2;" marker-end="url(#mk-3488378134)" mask="url(#d2-3295824007)" /><text x="304.500000" y="39.000000" class="text-bold fill-N2" style="text-anchor:middle;font-size:16px">sync</text></g><mask id="d2-3295824007" maskUnits="userSpaceOnUse" x="-1" y="-1" width="425" height="68">
-=======
 		.d2-1239787471 .fill-N1{fill:#0A0F25;}
 		.d2-1239787471 .fill-N2{fill:#676C7E;}
 		.d2-1239787471 .fill-N3{fill:#9499AB;}
@@ -259,8 +96,7 @@
 		.d2-1239787471 .color-AA4{color:#EDF0FD;}
 		.d2-1239787471 .color-AA5{color:#F7F8FE;}
 		.d2-1239787471 .color-AB4{color:#EDF0FD;}
-		.d2-1239787471 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]></style><g id="x"><g class="shape" ><rect x="0.000000" y="0.000000" width="53.000000" height="66.000000" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="26.500000" y="38.500000" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">x</text></g><g id="y"><g class="shape" ><rect x="184.000000" y="0.000000" width="54.000000" height="66.000000" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="211.000000" y="38.500000" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">y</text></g><g id="z"><g class="shape" ><rect x="371.000000" y="0.000000" width="52.000000" height="66.000000" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="397.000000" y="38.500000" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">z</text></g><g id="(x -&gt; y)[0]"><marker id="mk-3488378134" markerWidth="10.000000" markerHeight="12.000000" refX="7.000000" refY="6.000000" viewBox="0.000000 0.000000 10.000000 12.000000" orient="auto" markerUnits="userSpaceOnUse"> <polygon points="0.000000,0.000000 10.000000,6.000000 0.000000,12.000000" class="connection fill-B1" stroke-width="2" /> </marker><path d="M 54.500000 33.000000 C 105.300003 33.000000 131.699997 33.000000 180.500000 33.000000" fill="none" class="connection stroke-B1" style="stroke-width:2;" marker-end="url(#mk-3488378134)" mask="url(#d2-1239787471)" /><text x="118.500000" y="39.000000" class="text-italic fill-N2" style="text-anchor:middle;font-size:16px">sync</text></g><g id="(y -&gt; z)[0]"><path d="M 239.500000 33.000000 C 291.100006 33.000000 317.899994 33.000000 367.500000 33.000000" fill="none" class="connection stroke-B1" style="stroke-width:2;" marker-end="url(#mk-3488378134)" mask="url(#d2-1239787471)" /><text x="304.500000" y="39.000000" class="text-bold fill-N2" style="text-anchor:middle;font-size:16px">sync</text></g><mask id="d2-1239787471" maskUnits="userSpaceOnUse" x="-1" y="-1" width="425" height="68">
+		.d2-1239787471 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]></style><g id="x"><g class="shape" ><rect x="0.000000" y="0.000000" width="53.000000" height="66.000000" stroke="#0D32B2" fill="#F7F8FE" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="26.500000" y="38.500000" fill="#0A0F25" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">x</text></g><g id="y"><g class="shape" ><rect x="184.000000" y="0.000000" width="54.000000" height="66.000000" stroke="#0D32B2" fill="#F7F8FE" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="211.000000" y="38.500000" fill="#0A0F25" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">y</text></g><g id="z"><g class="shape" ><rect x="371.000000" y="0.000000" width="52.000000" height="66.000000" stroke="#0D32B2" fill="#F7F8FE" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="397.000000" y="38.500000" fill="#0A0F25" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">z</text></g><g id="(x -&gt; y)[0]"><marker id="mk-3488378134" markerWidth="10.000000" markerHeight="12.000000" refX="7.000000" refY="6.000000" viewBox="0.000000 0.000000 10.000000 12.000000" orient="auto" markerUnits="userSpaceOnUse"> <polygon points="0.000000,0.000000 10.000000,6.000000 0.000000,12.000000" fill="#0D32B2" class="connection fill-B1" stroke-width="2" /> </marker><path d="M 54.500000 33.000000 C 105.300003 33.000000 131.699997 33.000000 180.500000 33.000000" stroke="#0D32B2" fill="none" class="connection stroke-B1" style="stroke-width:2;" marker-end="url(#mk-3488378134)" mask="url(#d2-1239787471)" /><text x="118.500000" y="39.000000" fill="#676C7E" class="text-italic fill-N2" style="text-anchor:middle;font-size:16px">sync</text></g><g id="(y -&gt; z)[0]"><path d="M 239.500000 33.000000 C 291.100006 33.000000 317.899994 33.000000 367.500000 33.000000" stroke="#0D32B2" fill="none" class="connection stroke-B1" style="stroke-width:2;" marker-end="url(#mk-3488378134)" mask="url(#d2-1239787471)" /><text x="304.500000" y="39.000000" fill="#676C7E" class="text-bold fill-N2" style="text-anchor:middle;font-size:16px">sync</text></g><mask id="d2-1239787471" maskUnits="userSpaceOnUse" x="-1" y="-1" width="425" height="68">
->>>>>>> 33280fed5 (fixed e2e tests)
 <rect x="-1" y="-1" width="425" height="68" fill="white"></rect>
 <rect x="22.500000" y="22.500000" width="8" height="21" fill="rgba(0,0,0,0.75)"></rect>
 <rect x="206.500000" y="22.500000" width="9" height="21" fill="rgba(0,0,0,0.75)"></rect>

e2etests/testdata/regression/bold_edge_label/elk/sketch.exp.svg

@@ -1,22 +1,6 @@
-<<<<<<< HEAD
+<?xml version="1.0" encoding="utf-8"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" d2Version="v0.6.8-HEAD" preserveAspectRatio="xMinYMin meet" viewBox="0 0 505 68"><svg id="d2-svg" class="d2-2828377911" width="505" height="68" viewBox="11 11 505 68"><rect x="11.000000" y="11.000000" width="505.000000" height="68.000000" rx="0.000000" fill="#FFFFFF" class=" fill-N7" stroke-width="0" /><style type="text/css"><![CDATA[
-<<<<<<< HEAD
-<?xml version="1.0" encoding="utf-8"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" d2Version="v0.6.8-HEAD" preserveAspectRatio="xMinYMin meet" viewBox="0 0 505 68"><svg id="d2-svg" class="d2-1721623843" width="505" height="68" viewBox="11 11 505 68"><rect x="11.000000" y="11.000000" width="505.000000" height="68.000000" rx="0.000000" fill="#FFFFFF" class=" fill-N7" stroke-width="0" /><style type="text/css"><![CDATA[
-.d2-1721623843 .text-bold {
-	font-family: "d2-1721623843-font-bold";
-||||||| parent of 33280fed5 (fixed e2e tests)
-<?xml version="1.0" encoding="utf-8"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" d2Version="v0.6.6-HEAD" preserveAspectRatio="xMinYMin meet" viewBox="0 0 505 68"><svg id="d2-svg" class="d2-1721623843" width="505" height="68" viewBox="11 11 505 68"><rect x="11.000000" y="11.000000" width="505.000000" height="68.000000" rx="0.000000" class=" fill-N7" stroke-width="0" /><style type="text/css"><![CDATA[
-.d2-1721623843 .text-bold {
-	font-family: "d2-1721623843-font-bold";
-=======
-<?xml version="1.0" encoding="utf-8"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" d2Version="v0.6.5-HEAD" preserveAspectRatio="xMinYMin meet" viewBox="0 0 505 68"><svg id="d2-svg" class="d2-2828377911" width="505" height="68" viewBox="11 11 505 68"><rect x="11.000000" y="11.000000" width="505.000000" height="68.000000" rx="0.000000" class=" fill-N7" stroke-width="0" /><style type="text/css"><![CDATA[
-||||||| parent of cb2f2823c (Fix changes)
-<?xml version="1.0" encoding="utf-8"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" d2Version="v0.6.5-HEAD" preserveAspectRatio="xMinYMin meet" viewBox="0 0 505 68"><svg id="d2-svg" class="d2-2828377911" width="505" height="68" viewBox="11 11 505 68"><rect x="11.000000" y="11.000000" width="505.000000" height="68.000000" rx="0.000000" class=" fill-N7" stroke-width="0" /><style type="text/css"><![CDATA[
-=======
-<?xml version="1.0" encoding="utf-8"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" d2Version="v0.6.6-HEAD" preserveAspectRatio="xMinYMin meet" viewBox="0 0 505 68"><svg id="d2-svg" class="d2-2828377911" width="505" height="68" viewBox="11 11 505 68"><rect x="11.000000" y="11.000000" width="505.000000" height="68.000000" rx="0.000000" class=" fill-N7" stroke-width="0" /><style type="text/css"><![CDATA[
->>>>>>> cb2f2823c (Fix changes)
 .d2-2828377911 .text-bold {
 	font-family: "d2-2828377911-font-bold";
->>>>>>> 33280fed5 (fixed e2e tests)
 }
 @font-face {
 	font-family: d2-2828377911-font-bold;
@@ -41,153 +25,6 @@
   opacity: 0.5;
 }
 
-<<<<<<< HEAD
-		.d2-1721623843 .fill-N1{fill:#0A0F25;}
-		.d2-1721623843 .fill-N2{fill:#676C7E;}
-		.d2-1721623843 .fill-N3{fill:#9499AB;}
-		.d2-1721623843 .fill-N4{fill:#CFD2DD;}
-		.d2-1721623843 .fill-N5{fill:#DEE1EB;}
-		.d2-1721623843 .fill-N6{fill:#EEF1F8;}
-		.d2-1721623843 .fill-N7{fill:#FFFFFF;}
-		.d2-1721623843 .fill-B1{fill:#0D32B2;}
-		.d2-1721623843 .fill-B2{fill:#0D32B2;}
-		.d2-1721623843 .fill-B3{fill:#E3E9FD;}
-		.d2-1721623843 .fill-B4{fill:#E3E9FD;}
-		.d2-1721623843 .fill-B5{fill:#EDF0FD;}
-		.d2-1721623843 .fill-B6{fill:#F7F8FE;}
-		.d2-1721623843 .fill-AA2{fill:#4A6FF3;}
-		.d2-1721623843 .fill-AA4{fill:#EDF0FD;}
-		.d2-1721623843 .fill-AA5{fill:#F7F8FE;}
-		.d2-1721623843 .fill-AB4{fill:#EDF0FD;}
-		.d2-1721623843 .fill-AB5{fill:#F7F8FE;}
-		.d2-1721623843 .stroke-N1{stroke:#0A0F25;}
-		.d2-1721623843 .stroke-N2{stroke:#676C7E;}
-		.d2-1721623843 .stroke-N3{stroke:#9499AB;}
-		.d2-1721623843 .stroke-N4{stroke:#CFD2DD;}
-		.d2-1721623843 .stroke-N5{stroke:#DEE1EB;}
-		.d2-1721623843 .stroke-N6{stroke:#EEF1F8;}
-		.d2-1721623843 .stroke-N7{stroke:#FFFFFF;}
-		.d2-1721623843 .stroke-B1{stroke:#0D32B2;}
-		.d2-1721623843 .stroke-B2{stroke:#0D32B2;}
-		.d2-1721623843 .stroke-B3{stroke:#E3E9FD;}
-		.d2-1721623843 .stroke-B4{stroke:#E3E9FD;}
-		.d2-1721623843 .stroke-B5{stroke:#EDF0FD;}
-		.d2-1721623843 .stroke-B6{stroke:#F7F8FE;}
-		.d2-1721623843 .stroke-AA2{stroke:#4A6FF3;}
-		.d2-1721623843 .stroke-AA4{stroke:#EDF0FD;}
-		.d2-1721623843 .stroke-AA5{stroke:#F7F8FE;}
-		.d2-1721623843 .stroke-AB4{stroke:#EDF0FD;}
-		.d2-1721623843 .stroke-AB5{stroke:#F7F8FE;}
-		.d2-1721623843 .background-color-N1{background-color:#0A0F25;}
-		.d2-1721623843 .background-color-N2{background-color:#676C7E;}
-		.d2-1721623843 .background-color-N3{background-color:#9499AB;}
-		.d2-1721623843 .background-color-N4{background-color:#CFD2DD;}
-		.d2-1721623843 .background-color-N5{background-color:#DEE1EB;}
-		.d2-1721623843 .background-color-N6{background-color:#EEF1F8;}
-		.d2-1721623843 .background-color-N7{background-color:#FFFFFF;}
-		.d2-1721623843 .background-color-B1{background-color:#0D32B2;}
-		.d2-1721623843 .background-color-B2{background-color:#0D32B2;}
-		.d2-1721623843 .background-color-B3{background-color:#E3E9FD;}
-		.d2-1721623843 .background-color-B4{background-color:#E3E9FD;}
-		.d2-1721623843 .background-color-B5{background-color:#EDF0FD;}
-		.d2-1721623843 .background-color-B6{background-color:#F7F8FE;}
-		.d2-1721623843 .background-color-AA2{background-color:#4A6FF3;}
-		.d2-1721623843 .background-color-AA4{background-color:#EDF0FD;}
-		.d2-1721623843 .background-color-AA5{background-color:#F7F8FE;}
-		.d2-1721623843 .background-color-AB4{background-color:#EDF0FD;}
-		.d2-1721623843 .background-color-AB5{background-color:#F7F8FE;}
-		.d2-1721623843 .color-N1{color:#0A0F25;}
-		.d2-1721623843 .color-N2{color:#676C7E;}
-		.d2-1721623843 .color-N3{color:#9499AB;}
-		.d2-1721623843 .color-N4{color:#CFD2DD;}
-		.d2-1721623843 .color-N5{color:#DEE1EB;}
-		.d2-1721623843 .color-N6{color:#EEF1F8;}
-		.d2-1721623843 .color-N7{color:#FFFFFF;}
-		.d2-1721623843 .color-B1{color:#0D32B2;}
-		.d2-1721623843 .color-B2{color:#0D32B2;}
-		.d2-1721623843 .color-B3{color:#E3E9FD;}
-		.d2-1721623843 .color-B4{color:#E3E9FD;}
-		.d2-1721623843 .color-B5{color:#EDF0FD;}
-		.d2-1721623843 .color-B6{color:#F7F8FE;}
-		.d2-1721623843 .color-AA2{color:#4A6FF3;}
-		.d2-1721623843 .color-AA4{color:#EDF0FD;}
-		.d2-1721623843 .color-AA5{color:#F7F8FE;}
-		.d2-1721623843 .color-AB4{color:#EDF0FD;}
-		.d2-1721623843 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]></style><g id="x"><g class="shape" ><rect x="12.000000" y="12.000000" width="53.000000" height="66.000000" stroke="#0D32B2" fill="#F7F8FE" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="38.500000" y="50.500000" fill="#0A0F25" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">x</text></g><g id="y"><g class="shape" ><rect x="236.000000" y="12.000000" width="54.000000" height="66.000000" stroke="#0D32B2" fill="#F7F8FE" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="263.000000" y="50.500000" fill="#0A0F25" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">y</text></g><g id="z"><g class="shape" ><rect x="463.000000" y="12.000000" width="52.000000" height="66.000000" stroke="#0D32B2" fill="#F7F8FE" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="489.000000" y="50.500000" fill="#0A0F25" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">z</text></g><g id="(x -&gt; y)[0]"><marker id="mk-3488378134" markerWidth="10.000000" markerHeight="12.000000" refX="7.000000" refY="6.000000" viewBox="0.000000 0.000000 10.000000 12.000000" orient="auto" markerUnits="userSpaceOnUse"> <polygon points="0.000000,0.000000 10.000000,6.000000 0.000000,12.000000" fill="#0D32B2" class="connection fill-B1" stroke-width="2" /> </marker><path d="M 67.000000 45.000000 L 232.000000 45.000000" stroke="#0D32B2" fill="none" class="connection stroke-B1" style="stroke-width:2;" marker-end="url(#mk-3488378134)" mask="url(#d2-1721623843)" /><text x="150.500000" y="51.000000" fill="#676C7E" class="text-italic fill-N2" style="text-anchor:middle;font-size:16px">sync</text></g><g id="(y -&gt; z)[0]"><path d="M 292.000000 45.000000 L 459.000000 45.000000" stroke="#0D32B2" fill="none" class="connection stroke-B1" style="stroke-width:2;" marker-end="url(#mk-3488378134)" mask="url(#d2-1721623843)" /><text x="376.500000" y="51.000000" fill="#676C7E" class="text-bold fill-N2" style="text-anchor:middle;font-size:16px">sync</text></g><mask id="d2-1721623843" maskUnits="userSpaceOnUse" x="11" y="11" width="505" height="68">
-||||||| parent of 33280fed5 (fixed e2e tests)
-		.d2-1721623843 .fill-N1{fill:#0A0F25;}
-		.d2-1721623843 .fill-N2{fill:#676C7E;}
-		.d2-1721623843 .fill-N3{fill:#9499AB;}
-		.d2-1721623843 .fill-N4{fill:#CFD2DD;}
-		.d2-1721623843 .fill-N5{fill:#DEE1EB;}
-		.d2-1721623843 .fill-N6{fill:#EEF1F8;}
-		.d2-1721623843 .fill-N7{fill:#FFFFFF;}
-		.d2-1721623843 .fill-B1{fill:#0D32B2;}
-		.d2-1721623843 .fill-B2{fill:#0D32B2;}
-		.d2-1721623843 .fill-B3{fill:#E3E9FD;}
-		.d2-1721623843 .fill-B4{fill:#E3E9FD;}
-		.d2-1721623843 .fill-B5{fill:#EDF0FD;}
-		.d2-1721623843 .fill-B6{fill:#F7F8FE;}
-		.d2-1721623843 .fill-AA2{fill:#4A6FF3;}
-		.d2-1721623843 .fill-AA4{fill:#EDF0FD;}
-		.d2-1721623843 .fill-AA5{fill:#F7F8FE;}
-		.d2-1721623843 .fill-AB4{fill:#EDF0FD;}
-		.d2-1721623843 .fill-AB5{fill:#F7F8FE;}
-		.d2-1721623843 .stroke-N1{stroke:#0A0F25;}
-		.d2-1721623843 .stroke-N2{stroke:#676C7E;}
-		.d2-1721623843 .stroke-N3{stroke:#9499AB;}
-		.d2-1721623843 .stroke-N4{stroke:#CFD2DD;}
-		.d2-1721623843 .stroke-N5{stroke:#DEE1EB;}
-		.d2-1721623843 .stroke-N6{stroke:#EEF1F8;}
-		.d2-1721623843 .stroke-N7{stroke:#FFFFFF;}
-		.d2-1721623843 .stroke-B1{stroke:#0D32B2;}
-		.d2-1721623843 .stroke-B2{stroke:#0D32B2;}
-		.d2-1721623843 .stroke-B3{stroke:#E3E9FD;}
-		.d2-1721623843 .stroke-B4{stroke:#E3E9FD;}
-		.d2-1721623843 .stroke-B5{stroke:#EDF0FD;}
-		.d2-1721623843 .stroke-B6{stroke:#F7F8FE;}
-		.d2-1721623843 .stroke-AA2{stroke:#4A6FF3;}
-		.d2-1721623843 .stroke-AA4{stroke:#EDF0FD;}
-		.d2-1721623843 .stroke-AA5{stroke:#F7F8FE;}
-		.d2-1721623843 .stroke-AB4{stroke:#EDF0FD;}
-		.d2-1721623843 .stroke-AB5{stroke:#F7F8FE;}
-		.d2-1721623843 .background-color-N1{background-color:#0A0F25;}
-		.d2-1721623843 .background-color-N2{background-color:#676C7E;}
-		.d2-1721623843 .background-color-N3{background-color:#9499AB;}
-		.d2-1721623843 .background-color-N4{background-color:#CFD2DD;}
-		.d2-1721623843 .background-color-N5{background-color:#DEE1EB;}
-		.d2-1721623843 .background-color-N6{background-color:#EEF1F8;}
-		.d2-1721623843 .background-color-N7{background-color:#FFFFFF;}
-		.d2-1721623843 .background-color-B1{background-color:#0D32B2;}
-		.d2-1721623843 .background-color-B2{background-color:#0D32B2;}
-		.d2-1721623843 .background-color-B3{background-color:#E3E9FD;}
-		.d2-1721623843 .background-color-B4{background-color:#E3E9FD;}
-		.d2-1721623843 .background-color-B5{background-color:#EDF0FD;}
-		.d2-1721623843 .background-color-B6{background-color:#F7F8FE;}
-		.d2-1721623843 .background-color-AA2{background-color:#4A6FF3;}
-		.d2-1721623843 .background-color-AA4{background-color:#EDF0FD;}
-		.d2-1721623843 .background-color-AA5{background-color:#F7F8FE;}
-		.d2-1721623843 .background-color-AB4{background-color:#EDF0FD;}
-		.d2-1721623843 .background-color-AB5{background-color:#F7F8FE;}
-		.d2-1721623843 .color-N1{color:#0A0F25;}
-		.d2-1721623843 .color-N2{color:#676C7E;}
-		.d2-1721623843 .color-N3{color:#9499AB;}
-		.d2-1721623843 .color-N4{color:#CFD2DD;}
-		.d2-1721623843 .color-N5{color:#DEE1EB;}
-		.d2-1721623843 .color-N6{color:#EEF1F8;}
-		.d2-1721623843 .color-N7{color:#FFFFFF;}
-		.d2-1721623843 .color-B1{color:#0D32B2;}
-		.d2-1721623843 .color-B2{color:#0D32B2;}
-		.d2-1721623843 .color-B3{color:#E3E9FD;}
-		.d2-1721623843 .color-B4{color:#E3E9FD;}
-		.d2-1721623843 .color-B5{color:#EDF0FD;}
-		.d2-1721623843 .color-B6{color:#F7F8FE;}
-		.d2-1721623843 .color-AA2{color:#4A6FF3;}
-		.d2-1721623843 .color-AA4{color:#EDF0FD;}
-		.d2-1721623843 .color-AA5{color:#F7F8FE;}
-		.d2-1721623843 .color-AB4{color:#EDF0FD;}
-		.d2-1721623843 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]></style><g id="x"><g class="shape" ><rect x="12.000000" y="12.000000" width="53.000000" height="66.000000" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="38.500000" y="50.500000" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">x</text></g><g id="y"><g class="shape" ><rect x="236.000000" y="12.000000" width="54.000000" height="66.000000" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="263.000000" y="50.500000" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">y</text></g><g id="z"><g class="shape" ><rect x="463.000000" y="12.000000" width="52.000000" height="66.000000" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="489.000000" y="50.500000" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">z</text></g><g id="(x -&gt; y)[0]"><marker id="mk-3488378134" markerWidth="10.000000" markerHeight="12.000000" refX="7.000000" refY="6.000000" viewBox="0.000000 0.000000 10.000000 12.000000" orient="auto" markerUnits="userSpaceOnUse"> <polygon points="0.000000,0.000000 10.000000,6.000000 0.000000,12.000000" class="connection fill-B1" stroke-width="2" /> </marker><path d="M 67.000000 45.000000 L 232.000000 45.000000" fill="none" class="connection stroke-B1" style="stroke-width:2;" marker-end="url(#mk-3488378134)" mask="url(#d2-1721623843)" /><text x="150.500000" y="51.000000" class="text-italic fill-N2" style="text-anchor:middle;font-size:16px">sync</text></g><g id="(y -&gt; z)[0]"><path d="M 292.000000 45.000000 L 459.000000 45.000000" fill="none" class="connection stroke-B1" style="stroke-width:2;" marker-end="url(#mk-3488378134)" mask="url(#d2-1721623843)" /><text x="376.500000" y="51.000000" class="text-bold fill-N2" style="text-anchor:middle;font-size:16px">sync</text></g><mask id="d2-1721623843" maskUnits="userSpaceOnUse" x="11" y="11" width="505" height="68">
-=======
 		.d2-2828377911 .fill-N1{fill:#0A0F25;}
 		.d2-2828377911 .fill-N2{fill:#676C7E;}
 		.d2-2828377911 .fill-N3{fill:#9499AB;}
@@ -259,8 +96,7 @@
 		.d2-2828377911 .color-AA4{color:#EDF0FD;}
 		.d2-2828377911 .color-AA5{color:#F7F8FE;}
 		.d2-2828377911 .color-AB4{color:#EDF0FD;}
-		.d2-2828377911 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]></style><g id="x"><g class="shape" ><rect x="12.000000" y="12.000000" width="53.000000" height="66.000000" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="38.500000" y="50.500000" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">x</text></g><g id="y"><g class="shape" ><rect x="236.000000" y="12.000000" width="54.000000" height="66.000000" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="263.000000" y="50.500000" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">y</text></g><g id="z"><g class="shape" ><rect x="463.000000" y="12.000000" width="52.000000" height="66.000000" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="489.000000" y="50.500000" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">z</text></g><g id="(x -&gt; y)[0]"><marker id="mk-3488378134" markerWidth="10.000000" markerHeight="12.000000" refX="7.000000" refY="6.000000" viewBox="0.000000 0.000000 10.000000 12.000000" orient="auto" markerUnits="userSpaceOnUse"> <polygon points="0.000000,0.000000 10.000000,6.000000 0.000000,12.000000" class="connection fill-B1" stroke-width="2" /> </marker><path d="M 67.000000 45.000000 L 232.000000 45.000000" fill="none" class="connection stroke-B1" style="stroke-width:2;" marker-end="url(#mk-3488378134)" mask="url(#d2-2828377911)" /><text x="150.500000" y="51.000000" class="text-italic fill-N2" style="text-anchor:middle;font-size:16px">sync</text></g><g id="(y -&gt; z)[0]"><path d="M 292.000000 45.000000 L 459.000000 45.000000" fill="none" class="connection stroke-B1" style="stroke-width:2;" marker-end="url(#mk-3488378134)" mask="url(#d2-2828377911)" /><text x="376.500000" y="51.000000" class="text-bold fill-N2" style="text-anchor:middle;font-size:16px">sync</text></g><mask id="d2-2828377911" maskUnits="userSpaceOnUse" x="11" y="11" width="505" height="68">
+		.d2-2828377911 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]></style><g id="x"><g class="shape" ><rect x="12.000000" y="12.000000" width="53.000000" height="66.000000" stroke="#0D32B2" fill="#F7F8FE" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="38.500000" y="50.500000" fill="#0A0F25" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">x</text></g><g id="y"><g class="shape" ><rect x="236.000000" y="12.000000" width="54.000000" height="66.000000" stroke="#0D32B2" fill="#F7F8FE" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="263.000000" y="50.500000" fill="#0A0F25" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">y</text></g><g id="z"><g class="shape" ><rect x="463.000000" y="12.000000" width="52.000000" height="66.000000" stroke="#0D32B2" fill="#F7F8FE" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="489.000000" y="50.500000" fill="#0A0F25" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">z</text></g><g id="(x -&gt; y)[0]"><marker id="mk-3488378134" markerWidth="10.000000" markerHeight="12.000000" refX="7.000000" refY="6.000000" viewBox="0.000000 0.000000 10.000000 12.000000" orient="auto" markerUnits="userSpaceOnUse"> <polygon points="0.000000,0.000000 10.000000,6.000000 0.000000,12.000000" fill="#0D32B2" class="connection fill-B1" stroke-width="2" /> </marker><path d="M 67.000000 45.000000 L 232.000000 45.000000" stroke="#0D32B2" fill="none" class="connection stroke-B1" style="stroke-width:2;" marker-end="url(#mk-3488378134)" mask="url(#d2-2828377911)" /><text x="150.500000" y="51.000000" fill="#676C7E" class="text-italic fill-N2" style="text-anchor:middle;font-size:16px">sync</text></g><g id="(y -&gt; z)[0]"><path d="M 292.000000 45.000000 L 459.000000 45.000000" stroke="#0D32B2" fill="none" class="connection stroke-B1" style="stroke-width:2;" marker-end="url(#mk-3488378134)" mask="url(#d2-2828377911)" /><text x="376.500000" y="51.000000" fill="#676C7E" class="text-bold fill-N2" style="text-anchor:middle;font-size:16px">sync</text></g><mask id="d2-2828377911" maskUnits="userSpaceOnUse" x="11" y="11" width="505" height="68">
->>>>>>> 33280fed5 (fixed e2e tests)
 <rect x="11" y="11" width="505" height="68" fill="white"></rect>
 <rect x="34.500000" y="34.500000" width="8" height="21" fill="rgba(0,0,0,0.75)"></rect>
 <rect x="258.500000" y="34.500000" width="9" height="21" fill="rgba(0,0,0,0.75)"></rect>

e2etests/testdata/regression/class_font_style_sequence/dagre/sketch.exp.svg

@@ -1,22 +1,6 @@
-<<<<<<< HEAD
+<?xml version="1.0" encoding="utf-8"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" d2Version="v0.6.8-HEAD" preserveAspectRatio="xMinYMin meet" viewBox="0 0 119 164"><svg id="d2-svg" class="d2-4091838784" width="119" height="164" viewBox="11 51 119 164"><rect x="11.000000" y="51.000000" width="119.000000" height="164.000000" rx="0.000000" fill="#FFFFFF" class=" fill-N7" stroke-width="0" /><style type="text/css"><![CDATA[
-<<<<<<< HEAD
-<?xml version="1.0" encoding="utf-8"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" d2Version="v0.6.8-HEAD" preserveAspectRatio="xMinYMin meet" viewBox="0 0 119 164"><svg id="d2-svg" class="d2-965117370" width="119" height="164" viewBox="11 51 119 164"><rect x="11.000000" y="51.000000" width="119.000000" height="164.000000" rx="0.000000" fill="#FFFFFF" class=" fill-N7" stroke-width="0" /><style type="text/css"><![CDATA[
-.d2-965117370 .text-mono {
-	font-family: "d2-965117370-font-mono";
-||||||| parent of 33280fed5 (fixed e2e tests)
-<?xml version="1.0" encoding="utf-8"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" d2Version="v0.6.6-HEAD" preserveAspectRatio="xMinYMin meet" viewBox="0 0 119 164"><svg id="d2-svg" class="d2-965117370" width="119" height="164" viewBox="11 51 119 164"><rect x="11.000000" y="51.000000" width="119.000000" height="164.000000" rx="0.000000" class=" fill-N7" stroke-width="0" /><style type="text/css"><![CDATA[
-.d2-965117370 .text-mono {
-	font-family: "d2-965117370-font-mono";
-=======
-<?xml version="1.0" encoding="utf-8"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" d2Version="v0.6.5-HEAD" preserveAspectRatio="xMinYMin meet" viewBox="0 0 119 164"><svg id="d2-svg" class="d2-4091838784" width="119" height="164" viewBox="11 51 119 164"><rect x="11.000000" y="51.000000" width="119.000000" height="164.000000" rx="0.000000" class=" fill-N7" stroke-width="0" /><style type="text/css"><![CDATA[
-||||||| parent of cb2f2823c (Fix changes)
-<?xml version="1.0" encoding="utf-8"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" d2Version="v0.6.5-HEAD" preserveAspectRatio="xMinYMin meet" viewBox="0 0 119 164"><svg id="d2-svg" class="d2-4091838784" width="119" height="164" viewBox="11 51 119 164"><rect x="11.000000" y="51.000000" width="119.000000" height="164.000000" rx="0.000000" class=" fill-N7" stroke-width="0" /><style type="text/css"><![CDATA[
-=======
-<?xml version="1.0" encoding="utf-8"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" d2Version="v0.6.6-HEAD" preserveAspectRatio="xMinYMin meet" viewBox="0 0 119 164"><svg id="d2-svg" class="d2-4091838784" width="119" height="164" viewBox="11 51 119 164"><rect x="11.000000" y="51.000000" width="119.000000" height="164.000000" rx="0.000000" class=" fill-N7" stroke-width="0" /><style type="text/css"><![CDATA[
->>>>>>> cb2f2823c (Fix changes)
 .d2-4091838784 .text-mono {
 	font-family: "d2-4091838784-font-mono";
->>>>>>> 33280fed5 (fixed e2e tests)
 }
 @font-face {
 	font-family: d2-4091838784-font-mono;
@@ -34,153 +18,6 @@
   opacity: 0.5;
 }
 
-<<<<<<< HEAD
-		.d2-965117370 .fill-N1{fill:#0A0F25;}
-		.d2-965117370 .fill-N2{fill:#676C7E;}
-		.d2-965117370 .fill-N3{fill:#9499AB;}
-		.d2-965117370 .fill-N4{fill:#CFD2DD;}
-		.d2-965117370 .fill-N5{fill:#DEE1EB;}
-		.d2-965117370 .fill-N6{fill:#EEF1F8;}
-		.d2-965117370 .fill-N7{fill:#FFFFFF;}
-		.d2-965117370 .fill-B1{fill:#0D32B2;}
-		.d2-965117370 .fill-B2{fill:#0D32B2;}
-		.d2-965117370 .fill-B3{fill:#E3E9FD;}
-		.d2-965117370 .fill-B4{fill:#E3E9FD;}
-		.d2-965117370 .fill-B5{fill:#EDF0FD;}
-		.d2-965117370 .fill-B6{fill:#F7F8FE;}
-		.d2-965117370 .fill-AA2{fill:#4A6FF3;}
-		.d2-965117370 .fill-AA4{fill:#EDF0FD;}
-		.d2-965117370 .fill-AA5{fill:#F7F8FE;}
-		.d2-965117370 .fill-AB4{fill:#EDF0FD;}
-		.d2-965117370 .fill-AB5{fill:#F7F8FE;}
-		.d2-965117370 .stroke-N1{stroke:#0A0F25;}
-		.d2-965117370 .stroke-N2{stroke:#676C7E;}
-		.d2-965117370 .stroke-N3{stroke:#9499AB;}
-		.d2-965117370 .stroke-N4{stroke:#CFD2DD;}
-		.d2-965117370 .stroke-N5{stroke:#DEE1EB;}
-		.d2-965117370 .stroke-N6{stroke:#EEF1F8;}
-		.d2-965117370 .stroke-N7{stroke:#FFFFFF;}
-		.d2-965117370 .stroke-B1{stroke:#0D32B2;}
-		.d2-965117370 .stroke-B2{stroke:#0D32B2;}
-		.d2-965117370 .stroke-B3{stroke:#E3E9FD;}
-		.d2-965117370 .stroke-B4{stroke:#E3E9FD;}
-		.d2-965117370 .stroke-B5{stroke:#EDF0FD;}
-		.d2-965117370 .stroke-B6{stroke:#F7F8FE;}
-		.d2-965117370 .stroke-AA2{stroke:#4A6FF3;}
-		.d2-965117370 .stroke-AA4{stroke:#EDF0FD;}
-		.d2-965117370 .stroke-AA5{stroke:#F7F8FE;}
-		.d2-965117370 .stroke-AB4{stroke:#EDF0FD;}
-		.d2-965117370 .stroke-AB5{stroke:#F7F8FE;}
-		.d2-965117370 .background-color-N1{background-color:#0A0F25;}
-		.d2-965117370 .background-color-N2{background-color:#676C7E;}
-		.d2-965117370 .background-color-N3{background-color:#9499AB;}
-		.d2-965117370 .background-color-N4{background-color:#CFD2DD;}
-		.d2-965117370 .background-color-N5{background-color:#DEE1EB;}
-		.d2-965117370 .background-color-N6{background-color:#EEF1F8;}
-		.d2-965117370 .background-color-N7{background-color:#FFFFFF;}
-		.d2-965117370 .background-color-B1{background-color:#0D32B2;}
-		.d2-965117370 .background-color-B2{background-color:#0D32B2;}
-		.d2-965117370 .background-color-B3{background-color:#E3E9FD;}
-		.d2-965117370 .background-color-B4{background-color:#E3E9FD;}
-		.d2-965117370 .background-color-B5{background-color:#EDF0FD;}
-		.d2-965117370 .background-color-B6{background-color:#F7F8FE;}
-		.d2-965117370 .background-color-AA2{background-color:#4A6FF3;}
-		.d2-965117370 .background-color-AA4{background-color:#EDF0FD;}
-		.d2-965117370 .background-color-AA5{background-color:#F7F8FE;}
-		.d2-965117370 .background-color-AB4{background-color:#EDF0FD;}
-		.d2-965117370 .background-color-AB5{background-color:#F7F8FE;}
-		.d2-965117370 .color-N1{color:#0A0F25;}
-		.d2-965117370 .color-N2{color:#676C7E;}
-		.d2-965117370 .color-N3{color:#9499AB;}
-		.d2-965117370 .color-N4{color:#CFD2DD;}
-		.d2-965117370 .color-N5{color:#DEE1EB;}
-		.d2-965117370 .color-N6{color:#EEF1F8;}
-		.d2-965117370 .color-N7{color:#FFFFFF;}
-		.d2-965117370 .color-B1{color:#0D32B2;}
-		.d2-965117370 .color-B2{color:#0D32B2;}
-		.d2-965117370 .color-B3{color:#E3E9FD;}
-		.d2-965117370 .color-B4{color:#E3E9FD;}
-		.d2-965117370 .color-B5{color:#EDF0FD;}
-		.d2-965117370 .color-B6{color:#F7F8FE;}
-		.d2-965117370 .color-AA2{color:#4A6FF3;}
-		.d2-965117370 .color-AA4{color:#EDF0FD;}
-		.d2-965117370 .color-AA5{color:#F7F8FE;}
-		.d2-965117370 .color-AB4{color:#EDF0FD;}
-		.d2-965117370 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]></style><g id="a"><g class="shape" ><rect x="12.000000" y="52.000000" width="117.000000" height="92.000000" stroke="#0A0F25" fill="#FFFFFF" class=" stroke-N1 fill-N7" style="stroke-width:2;" /><rect x="12.000000" y="52.000000" width="117.000000" height="92.000000" fill="#0A0F25" class="class_header fill-N1" /><text x="70.500000" y="102.500000" fill="red" class="text-mono" style="text-anchor:middle;font-size:24px;">a</text><line x1="12.000000" x2="129.000000" y1="144.000000" y2="144.000000" stroke="#0A0F25" class=" stroke-N1" style="stroke-width:1" /></g></g><g id="(a -- )[0]"><path d="M 70.500000 146.000000 L 70.500000 213.000000" stroke="#0D32B2" fill="none" class="connection stroke-B2" style="stroke-width:2;stroke-dasharray:12.000000,11.838767;" mask="url(#d2-965117370)" /></g><mask id="d2-965117370" maskUnits="userSpaceOnUse" x="11" y="51" width="119" height="164">
-||||||| parent of 33280fed5 (fixed e2e tests)
-		.d2-965117370 .fill-N1{fill:#0A0F25;}
-		.d2-965117370 .fill-N2{fill:#676C7E;}
-		.d2-965117370 .fill-N3{fill:#9499AB;}
-		.d2-965117370 .fill-N4{fill:#CFD2DD;}
-		.d2-965117370 .fill-N5{fill:#DEE1EB;}
-		.d2-965117370 .fill-N6{fill:#EEF1F8;}
-		.d2-965117370 .fill-N7{fill:#FFFFFF;}
-		.d2-965117370 .fill-B1{fill:#0D32B2;}
-		.d2-965117370 .fill-B2{fill:#0D32B2;}
-		.d2-965117370 .fill-B3{fill:#E3E9FD;}
-		.d2-965117370 .fill-B4{fill:#E3E9FD;}
-		.d2-965117370 .fill-B5{fill:#EDF0FD;}
-		.d2-965117370 .fill-B6{fill:#F7F8FE;}
-		.d2-965117370 .fill-AA2{fill:#4A6FF3;}
-		.d2-965117370 .fill-AA4{fill:#EDF0FD;}
-		.d2-965117370 .fill-AA5{fill:#F7F8FE;}
-		.d2-965117370 .fill-AB4{fill:#EDF0FD;}
-		.d2-965117370 .fill-AB5{fill:#F7F8FE;}
-		.d2-965117370 .stroke-N1{stroke:#0A0F25;}
-		.d2-965117370 .stroke-N2{stroke:#676C7E;}
-		.d2-965117370 .stroke-N3{stroke:#9499AB;}
-		.d2-965117370 .stroke-N4{stroke:#CFD2DD;}
-		.d2-965117370 .stroke-N5{stroke:#DEE1EB;}
-		.d2-965117370 .stroke-N6{stroke:#EEF1F8;}
-		.d2-965117370 .stroke-N7{stroke:#FFFFFF;}
-		.d2-965117370 .stroke-B1{stroke:#0D32B2;}
-		.d2-965117370 .stroke-B2{stroke:#0D32B2;}
-		.d2-965117370 .stroke-B3{stroke:#E3E9FD;}
-		.d2-965117370 .stroke-B4{stroke:#E3E9FD;}
-		.d2-965117370 .stroke-B5{stroke:#EDF0FD;}
-		.d2-965117370 .stroke-B6{stroke:#F7F8FE;}
-		.d2-965117370 .stroke-AA2{stroke:#4A6FF3;}
-		.d2-965117370 .stroke-AA4{stroke:#EDF0FD;}
-		.d2-965117370 .stroke-AA5{stroke:#F7F8FE;}
-		.d2-965117370 .stroke-AB4{stroke:#EDF0FD;}
-		.d2-965117370 .stroke-AB5{stroke:#F7F8FE;}
-		.d2-965117370 .background-color-N1{background-color:#0A0F25;}
-		.d2-965117370 .background-color-N2{background-color:#676C7E;}
-		.d2-965117370 .background-color-N3{background-color:#9499AB;}
-		.d2-965117370 .background-color-N4{background-color:#CFD2DD;}
-		.d2-965117370 .background-color-N5{background-color:#DEE1EB;}
-		.d2-965117370 .background-color-N6{background-color:#EEF1F8;}
-		.d2-965117370 .background-color-N7{background-color:#FFFFFF;}
-		.d2-965117370 .background-color-B1{background-color:#0D32B2;}
-		.d2-965117370 .background-color-B2{background-color:#0D32B2;}
-		.d2-965117370 .background-color-B3{background-color:#E3E9FD;}
-		.d2-965117370 .background-color-B4{background-color:#E3E9FD;}
-		.d2-965117370 .background-color-B5{background-color:#EDF0FD;}
-		.d2-965117370 .background-color-B6{background-color:#F7F8FE;}
-		.d2-965117370 .background-color-AA2{background-color:#4A6FF3;}
-		.d2-965117370 .background-color-AA4{background-color:#EDF0FD;}
-		.d2-965117370 .background-color-AA5{background-color:#F7F8FE;}
-		.d2-965117370 .background-color-AB4{background-color:#EDF0FD;}
-		.d2-965117370 .background-color-AB5{background-color:#F7F8FE;}
-		.d2-965117370 .color-N1{color:#0A0F25;}
-		.d2-965117370 .color-N2{color:#676C7E;}
-		.d2-965117370 .color-N3{color:#9499AB;}
-		.d2-965117370 .color-N4{color:#CFD2DD;}
-		.d2-965117370 .color-N5{color:#DEE1EB;}
-		.d2-965117370 .color-N6{color:#EEF1F8;}
-		.d2-965117370 .color-N7{color:#FFFFFF;}
-		.d2-965117370 .color-B1{color:#0D32B2;}
-		.d2-965117370 .color-B2{color:#0D32B2;}
-		.d2-965117370 .color-B3{color:#E3E9FD;}
-		.d2-965117370 .color-B4{color:#E3E9FD;}
-		.d2-965117370 .color-B5{color:#EDF0FD;}
-		.d2-965117370 .color-B6{color:#F7F8FE;}
-		.d2-965117370 .color-AA2{color:#4A6FF3;}
-		.d2-965117370 .color-AA4{color:#EDF0FD;}
-		.d2-965117370 .color-AA5{color:#F7F8FE;}
-		.d2-965117370 .color-AB4{color:#EDF0FD;}
-		.d2-965117370 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]></style><g id="a"><g class="shape" ><rect x="12.000000" y="52.000000" width="117.000000" height="92.000000" class=" stroke-N1 fill-N7" style="stroke-width:2;" /><rect x="12.000000" y="52.000000" width="117.000000" height="92.000000" class="class_header fill-N1" /><text x="70.500000" y="102.500000" fill="red" class="text-mono" style="text-anchor:middle;font-size:24px;">a</text><line x1="12.000000" x2="129.000000" y1="144.000000" y2="144.000000" class=" stroke-N1" style="stroke-width:1" /></g></g><g id="(a -- )[0]"><path d="M 70.500000 146.000000 L 70.500000 213.000000" fill="none" class="connection stroke-B2" style="stroke-width:2;stroke-dasharray:12.000000,11.838767;" mask="url(#d2-965117370)" /></g><mask id="d2-965117370" maskUnits="userSpaceOnUse" x="11" y="51" width="119" height="164">
-=======
 		.d2-4091838784 .fill-N1{fill:#0A0F25;}
 		.d2-4091838784 .fill-N2{fill:#676C7E;}
 		.d2-4091838784 .fill-N3{fill:#9499AB;}
@@ -252,14 +89,7 @@
 		.d2-4091838784 .color-AA4{color:#EDF0FD;}
 		.d2-4091838784 .color-AA5{color:#F7F8FE;}
 		.d2-4091838784 .color-AB4{color:#EDF0FD;}
-<<<<<<< HEAD
+		.d2-4091838784 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]></style><g id="a"><g class="shape" ><rect x="12.000000" y="52.000000" width="117.000000" height="92.000000" stroke="#0A0F25" fill="#FFFFFF" class=" stroke-N1 fill-N7" style="stroke-width:2;" /><rect x="12.000000" y="52.000000" width="117.000000" height="92.000000" fill="#0A0F25" class="class_header fill-N1" /><text x="70.500000" y="102.500000" fill="red" class="text-mono" style="text-anchor:middle;font-size:24px;">a</text><line x1="12.000000" x2="129.000000" y1="144.000000" y2="144.000000" stroke="#0A0F25" class=" stroke-N1" style="stroke-width:1" /></g></g><g id="(a -- )[0]"><path d="M 70.500000 146.000000 L 70.500000 213.000000" stroke="#0D32B2" fill="none" class="connection stroke-B2" style="stroke-width:2;stroke-dasharray:12.000000,11.838767;" mask="url(#d2-4091838784)" /></g><mask id="d2-4091838784" maskUnits="userSpaceOnUse" x="11" y="51" width="119" height="164">
-		.d2-4091838784 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]></style><g id="a"><g class="shape" ><rect x="12.000000" y="52.000000" width="117.000000" height="92.000000" class=" stroke-N1 fill-N7" style="stroke-width:2;" /><rect x="12.000000" y="52.000000" width="117.000000" height="92.000000" class="class_header fill-N1" /><text x="70.500000" y="105.750000" fill="red" class="text-mono" style="text-anchor:middle;font-size:24px;">a</text><line x1="12.000000" x2="129.000000" y1="144.000000" y2="144.000000" class=" stroke-N1" style="stroke-width:1" /></g></g><g id="(a -- )[0]"><path d="M 70.500000 146.000000 L 70.500000 213.000000" fill="none" class="connection stroke-B2" style="stroke-width:2;stroke-dasharray:12.000000,11.838767;" mask="url(#d2-4091838784)" /></g><mask id="d2-4091838784" maskUnits="userSpaceOnUse" x="11" y="51" width="119" height="164">
->>>>>>> 33280fed5 (fixed e2e tests)
-||||||| parent of cb2f2823c (Fix changes)
-		.d2-4091838784 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]></style><g id="a"><g class="shape" ><rect x="12.000000" y="52.000000" width="117.000000" height="92.000000" class=" stroke-N1 fill-N7" style="stroke-width:2;" /><rect x="12.000000" y="52.000000" width="117.000000" height="92.000000" class="class_header fill-N1" /><text x="70.500000" y="105.750000" fill="red" class="text-mono" style="text-anchor:middle;font-size:24px;">a</text><line x1="12.000000" x2="129.000000" y1="144.000000" y2="144.000000" class=" stroke-N1" style="stroke-width:1" /></g></g><g id="(a -- )[0]"><path d="M 70.500000 146.000000 L 70.500000 213.000000" fill="none" class="connection stroke-B2" style="stroke-width:2;stroke-dasharray:12.000000,11.838767;" mask="url(#d2-4091838784)" /></g><mask id="d2-4091838784" maskUnits="userSpaceOnUse" x="11" y="51" width="119" height="164">
-=======
-		.d2-4091838784 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]></style><g id="a"><g class="shape" ><rect x="12.000000" y="52.000000" width="117.000000" height="92.000000" class=" stroke-N1 fill-N7" style="stroke-width:2;" /><rect x="12.000000" y="52.000000" width="117.000000" height="92.000000" class="class_header fill-N1" /><text x="70.500000" y="102.500000" fill="red" class="text-mono" style="text-anchor:middle;font-size:24px;">a</text><line x1="12.000000" x2="129.000000" y1="144.000000" y2="144.000000" class=" stroke-N1" style="stroke-width:1" /></g></g><g id="(a -- )[0]"><path d="M 70.500000 146.000000 L 70.500000 213.000000" fill="none" class="connection stroke-B2" style="stroke-width:2;stroke-dasharray:12.000000,11.838767;" mask="url(#d2-4091838784)" /></g><mask id="d2-4091838784" maskUnits="userSpaceOnUse" x="11" y="51" width="119" height="164">
->>>>>>> cb2f2823c (Fix changes)
 <rect x="11" y="51" width="119" height="164" fill="white"></rect>
 
 </mask></svg></svg>

e2etests/testdata/regression/class_font_style_sequence/elk/sketch.exp.svg

@@ -1,22 +1,6 @@
-<<<<<<< HEAD
+<?xml version="1.0" encoding="utf-8"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" d2Version="v0.6.8-HEAD" preserveAspectRatio="xMinYMin meet" viewBox="0 0 119 164"><svg id="d2-svg" class="d2-4091838784" width="119" height="164" viewBox="11 51 119 164"><rect x="11.000000" y="51.000000" width="119.000000" height="164.000000" rx="0.000000" fill="#FFFFFF" class=" fill-N7" stroke-width="0" /><style type="text/css"><![CDATA[
-<<<<<<< HEAD
-<?xml version="1.0" encoding="utf-8"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" d2Version="v0.6.8-HEAD" preserveAspectRatio="xMinYMin meet" viewBox="0 0 119 164"><svg id="d2-svg" class="d2-965117370" width="119" height="164" viewBox="11 51 119 164"><rect x="11.000000" y="51.000000" width="119.000000" height="164.000000" rx="0.000000" fill="#FFFFFF" class=" fill-N7" stroke-width="0" /><style type="text/css"><![CDATA[
-.d2-965117370 .text-mono {
-	font-family: "d2-965117370-font-mono";
-||||||| parent of 33280fed5 (fixed e2e tests)
-<?xml version="1.0" encoding="utf-8"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" d2Version="v0.6.6-HEAD" preserveAspectRatio="xMinYMin meet" viewBox="0 0 119 164"><svg id="d2-svg" class="d2-965117370" width="119" height="164" viewBox="11 51 119 164"><rect x="11.000000" y="51.000000" width="119.000000" height="164.000000" rx="0.000000" class=" fill-N7" stroke-width="0" /><style type="text/css"><![CDATA[
-.d2-965117370 .text-mono {
-	font-family: "d2-965117370-font-mono";
-=======
-<?xml version="1.0" encoding="utf-8"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" d2Version="v0.6.5-HEAD" preserveAspectRatio="xMinYMin meet" viewBox="0 0 119 164"><svg id="d2-svg" class="d2-4091838784" width="119" height="164" viewBox="11 51 119 164"><rect x="11.000000" y="51.000000" width="119.000000" height="164.000000" rx="0.000000" class=" fill-N7" stroke-width="0" /><style type="text/css"><![CDATA[
-||||||| parent of cb2f2823c (Fix changes)
-<?xml version="1.0" encoding="utf-8"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" d2Version="v0.6.5-HEAD" preserveAspectRatio="xMinYMin meet" viewBox="0 0 119 164"><svg id="d2-svg" class="d2-4091838784" width="119" height="164" viewBox="11 51 119 164"><rect x="11.000000" y="51.000000" width="119.000000" height="164.000000" rx="0.000000" class=" fill-N7" stroke-width="0" /><style type="text/css"><![CDATA[
-=======
-<?xml version="1.0" encoding="utf-8"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" d2Version="v0.6.6-HEAD" preserveAspectRatio="xMinYMin meet" viewBox="0 0 119 164"><svg id="d2-svg" class="d2-4091838784" width="119" height="164" viewBox="11 51 119 164"><rect x="11.000000" y="51.000000" width="119.000000" height="164.000000" rx="0.000000" class=" fill-N7" stroke-width="0" /><style type="text/css"><![CDATA[
->>>>>>> cb2f2823c (Fix changes)
 .d2-4091838784 .text-mono {
 	font-family: "d2-4091838784-font-mono";
->>>>>>> 33280fed5 (fixed e2e tests)
 }
 @font-face {
 	font-family: d2-4091838784-font-mono;
@@ -34,153 +18,6 @@
   opacity: 0.5;
 }
 
-<<<<<<< HEAD
-		.d2-965117370 .fill-N1{fill:#0A0F25;}
-		.d2-965117370 .fill-N2{fill:#676C7E;}
-		.d2-965117370 .fill-N3{fill:#9499AB;}
-		.d2-965117370 .fill-N4{fill:#CFD2DD;}
-		.d2-965117370 .fill-N5{fill:#DEE1EB;}
-		.d2-965117370 .fill-N6{fill:#EEF1F8;}
-		.d2-965117370 .fill-N7{fill:#FFFFFF;}
-		.d2-965117370 .fill-B1{fill:#0D32B2;}
-		.d2-965117370 .fill-B2{fill:#0D32B2;}
-		.d2-965117370 .fill-B3{fill:#E3E9FD;}
-		.d2-965117370 .fill-B4{fill:#E3E9FD;}
-		.d2-965117370 .fill-B5{fill:#EDF0FD;}
-		.d2-965117370 .fill-B6{fill:#F7F8FE;}
-		.d2-965117370 .fill-AA2{fill:#4A6FF3;}
-		.d2-965117370 .fill-AA4{fill:#EDF0FD;}
-		.d2-965117370 .fill-AA5{fill:#F7F8FE;}
-		.d2-965117370 .fill-AB4{fill:#EDF0FD;}
-		.d2-965117370 .fill-AB5{fill:#F7F8FE;}
-		.d2-965117370 .stroke-N1{stroke:#0A0F25;}
-		.d2-965117370 .stroke-N2{stroke:#676C7E;}
-		.d2-965117370 .stroke-N3{stroke:#9499AB;}
-		.d2-965117370 .stroke-N4{stroke:#CFD2DD;}
-		.d2-965117370 .stroke-N5{stroke:#DEE1EB;}
-		.d2-965117370 .stroke-N6{stroke:#EEF1F8;}
-		.d2-965117370 .stroke-N7{stroke:#FFFFFF;}
-		.d2-965117370 .stroke-B1{stroke:#0D32B2;}
-		.d2-965117370 .stroke-B2{stroke:#0D32B2;}
-		.d2-965117370 .stroke-B3{stroke:#E3E9FD;}
-		.d2-965117370 .stroke-B4{stroke:#E3E9FD;}
-		.d2-965117370 .stroke-B5{stroke:#EDF0FD;}
-		.d2-965117370 .stroke-B6{stroke:#F7F8FE;}
-		.d2-965117370 .stroke-AA2{stroke:#4A6FF3;}
-		.d2-965117370 .stroke-AA4{stroke:#EDF0FD;}
-		.d2-965117370 .stroke-AA5{stroke:#F7F8FE;}
-		.d2-965117370 .stroke-AB4{stroke:#EDF0FD;}
-		.d2-965117370 .stroke-AB5{stroke:#F7F8FE;}
-		.d2-965117370 .background-color-N1{background-color:#0A0F25;}
-		.d2-965117370 .background-color-N2{background-color:#676C7E;}
-		.d2-965117370 .background-color-N3{background-color:#9499AB;}
-		.d2-965117370 .background-color-N4{background-color:#CFD2DD;}
-		.d2-965117370 .background-color-N5{background-color:#DEE1EB;}
-		.d2-965117370 .background-color-N6{background-color:#EEF1F8;}
-		.d2-965117370 .background-color-N7{background-color:#FFFFFF;}
-		.d2-965117370 .background-color-B1{background-color:#0D32B2;}
-		.d2-965117370 .background-color-B2{background-color:#0D32B2;}
-		.d2-965117370 .background-color-B3{background-color:#E3E9FD;}
-		.d2-965117370 .background-color-B4{background-color:#E3E9FD;}
-		.d2-965117370 .background-color-B5{background-color:#EDF0FD;}
-		.d2-965117370 .background-color-B6{background-color:#F7F8FE;}
-		.d2-965117370 .background-color-AA2{background-color:#4A6FF3;}
-		.d2-965117370 .background-color-AA4{background-color:#EDF0FD;}
-		.d2-965117370 .background-color-AA5{background-color:#F7F8FE;}
-		.d2-965117370 .background-color-AB4{background-color:#EDF0FD;}
-		.d2-965117370 .background-color-AB5{background-color:#F7F8FE;}
-		.d2-965117370 .color-N1{color:#0A0F25;}
-		.d2-965117370 .color-N2{color:#676C7E;}
-		.d2-965117370 .color-N3{color:#9499AB;}
-		.d2-965117370 .color-N4{color:#CFD2DD;}
-		.d2-965117370 .color-N5{color:#DEE1EB;}
-		.d2-965117370 .color-N6{color:#EEF1F8;}
-		.d2-965117370 .color-N7{color:#FFFFFF;}
-		.d2-965117370 .color-B1{color:#0D32B2;}
-		.d2-965117370 .color-B2{color:#0D32B2;}
-		.d2-965117370 .color-B3{color:#E3E9FD;}
-		.d2-965117370 .color-B4{color:#E3E9FD;}
-		.d2-965117370 .color-B5{color:#EDF0FD;}
-		.d2-965117370 .color-B6{color:#F7F8FE;}
-		.d2-965117370 .color-AA2{color:#4A6FF3;}
-		.d2-965117370 .color-AA4{color:#EDF0FD;}
-		.d2-965117370 .color-AA5{color:#F7F8FE;}
-		.d2-965117370 .color-AB4{color:#EDF0FD;}
-		.d2-965117370 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]></style><g id="a"><g class="shape" ><rect x="12.000000" y="52.000000" width="117.000000" height="92.000000" stroke="#0A0F25" fill="#FFFFFF" class=" stroke-N1 fill-N7" style="stroke-width:2;" /><rect x="12.000000" y="52.000000" width="117.000000" height="92.000000" fill="#0A0F25" class="class_header fill-N1" /><text x="70.500000" y="102.500000" fill="red" class="text-mono" style="text-anchor:middle;font-size:24px;">a</text><line x1="12.000000" x2="129.000000" y1="144.000000" y2="144.000000" stroke="#0A0F25" class=" stroke-N1" style="stroke-width:1" /></g></g><g id="(a -- )[0]"><path d="M 70.500000 146.000000 L 70.500000 213.000000" stroke="#0D32B2" fill="none" class="connection stroke-B2" style="stroke-width:2;stroke-dasharray:12.000000,11.838767;" mask="url(#d2-965117370)" /></g><mask id="d2-965117370" maskUnits="userSpaceOnUse" x="11" y="51" width="119" height="164">
-||||||| parent of 33280fed5 (fixed e2e tests)
-		.d2-965117370 .fill-N1{fill:#0A0F25;}
-		.d2-965117370 .fill-N2{fill:#676C7E;}
-		.d2-965117370 .fill-N3{fill:#9499AB;}
-		.d2-965117370 .fill-N4{fill:#CFD2DD;}
-		.d2-965117370 .fill-N5{fill:#DEE1EB;}
-		.d2-965117370 .fill-N6{fill:#EEF1F8;}
-		.d2-965117370 .fill-N7{fill:#FFFFFF;}
-		.d2-965117370 .fill-B1{fill:#0D32B2;}
-		.d2-965117370 .fill-B2{fill:#0D32B2;}
-		.d2-965117370 .fill-B3{fill:#E3E9FD;}
-		.d2-965117370 .fill-B4{fill:#E3E9FD;}
-		.d2-965117370 .fill-B5{fill:#EDF0FD;}
-		.d2-965117370 .fill-B6{fill:#F7F8FE;}
-		.d2-965117370 .fill-AA2{fill:#4A6FF3;}
-		.d2-965117370 .fill-AA4{fill:#EDF0FD;}
-		.d2-965117370 .fill-AA5{fill:#F7F8FE;}
-		.d2-965117370 .fill-AB4{fill:#EDF0FD;}
-		.d2-965117370 .fill-AB5{fill:#F7F8FE;}
-		.d2-965117370 .stroke-N1{stroke:#0A0F25;}
-		.d2-965117370 .stroke-N2{stroke:#676C7E;}
-		.d2-965117370 .stroke-N3{stroke:#9499AB;}
-		.d2-965117370 .stroke-N4{stroke:#CFD2DD;}
-		.d2-965117370 .stroke-N5{stroke:#DEE1EB;}
-		.d2-965117370 .stroke-N6{stroke:#EEF1F8;}
-		.d2-965117370 .stroke-N7{stroke:#FFFFFF;}
-		.d2-965117370 .stroke-B1{stroke:#0D32B2;}
-		.d2-965117370 .stroke-B2{stroke:#0D32B2;}
-		.d2-965117370 .stroke-B3{stroke:#E3E9FD;}
-		.d2-965117370 .stroke-B4{stroke:#E3E9FD;}
-		.d2-965117370 .stroke-B5{stroke:#EDF0FD;}
-		.d2-965117370 .stroke-B6{stroke:#F7F8FE;}
-		.d2-965117370 .stroke-AA2{stroke:#4A6FF3;}
-		.d2-965117370 .stroke-AA4{stroke:#EDF0FD;}
-		.d2-965117370 .stroke-AA5{stroke:#F7F8FE;}
-		.d2-965117370 .stroke-AB4{stroke:#EDF0FD;}
-		.d2-965117370 .stroke-AB5{stroke:#F7F8FE;}
-		.d2-965117370 .background-color-N1{background-color:#0A0F25;}
-		.d2-965117370 .background-color-N2{background-color:#676C7E;}
-		.d2-965117370 .background-color-N3{background-color:#9499AB;}
-		.d2-965117370 .background-color-N4{background-color:#CFD2DD;}
-		.d2-965117370 .background-color-N5{background-color:#DEE1EB;}
-		.d2-965117370 .background-color-N6{background-color:#EEF1F8;}
-		.d2-965117370 .background-color-N7{background-color:#FFFFFF;}
-		.d2-965117370 .background-color-B1{background-color:#0D32B2;}
-		.d2-965117370 .background-color-B2{background-color:#0D32B2;}
-		.d2-965117370 .background-color-B3{background-color:#E3E9FD;}
-		.d2-965117370 .background-color-B4{background-color:#E3E9FD;}
-		.d2-965117370 .background-color-B5{background-color:#EDF0FD;}
-		.d2-965117370 .background-color-B6{background-color:#F7F8FE;}
-		.d2-965117370 .background-color-AA2{background-color:#4A6FF3;}
-		.d2-965117370 .background-color-AA4{background-color:#EDF0FD;}
-		.d2-965117370 .background-color-AA5{background-color:#F7F8FE;}
-		.d2-965117370 .background-color-AB4{background-color:#EDF0FD;}
-		.d2-965117370 .background-color-AB5{background-color:#F7F8FE;}
-		.d2-965117370 .color-N1{color:#0A0F25;}
-		.d2-965117370 .color-N2{color:#676C7E;}
-		.d2-965117370 .color-N3{color:#9499AB;}
-		.d2-965117370 .color-N4{color:#CFD2DD;}
-		.d2-965117370 .color-N5{color:#DEE1EB;}
-		.d2-965117370 .color-N6{color:#EEF1F8;}
-		.d2-965117370 .color-N7{color:#FFFFFF;}
-		.d2-965117370 .color-B1{color:#0D32B2;}
-		.d2-965117370 .color-B2{color:#0D32B2;}
-		.d2-965117370 .color-B3{color:#E3E9FD;}
-		.d2-965117370 .color-B4{color:#E3E9FD;}
-		.d2-965117370 .color-B5{color:#EDF0FD;}
-		.d2-965117370 .color-B6{color:#F7F8FE;}
-		.d2-965117370 .color-AA2{color:#4A6FF3;}
-		.d2-965117370 .color-AA4{color:#EDF0FD;}
-		.d2-965117370 .color-AA5{color:#F7F8FE;}
-		.d2-965117370 .color-AB4{color:#EDF0FD;}
-		.d2-965117370 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]></style><g id="a"><g class="shape" ><rect x="12.000000" y="52.000000" width="117.000000" height="92.000000" class=" stroke-N1 fill-N7" style="stroke-width:2;" /><rect x="12.000000" y="52.000000" width="117.000000" height="92.000000" class="class_header fill-N1" /><text x="70.500000" y="102.500000" fill="red" class="text-mono" style="text-anchor:middle;font-size:24px;">a</text><line x1="12.000000" x2="129.000000" y1="144.000000" y2="144.000000" class=" stroke-N1" style="stroke-width:1" /></g></g><g id="(a -- )[0]"><path d="M 70.500000 146.000000 L 70.500000 213.000000" fill="none" class="connection stroke-B2" style="stroke-width:2;stroke-dasharray:12.000000,11.838767;" mask="url(#d2-965117370)" /></g><mask id="d2-965117370" maskUnits="userSpaceOnUse" x="11" y="51" width="119" height="164">
-=======
 		.d2-4091838784 .fill-N1{fill:#0A0F25;}
 		.d2-4091838784 .fill-N2{fill:#676C7E;}
 		.d2-4091838784 .fill-N3{fill:#9499AB;}
@@ -252,14 +89,7 @@
 		.d2-4091838784 .color-AA4{color:#EDF0FD;}
 		.d2-4091838784 .color-AA5{color:#F7F8FE;}
 		.d2-4091838784 .color-AB4{color:#EDF0FD;}
-<<<<<<< HEAD
+		.d2-4091838784 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]></style><g id="a"><g class="shape" ><rect x="12.000000" y="52.000000" width="117.000000" height="92.000000" stroke="#0A0F25" fill="#FFFFFF" class=" stroke-N1 fill-N7" style="stroke-width:2;" /><rect x="12.000000" y="52.000000" width="117.000000" height="92.000000" fill="#0A0F25" class="class_header fill-N1" /><text x="70.500000" y="102.500000" fill="red" class="text-mono" style="text-anchor:middle;font-size:24px;">a</text><line x1="12.000000" x2="129.000000" y1="144.000000" y2="144.000000" stroke="#0A0F25" class=" stroke-N1" style="stroke-width:1" /></g></g><g id="(a -- )[0]"><path d="M 70.500000 146.000000 L 70.500000 213.000000" stroke="#0D32B2" fill="none" class="connection stroke-B2" style="stroke-width:2;stroke-dasharray:12.000000,11.838767;" mask="url(#d2-4091838784)" /></g><mask id="d2-4091838784" maskUnits="userSpaceOnUse" x="11" y="51" width="119" height="164">
-		.d2-4091838784 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]></style><g id="a"><g class="shape" ><rect x="12.000000" y="52.000000" width="117.000000" height="92.000000" class=" stroke-N1 fill-N7" style="stroke-width:2;" /><rect x="12.000000" y="52.000000" width="117.000000" height="92.000000" class="class_header fill-N1" /><text x="70.500000" y="105.750000" fill="red" class="text-mono" style="text-anchor:middle;font-size:24px;">a</text><line x1="12.000000" x2="129.000000" y1="144.000000" y2="144.000000" class=" stroke-N1" style="stroke-width:1" /></g></g><g id="(a -- )[0]"><path d="M 70.500000 146.000000 L 70.500000 213.000000" fill="none" class="connection stroke-B2" style="stroke-width:2;stroke-dasharray:12.000000,11.838767;" mask="url(#d2-4091838784)" /></g><mask id="d2-4091838784" maskUnits="userSpaceOnUse" x="11" y="51" width="119" height="164">
->>>>>>> 33280fed5 (fixed e2e tests)
-||||||| parent of cb2f2823c (Fix changes)
-		.d2-4091838784 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]></style><g id="a"><g class="shape" ><rect x="12.000000" y="52.000000" width="117.000000" height="92.000000" class=" stroke-N1 fill-N7" style="stroke-width:2;" /><rect x="12.000000" y="52.000000" width="117.000000" height="92.000000" class="class_header fill-N1" /><text x="70.500000" y="105.750000" fill="red" class="text-mono" style="text-anchor:middle;font-size:24px;">a</text><line x1="12.000000" x2="129.000000" y1="144.000000" y2="144.000000" class=" stroke-N1" style="stroke-width:1" /></g></g><g id="(a -- )[0]"><path d="M 70.500000 146.000000 L 70.500000 213.000000" fill="none" class="connection stroke-B2" style="stroke-width:2;stroke-dasharray:12.000000,11.838767;" mask="url(#d2-4091838784)" /></g><mask id="d2-4091838784" maskUnits="userSpaceOnUse" x="11" y="51" width="119" height="164">
-=======
-		.d2-4091838784 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]></style><g id="a"><g class="shape" ><rect x="12.000000" y="52.000000" width="117.000000" height="92.000000" class=" stroke-N1 fill-N7" style="stroke-width:2;" /><rect x="12.000000" y="52.000000" width="117.000000" height="92.000000" class="class_header fill-N1" /><text x="70.500000" y="102.500000" fill="red" class="text-mono" style="text-anchor:middle;font-size:24px;">a</text><line x1="12.000000" x2="129.000000" y1="144.000000" y2="144.000000" class=" stroke-N1" style="stroke-width:1" /></g></g><g id="(a -- )[0]"><path d="M 70.500000 146.000000 L 70.500000 213.000000" fill="none" class="connection stroke-B2" style="stroke-width:2;stroke-dasharray:12.000000,11.838767;" mask="url(#d2-4091838784)" /></g><mask id="d2-4091838784" maskUnits="userSpaceOnUse" x="11" y="51" width="119" height="164">
->>>>>>> cb2f2823c (Fix changes)
 <rect x="11" y="51" width="119" height="164" fill="white"></rect>
 
 </mask></svg></svg>

e2etests/testdata/regression/code_font_size/dagre/sketch.exp.svg

@@ -1,22 +1,6 @@
-<<<<<<< HEAD
+<?xml version="1.0" encoding="utf-8"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" d2Version="v0.6.8-HEAD" preserveAspectRatio="xMinYMin meet" viewBox="0 0 224 639"><svg id="d2-svg" class="d2-747351070" width="224" height="639" viewBox="2 -1 224 639"><rect x="2.000000" y="-1.000000" width="224.000000" height="639.000000" rx="0.000000" fill="#FFFFFF" class=" fill-N7" stroke-width="0" /><style type="text/css"><![CDATA[
-<<<<<<< HEAD
-<?xml version="1.0" encoding="utf-8"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" d2Version="v0.6.8-HEAD" preserveAspectRatio="xMinYMin meet" viewBox="0 0 224 639"><svg id="d2-svg" class="d2-1305390466" width="224" height="639" viewBox="2 -1 224 639"><rect x="2.000000" y="-1.000000" width="224.000000" height="639.000000" rx="0.000000" fill="#FFFFFF" class=" fill-N7" stroke-width="0" /><style type="text/css"><![CDATA[
-.d2-1305390466 .text {
-	font-family: "d2-1305390466-font-regular";
-||||||| parent of 33280fed5 (fixed e2e tests)
-<?xml version="1.0" encoding="utf-8"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" d2Version="v0.6.6-HEAD" preserveAspectRatio="xMinYMin meet" viewBox="0 0 224 639"><svg id="d2-svg" class="d2-1305390466" width="224" height="639" viewBox="2 -1 224 639"><rect x="2.000000" y="-1.000000" width="224.000000" height="639.000000" rx="0.000000" class=" fill-N7" stroke-width="0" /><style type="text/css"><![CDATA[
-.d2-1305390466 .text {
-	font-family: "d2-1305390466-font-regular";
-=======
-<?xml version="1.0" encoding="utf-8"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" d2Version="v0.6.5-HEAD" preserveAspectRatio="xMinYMin meet" viewBox="0 0 224 639"><svg id="d2-svg" class="d2-747351070" width="224" height="639" viewBox="2 -1 224 639"><rect x="2.000000" y="-1.000000" width="224.000000" height="639.000000" rx="0.000000" class=" fill-N7" stroke-width="0" /><style type="text/css"><![CDATA[
-||||||| parent of cb2f2823c (Fix changes)
-<?xml version="1.0" encoding="utf-8"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" d2Version="v0.6.5-HEAD" preserveAspectRatio="xMinYMin meet" viewBox="0 0 224 639"><svg id="d2-svg" class="d2-747351070" width="224" height="639" viewBox="2 -1 224 639"><rect x="2.000000" y="-1.000000" width="224.000000" height="639.000000" rx="0.000000" class=" fill-N7" stroke-width="0" /><style type="text/css"><![CDATA[
-=======
-<?xml version="1.0" encoding="utf-8"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" d2Version="v0.6.6-HEAD" preserveAspectRatio="xMinYMin meet" viewBox="0 0 224 639"><svg id="d2-svg" class="d2-747351070" width="224" height="639" viewBox="2 -1 224 639"><rect x="2.000000" y="-1.000000" width="224.000000" height="639.000000" rx="0.000000" class=" fill-N7" stroke-width="0" /><style type="text/css"><![CDATA[
->>>>>>> cb2f2823c (Fix changes)
 .d2-747351070 .text {
 	font-family: "d2-747351070-font-regular";
->>>>>>> 33280fed5 (fixed e2e tests)
 }
 @font-face {
 	font-family: d2-747351070-font-regular;
@@ -48,153 +32,6 @@
   opacity: 0.5;
 }
 
-<<<<<<< HEAD
-		.d2-1305390466 .fill-N1{fill:#0A0F25;}
-		.d2-1305390466 .fill-N2{fill:#676C7E;}
-		.d2-1305390466 .fill-N3{fill:#9499AB;}
-		.d2-1305390466 .fill-N4{fill:#CFD2DD;}
-		.d2-1305390466 .fill-N5{fill:#DEE1EB;}
-		.d2-1305390466 .fill-N6{fill:#EEF1F8;}
-		.d2-1305390466 .fill-N7{fill:#FFFFFF;}
-		.d2-1305390466 .fill-B1{fill:#0D32B2;}
-		.d2-1305390466 .fill-B2{fill:#0D32B2;}
-		.d2-1305390466 .fill-B3{fill:#E3E9FD;}
-		.d2-1305390466 .fill-B4{fill:#E3E9FD;}
-		.d2-1305390466 .fill-B5{fill:#EDF0FD;}
-		.d2-1305390466 .fill-B6{fill:#F7F8FE;}
-		.d2-1305390466 .fill-AA2{fill:#4A6FF3;}
-		.d2-1305390466 .fill-AA4{fill:#EDF0FD;}
-		.d2-1305390466 .fill-AA5{fill:#F7F8FE;}
-		.d2-1305390466 .fill-AB4{fill:#EDF0FD;}
-		.d2-1305390466 .fill-AB5{fill:#F7F8FE;}
-		.d2-1305390466 .stroke-N1{stroke:#0A0F25;}
-		.d2-1305390466 .stroke-N2{stroke:#676C7E;}
-		.d2-1305390466 .stroke-N3{stroke:#9499AB;}
-		.d2-1305390466 .stroke-N4{stroke:#CFD2DD;}
-		.d2-1305390466 .stroke-N5{stroke:#DEE1EB;}
-		.d2-1305390466 .stroke-N6{stroke:#EEF1F8;}
-		.d2-1305390466 .stroke-N7{stroke:#FFFFFF;}
-		.d2-1305390466 .stroke-B1{stroke:#0D32B2;}
-		.d2-1305390466 .stroke-B2{stroke:#0D32B2;}
-		.d2-1305390466 .stroke-B3{stroke:#E3E9FD;}
-		.d2-1305390466 .stroke-B4{stroke:#E3E9FD;}
-		.d2-1305390466 .stroke-B5{stroke:#EDF0FD;}
-		.d2-1305390466 .stroke-B6{stroke:#F7F8FE;}
-		.d2-1305390466 .stroke-AA2{stroke:#4A6FF3;}
-		.d2-1305390466 .stroke-AA4{stroke:#EDF0FD;}
-		.d2-1305390466 .stroke-AA5{stroke:#F7F8FE;}
-		.d2-1305390466 .stroke-AB4{stroke:#EDF0FD;}
-		.d2-1305390466 .stroke-AB5{stroke:#F7F8FE;}
-		.d2-1305390466 .background-color-N1{background-color:#0A0F25;}
-		.d2-1305390466 .background-color-N2{background-color:#676C7E;}
-		.d2-1305390466 .background-color-N3{background-color:#9499AB;}
-		.d2-1305390466 .background-color-N4{background-color:#CFD2DD;}
-		.d2-1305390466 .background-color-N5{background-color:#DEE1EB;}
-		.d2-1305390466 .background-color-N6{background-color:#EEF1F8;}
-		.d2-1305390466 .background-color-N7{background-color:#FFFFFF;}
-		.d2-1305390466 .background-color-B1{background-color:#0D32B2;}
-		.d2-1305390466 .background-color-B2{background-color:#0D32B2;}
-		.d2-1305390466 .background-color-B3{background-color:#E3E9FD;}
-		.d2-1305390466 .background-color-B4{background-color:#E3E9FD;}
-		.d2-1305390466 .background-color-B5{background-color:#EDF0FD;}
-		.d2-1305390466 .background-color-B6{background-color:#F7F8FE;}
-		.d2-1305390466 .background-color-AA2{background-color:#4A6FF3;}
-		.d2-1305390466 .background-color-AA4{background-color:#EDF0FD;}
-		.d2-1305390466 .background-color-AA5{background-color:#F7F8FE;}
-		.d2-1305390466 .background-color-AB4{background-color:#EDF0FD;}
-		.d2-1305390466 .background-color-AB5{background-color:#F7F8FE;}
-		.d2-1305390466 .color-N1{color:#0A0F25;}
-		.d2-1305390466 .color-N2{color:#676C7E;}
-		.d2-1305390466 .color-N3{color:#9499AB;}
-		.d2-1305390466 .color-N4{color:#CFD2DD;}
-		.d2-1305390466 .color-N5{color:#DEE1EB;}
-		.d2-1305390466 .color-N6{color:#EEF1F8;}
-		.d2-1305390466 .color-N7{color:#FFFFFF;}
-		.d2-1305390466 .color-B1{color:#0D32B2;}
-		.d2-1305390466 .color-B2{color:#0D32B2;}
-		.d2-1305390466 .color-B3{color:#E3E9FD;}
-		.d2-1305390466 .color-B4{color:#E3E9FD;}
-		.d2-1305390466 .color-B5{color:#EDF0FD;}
-		.d2-1305390466 .color-B6{color:#F7F8FE;}
-		.d2-1305390466 .color-AA2{color:#4A6FF3;}
-		.d2-1305390466 .color-AA4{color:#EDF0FD;}
-		.d2-1305390466 .color-AA5{color:#F7F8FE;}
-		.d2-1305390466 .color-AB4{color:#EDF0FD;}
-		.d2-1305390466 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]></style><g id="Data"><g class="shape" ><rect x="10.000000" y="186.000000" width="208.000000" height="265.000000" stroke="#c8e9ad" fill="#c8e9ad" style="stroke-width:15;" /></g><text x="114.000000" y="173.000000" fill="#0A0F25" class="text fill-N1" style="text-anchor:middle;font-size:28px">Data</text></g><g id="y"><g class="shape" ><rect x="87.000000" y="571.000000" width="54.000000" height="66.000000" stroke="#0D32B2" fill="#F7F8FE" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="114.000000" y="609.500000" fill="#0A0F25" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">y</text></g><g id="x"><g class="shape" ><rect x="88.000000" y="0.000000" width="53.000000" height="66.000000" stroke="#0D32B2" fill="#F7F8FE" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="114.500000" y="38.500000" fill="#0A0F25" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">x</text></g><g id="Data.ex"><g class="shape" ></g><g transform="translate(40.000000 216.000000)" class="light-code" style="font-size:10"><rect width="148.000000" height="205.000000" stroke="#0A0F25" class="shape stroke-N1" style="fill:#ffffff;stroke-width:2;" /><g transform="translate(5.000000 5.000000)"><text class="text-mono" x="0" y="1.000000em">Testing&#160;<tspan fill="#009999">001</tspan>:&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;AAA
-||||||| parent of 33280fed5 (fixed e2e tests)
-		.d2-1305390466 .fill-N1{fill:#0A0F25;}
-		.d2-1305390466 .fill-N2{fill:#676C7E;}
-		.d2-1305390466 .fill-N3{fill:#9499AB;}
-		.d2-1305390466 .fill-N4{fill:#CFD2DD;}
-		.d2-1305390466 .fill-N5{fill:#DEE1EB;}
-		.d2-1305390466 .fill-N6{fill:#EEF1F8;}
-		.d2-1305390466 .fill-N7{fill:#FFFFFF;}
-		.d2-1305390466 .fill-B1{fill:#0D32B2;}
-		.d2-1305390466 .fill-B2{fill:#0D32B2;}
-		.d2-1305390466 .fill-B3{fill:#E3E9FD;}
-		.d2-1305390466 .fill-B4{fill:#E3E9FD;}
-		.d2-1305390466 .fill-B5{fill:#EDF0FD;}
-		.d2-1305390466 .fill-B6{fill:#F7F8FE;}
-		.d2-1305390466 .fill-AA2{fill:#4A6FF3;}
-		.d2-1305390466 .fill-AA4{fill:#EDF0FD;}
-		.d2-1305390466 .fill-AA5{fill:#F7F8FE;}
-		.d2-1305390466 .fill-AB4{fill:#EDF0FD;}
-		.d2-1305390466 .fill-AB5{fill:#F7F8FE;}
-		.d2-1305390466 .stroke-N1{stroke:#0A0F25;}
-		.d2-1305390466 .stroke-N2{stroke:#676C7E;}
-		.d2-1305390466 .stroke-N3{stroke:#9499AB;}
-		.d2-1305390466 .stroke-N4{stroke:#CFD2DD;}
-		.d2-1305390466 .stroke-N5{stroke:#DEE1EB;}
-		.d2-1305390466 .stroke-N6{stroke:#EEF1F8;}
-		.d2-1305390466 .stroke-N7{stroke:#FFFFFF;}
-		.d2-1305390466 .stroke-B1{stroke:#0D32B2;}
-		.d2-1305390466 .stroke-B2{stroke:#0D32B2;}
-		.d2-1305390466 .stroke-B3{stroke:#E3E9FD;}
-		.d2-1305390466 .stroke-B4{stroke:#E3E9FD;}
-		.d2-1305390466 .stroke-B5{stroke:#EDF0FD;}
-		.d2-1305390466 .stroke-B6{stroke:#F7F8FE;}
-		.d2-1305390466 .stroke-AA2{stroke:#4A6FF3;}
-		.d2-1305390466 .stroke-AA4{stroke:#EDF0FD;}
-		.d2-1305390466 .stroke-AA5{stroke:#F7F8FE;}
-		.d2-1305390466 .stroke-AB4{stroke:#EDF0FD;}
-		.d2-1305390466 .stroke-AB5{stroke:#F7F8FE;}
-		.d2-1305390466 .background-color-N1{background-color:#0A0F25;}
-		.d2-1305390466 .background-color-N2{background-color:#676C7E;}
-		.d2-1305390466 .background-color-N3{background-color:#9499AB;}
-		.d2-1305390466 .background-color-N4{background-color:#CFD2DD;}
-		.d2-1305390466 .background-color-N5{background-color:#DEE1EB;}
-		.d2-1305390466 .background-color-N6{background-color:#EEF1F8;}
-		.d2-1305390466 .background-color-N7{background-color:#FFFFFF;}
-		.d2-1305390466 .background-color-B1{background-color:#0D32B2;}
-		.d2-1305390466 .background-color-B2{background-color:#0D32B2;}
-		.d2-1305390466 .background-color-B3{background-color:#E3E9FD;}
-		.d2-1305390466 .background-color-B4{background-color:#E3E9FD;}
-		.d2-1305390466 .background-color-B5{background-color:#EDF0FD;}
-		.d2-1305390466 .background-color-B6{background-color:#F7F8FE;}
-		.d2-1305390466 .background-color-AA2{background-color:#4A6FF3;}
-		.d2-1305390466 .background-color-AA4{background-color:#EDF0FD;}
-		.d2-1305390466 .background-color-AA5{background-color:#F7F8FE;}
-		.d2-1305390466 .background-color-AB4{background-color:#EDF0FD;}
-		.d2-1305390466 .background-color-AB5{background-color:#F7F8FE;}
-		.d2-1305390466 .color-N1{color:#0A0F25;}
-		.d2-1305390466 .color-N2{color:#676C7E;}
-		.d2-1305390466 .color-N3{color:#9499AB;}
-		.d2-1305390466 .color-N4{color:#CFD2DD;}
-		.d2-1305390466 .color-N5{color:#DEE1EB;}
-		.d2-1305390466 .color-N6{color:#EEF1F8;}
-		.d2-1305390466 .color-N7{color:#FFFFFF;}
-		.d2-1305390466 .color-B1{color:#0D32B2;}
-		.d2-1305390466 .color-B2{color:#0D32B2;}
-		.d2-1305390466 .color-B3{color:#E3E9FD;}
-		.d2-1305390466 .color-B4{color:#E3E9FD;}
-		.d2-1305390466 .color-B5{color:#EDF0FD;}
-		.d2-1305390466 .color-B6{color:#F7F8FE;}
-		.d2-1305390466 .color-AA2{color:#4A6FF3;}
-		.d2-1305390466 .color-AA4{color:#EDF0FD;}
-		.d2-1305390466 .color-AA5{color:#F7F8FE;}
-		.d2-1305390466 .color-AB4{color:#EDF0FD;}
-		.d2-1305390466 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]></style><g id="Data"><g class="shape" ><rect x="10.000000" y="186.000000" width="208.000000" height="265.000000" stroke="#c8e9ad" fill="#c8e9ad" style="stroke-width:15;" /></g><text x="114.000000" y="173.000000" class="text fill-N1" style="text-anchor:middle;font-size:28px">Data</text></g><g id="y"><g class="shape" ><rect x="87.000000" y="571.000000" width="54.000000" height="66.000000" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="114.000000" y="609.500000" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">y</text></g><g id="x"><g class="shape" ><rect x="88.000000" y="0.000000" width="53.000000" height="66.000000" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="114.500000" y="38.500000" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">x</text></g><g id="Data.ex"><g class="shape" ></g><g transform="translate(40.000000 216.000000)" class="light-code" style="font-size:10"><rect width="148.000000" height="205.000000" class="shape stroke-N1" style="fill:#ffffff;stroke-width:2;" /><g transform="translate(5.000000 5.000000)"><text class="text-mono" x="0" y="1.000000em">Testing&#160;<tspan fill="#009999">001</tspan>:&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;AAA
-=======
 		.d2-747351070 .fill-N1{fill:#0A0F25;}
 		.d2-747351070 .fill-N2{fill:#676C7E;}
 		.d2-747351070 .fill-N3{fill:#9499AB;}
@@ -266,8 +103,7 @@
 		.d2-747351070 .color-AA4{color:#EDF0FD;}
 		.d2-747351070 .color-AA5{color:#F7F8FE;}
 		.d2-747351070 .color-AB4{color:#EDF0FD;}
-		.d2-747351070 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]></style><g id="Data"><g class="shape" ><rect x="10.000000" y="186.000000" width="208.000000" height="265.000000" stroke="#c8e9ad" fill="#c8e9ad" style="stroke-width:15;" /></g><text x="114.000000" y="173.000000" class="text fill-N1" style="text-anchor:middle;font-size:28px">Data</text></g><g id="y"><g class="shape" ><rect x="87.000000" y="571.000000" width="54.000000" height="66.000000" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="114.000000" y="609.500000" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">y</text></g><g id="x"><g class="shape" ><rect x="88.000000" y="0.000000" width="53.000000" height="66.000000" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="114.500000" y="38.500000" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">x</text></g><g id="Data.ex"><g class="shape" ></g><g transform="translate(40.000000 216.000000)" class="light-code" style="font-size:10"><rect width="148.000000" height="205.000000" class="shape stroke-N1" style="fill:#ffffff;stroke-width:2;" /><g transform="translate(5.000000 5.000000)"><text class="text-mono" x="0" y="1.000000em">Testing&#160;<tspan fill="#009999">001</tspan>:&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;AAA
+		.d2-747351070 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]></style><g id="Data"><g class="shape" ><rect x="10.000000" y="186.000000" width="208.000000" height="265.000000" stroke="#c8e9ad" fill="#c8e9ad" style="stroke-width:15;" /></g><text x="114.000000" y="173.000000" fill="#0A0F25" class="text fill-N1" style="text-anchor:middle;font-size:28px">Data</text></g><g id="y"><g class="shape" ><rect x="87.000000" y="571.000000" width="54.000000" height="66.000000" stroke="#0D32B2" fill="#F7F8FE" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="114.000000" y="609.500000" fill="#0A0F25" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">y</text></g><g id="x"><g class="shape" ><rect x="88.000000" y="0.000000" width="53.000000" height="66.000000" stroke="#0D32B2" fill="#F7F8FE" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="114.500000" y="38.500000" fill="#0A0F25" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">x</text></g><g id="Data.ex"><g class="shape" ></g><g transform="translate(40.000000 216.000000)" class="light-code" style="font-size:10"><rect width="148.000000" height="205.000000" stroke="#0A0F25" class="shape stroke-N1" style="fill:#ffffff;stroke-width:2;" /><g transform="translate(5.000000 5.000000)"><text class="text-mono" x="0" y="1.000000em">Testing&#160;<tspan fill="#009999">001</tspan>:&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;AAA
->>>>>>> 33280fed5 (fixed e2e tests)
 </text><text class="text-mono" x="0" y="2.300000em">Testing&#160;<tspan fill="#009999">002</tspan>:&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;BBB
 </text><text class="text-mono" x="0" y="3.600000em">Testing&#160;<tspan fill="#009999">003</tspan>:&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;CCC
 </text><text class="text-mono" x="0" y="4.900000em">Testing&#160;<tspan fill="#009999">004</tspan>:&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;DDD
@@ -281,7 +117,6 @@
 </text><text class="text-mono" x="0" y="15.300000em">Testing&#160;<tspan fill="#009999">012</tspan>:&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;LLL
 </text><text class="text-mono" x="0" y="16.600000em">Testing&#160;<tspan fill="#009999">013</tspan>:&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;MMM
 </text><text class="text-mono" x="0" y="17.900000em">Testing&#160;<tspan fill="#009999">014</tspan>:&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;NNN
-<<<<<<< HEAD
 </text><text class="text-mono" x="0" y="19.200000em">Testing&#160;<tspan fill="#009999">015</tspan>:&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;OOO</text></g></g><g transform="translate(40.000000 216.000000)" class="dark-code" style="font-size:10"><rect width="148.000000" height="205.000000" stroke="#0A0F25" class="shape stroke-N1" style="fill:#1e1e2e;stroke-width:2;" /><g transform="translate(5.000000 5.000000)"><text class="text-mono" x="0" y="1.000000em"><tspan fill="#cdd6f4">Testing</tspan><tspan fill="#cdd6f4">&#160;</tspan><tspan fill="#fab387">001</tspan><tspan fill="#cdd6f4">:</tspan><tspan fill="#cdd6f4">&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;</tspan><tspan fill="#cdd6f4">AAA</tspan><tspan fill="#cdd6f4">
 </tspan></text><text class="text-mono" x="0" y="2.300000em"><tspan fill="#cdd6f4"></tspan><tspan fill="#cdd6f4">Testing</tspan><tspan fill="#cdd6f4">&#160;</tspan><tspan fill="#fab387">002</tspan><tspan fill="#cdd6f4">:</tspan><tspan fill="#cdd6f4">&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;</tspan><tspan fill="#cdd6f4">BBB</tspan><tspan fill="#cdd6f4">
 </tspan></text><text class="text-mono" x="0" y="3.600000em"><tspan fill="#cdd6f4"></tspan><tspan fill="#cdd6f4">Testing</tspan><tspan fill="#cdd6f4">&#160;</tspan><tspan fill="#fab387">003</tspan><tspan fill="#cdd6f4">:</tspan><tspan fill="#cdd6f4">&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;</tspan><tspan fill="#cdd6f4">CCC</tspan><tspan fill="#cdd6f4">
@@ -296,40 +131,7 @@
 </tspan></text><text class="text-mono" x="0" y="15.300000em"><tspan fill="#cdd6f4"></tspan><tspan fill="#cdd6f4">Testing</tspan><tspan fill="#cdd6f4">&#160;</tspan><tspan fill="#fab387">012</tspan><tspan fill="#cdd6f4">:</tspan><tspan fill="#cdd6f4">&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;</tspan><tspan fill="#cdd6f4">LLL</tspan><tspan fill="#cdd6f4">
 </tspan></text><text class="text-mono" x="0" y="16.600000em"><tspan fill="#cdd6f4"></tspan><tspan fill="#cdd6f4">Testing</tspan><tspan fill="#cdd6f4">&#160;</tspan><tspan fill="#fab387">013</tspan><tspan fill="#cdd6f4">:</tspan><tspan fill="#cdd6f4">&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;</tspan><tspan fill="#cdd6f4">MMM</tspan><tspan fill="#cdd6f4">
 </tspan></text><text class="text-mono" x="0" y="17.900000em"><tspan fill="#cdd6f4"></tspan><tspan fill="#cdd6f4">Testing</tspan><tspan fill="#cdd6f4">&#160;</tspan><tspan fill="#fab387">014</tspan><tspan fill="#cdd6f4">:</tspan><tspan fill="#cdd6f4">&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;</tspan><tspan fill="#cdd6f4">NNN</tspan><tspan fill="#cdd6f4">
-</tspan></text><text class="text-mono" x="0" y="19.200000em"><tspan fill="#cdd6f4"></tspan><tspan fill="#cdd6f4">Testing</tspan><tspan fill="#cdd6f4">&#160;</tspan><tspan fill="#fab387">015</tspan><tspan fill="#cdd6f4">:</tspan><tspan fill="#cdd6f4">&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;</tspan><tspan fill="#cdd6f4">OOO</tspan></text></g></g></g><g id="(Data -- y)[0]"><path d="M 114.000000 459.500000 C 114.000000 507.000000 114.000000 531.000000 114.000000 569.000000" stroke="#0D32B2" fill="none" class="connection stroke-B1" style="stroke-width:2;" mask="url(#d2-1305390466)" /></g><g id="(x -- Data)[0]"><path d="M 114.000000 68.000000 C 114.000000 106.000000 114.000000 121.800003 114.000000 136.500000" stroke="#0D32B2" fill="none" class="connection stroke-B1" style="stroke-width:2;" mask="url(#d2-1305390466)" /></g><mask id="d2-1305390466" maskUnits="userSpaceOnUse" x="2" y="-1" width="224" height="639">
+</tspan></text><text class="text-mono" x="0" y="19.200000em"><tspan fill="#cdd6f4"></tspan><tspan fill="#cdd6f4">Testing</tspan><tspan fill="#cdd6f4">&#160;</tspan><tspan fill="#fab387">015</tspan><tspan fill="#cdd6f4">:</tspan><tspan fill="#cdd6f4">&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;</tspan><tspan fill="#cdd6f4">OOO</tspan></text></g></g></g><g id="(Data -- y)[0]"><path d="M 114.000000 459.500000 C 114.000000 507.000000 114.000000 531.000000 114.000000 569.000000" stroke="#0D32B2" fill="none" class="connection stroke-B1" style="stroke-width:2;" mask="url(#d2-747351070)" /></g><g id="(x -- Data)[0]"><path d="M 114.000000 68.000000 C 114.000000 106.000000 114.000000 121.800003 114.000000 136.500000" stroke="#0D32B2" fill="none" class="connection stroke-B1" style="stroke-width:2;" mask="url(#d2-747351070)" /></g><mask id="d2-747351070" maskUnits="userSpaceOnUse" x="2" y="-1" width="224" height="639">
-||||||| parent of 33280fed5 (fixed e2e tests)
-</text><text class="text-mono" x="0" y="19.200000em">Testing&#160;<tspan fill="#009999">015</tspan>:&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;OOO</text></g></g><g transform="translate(40.000000 216.000000)" class="dark-code" style="font-size:10"><rect width="148.000000" height="205.000000" class="shape stroke-N1" style="fill:#1e1e2e;stroke-width:2;" /><g transform="translate(5.000000 5.000000)"><text class="text-mono" x="0" y="1.000000em"><tspan fill="#fab387">Testing</tspan><tspan fill="#fab387">&#160;</tspan><tspan fill="#fab387">001</tspan><tspan fill="#cdd6f4">:</tspan><tspan fill="#fab387">&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;</tspan><tspan fill="#fab387">AAA</tspan><tspan fill="#fab387">
-</tspan></text><text class="text-mono" x="0" y="2.300000em"><tspan fill="#fab387"></tspan><tspan fill="#fab387">Testing</tspan><tspan fill="#fab387">&#160;</tspan><tspan fill="#fab387">002</tspan><tspan fill="#cdd6f4">:</tspan><tspan fill="#fab387">&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;</tspan><tspan fill="#fab387">BBB</tspan><tspan fill="#fab387">
-</tspan></text><text class="text-mono" x="0" y="3.600000em"><tspan fill="#fab387"></tspan><tspan fill="#fab387">Testing</tspan><tspan fill="#fab387">&#160;</tspan><tspan fill="#fab387">003</tspan><tspan fill="#cdd6f4">:</tspan><tspan fill="#fab387">&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;</tspan><tspan fill="#fab387">CCC</tspan><tspan fill="#fab387">
-</tspan></text><text class="text-mono" x="0" y="4.900000em"><tspan fill="#fab387"></tspan><tspan fill="#fab387">Testing</tspan><tspan fill="#fab387">&#160;</tspan><tspan fill="#fab387">004</tspan><tspan fill="#cdd6f4">:</tspan><tspan fill="#fab387">&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;</tspan><tspan fill="#fab387">DDD</tspan><tspan fill="#fab387">
-</tspan></text><text class="text-mono" x="0" y="6.200000em"><tspan fill="#fab387"></tspan><tspan fill="#fab387">Testing</tspan><tspan fill="#fab387">&#160;</tspan><tspan fill="#fab387">005</tspan><tspan fill="#cdd6f4">:</tspan><tspan fill="#fab387">&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;</tspan><tspan fill="#fab387">EEE</tspan><tspan fill="#fab387">
-</tspan></text><text class="text-mono" x="0" y="7.500000em"><tspan fill="#fab387"></tspan><tspan fill="#fab387">Testing</tspan><tspan fill="#fab387">&#160;</tspan><tspan fill="#fab387">006</tspan><tspan fill="#cdd6f4">:</tspan><tspan fill="#fab387">&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;</tspan><tspan fill="#fab387">FFF</tspan><tspan fill="#fab387">
-</tspan></text><text class="text-mono" x="0" y="8.800000em"><tspan fill="#fab387"></tspan><tspan fill="#fab387">Testing</tspan><tspan fill="#fab387">&#160;</tspan><tspan fill="#fab387">007</tspan><tspan fill="#cdd6f4">:</tspan><tspan fill="#fab387">&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;</tspan><tspan fill="#fab387">GGG</tspan><tspan fill="#fab387">
-</tspan></text><text class="text-mono" x="0" y="10.100000em"><tspan fill="#fab387"></tspan><tspan fill="#fab387">Testing</tspan><tspan fill="#fab387">&#160;</tspan><tspan fill="#fab387">00</tspan><tspan fill="#fab387">8</tspan><tspan fill="#cdd6f4">:</tspan><tspan fill="#fab387">&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;</tspan><tspan fill="#fab387">HHH</tspan><tspan fill="#fab387">
-</tspan></text><text class="text-mono" x="0" y="11.400000em"><tspan fill="#fab387"></tspan><tspan fill="#fab387">Testing</tspan><tspan fill="#fab387">&#160;</tspan><tspan fill="#fab387">00</tspan><tspan fill="#fab387">9</tspan><tspan fill="#cdd6f4">:</tspan><tspan fill="#fab387">&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;</tspan><tspan fill="#fab387">III</tspan><tspan fill="#fab387">
-</tspan></text><text class="text-mono" x="0" y="12.700000em"><tspan fill="#fab387"></tspan><tspan fill="#fab387">Testing</tspan><tspan fill="#fab387">&#160;</tspan><tspan fill="#fab387">010</tspan><tspan fill="#cdd6f4">:</tspan><tspan fill="#fab387">&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;</tspan><tspan fill="#fab387">JJJ</tspan><tspan fill="#fab387">
-</tspan></text><text class="text-mono" x="0" y="14.000000em"><tspan fill="#fab387"></tspan><tspan fill="#fab387">Testing</tspan><tspan fill="#fab387">&#160;</tspan><tspan fill="#fab387">011</tspan><tspan fill="#cdd6f4">:</tspan><tspan fill="#fab387">&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;</tspan><tspan fill="#fab387">KKK</tspan><tspan fill="#fab387">
-</tspan></text><text class="text-mono" x="0" y="15.300000em"><tspan fill="#fab387"></tspan><tspan fill="#fab387">Testing</tspan><tspan fill="#fab387">&#160;</tspan><tspan fill="#fab387">012</tspan><tspan fill="#cdd6f4">:</tspan><tspan fill="#fab387">&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;</tspan><tspan fill="#fab387">LLL</tspan><tspan fill="#fab387">
-</tspan></text><text class="text-mono" x="0" y="16.600000em"><tspan fill="#fab387"></tspan><tspan fill="#fab387">Testing</tspan><tspan fill="#fab387">&#160;</tspan><tspan fill="#fab387">013</tspan><tspan fill="#cdd6f4">:</tspan><tspan fill="#fab387">&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;</tspan><tspan fill="#fab387">MMM</tspan><tspan fill="#fab387">
-</tspan></text><text class="text-mono" x="0" y="17.900000em"><tspan fill="#fab387"></tspan><tspan fill="#fab387">Testing</tspan><tspan fill="#fab387">&#160;</tspan><tspan fill="#fab387">014</tspan><tspan fill="#cdd6f4">:</tspan><tspan fill="#fab387">&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;</tspan><tspan fill="#fab387">NNN</tspan><tspan fill="#fab387">
-</tspan></text><text class="text-mono" x="0" y="19.200000em"><tspan fill="#fab387"></tspan><tspan fill="#fab387">Testing</tspan><tspan fill="#fab387">&#160;</tspan><tspan fill="#fab387">015</tspan><tspan fill="#cdd6f4">:</tspan><tspan fill="#fab387">&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;</tspan><tspan fill="#fab387">OOO</tspan></text></g></g></g><g id="(Data -- y)[0]"><path d="M 114.000000 459.500000 C 114.000000 507.000000 114.000000 531.000000 114.000000 569.000000" fill="none" class="connection stroke-B1" style="stroke-width:2;" mask="url(#d2-1305390466)" /></g><g id="(x -- Data)[0]"><path d="M 114.000000 68.000000 C 114.000000 106.000000 114.000000 121.800003 114.000000 136.500000" fill="none" class="connection stroke-B1" style="stroke-width:2;" mask="url(#d2-1305390466)" /></g><mask id="d2-1305390466" maskUnits="userSpaceOnUse" x="2" y="-1" width="224" height="639">
-=======
-</text><text class="text-mono" x="0" y="19.200000em">Testing&#160;<tspan fill="#009999">015</tspan>:&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;OOO</text></g></g><g transform="translate(40.000000 216.000000)" class="dark-code" style="font-size:10"><rect width="148.000000" height="205.000000" class="shape stroke-N1" style="fill:#1e1e2e;stroke-width:2;" /><g transform="translate(5.000000 5.000000)"><text class="text-mono" x="0" y="1.000000em"><tspan fill="#fab387">Testing</tspan><tspan fill="#fab387">&#160;</tspan><tspan fill="#fab387">001</tspan><tspan fill="#cdd6f4">:</tspan><tspan fill="#fab387">&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;</tspan><tspan fill="#fab387">AAA</tspan><tspan fill="#fab387">
-</tspan></text><text class="text-mono" x="0" y="2.300000em"><tspan fill="#fab387"></tspan><tspan fill="#fab387">Testing</tspan><tspan fill="#fab387">&#160;</tspan><tspan fill="#fab387">002</tspan><tspan fill="#cdd6f4">:</tspan><tspan fill="#fab387">&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;</tspan><tspan fill="#fab387">BBB</tspan><tspan fill="#fab387">
-</tspan></text><text class="text-mono" x="0" y="3.600000em"><tspan fill="#fab387"></tspan><tspan fill="#fab387">Testing</tspan><tspan fill="#fab387">&#160;</tspan><tspan fill="#fab387">003</tspan><tspan fill="#cdd6f4">:</tspan><tspan fill="#fab387">&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;</tspan><tspan fill="#fab387">CCC</tspan><tspan fill="#fab387">
-</tspan></text><text class="text-mono" x="0" y="4.900000em"><tspan fill="#fab387"></tspan><tspan fill="#fab387">Testing</tspan><tspan fill="#fab387">&#160;</tspan><tspan fill="#fab387">004</tspan><tspan fill="#cdd6f4">:</tspan><tspan fill="#fab387">&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;</tspan><tspan fill="#fab387">DDD</tspan><tspan fill="#fab387">
-</tspan></text><text class="text-mono" x="0" y="6.200000em"><tspan fill="#fab387"></tspan><tspan fill="#fab387">Testing</tspan><tspan fill="#fab387">&#160;</tspan><tspan fill="#fab387">005</tspan><tspan fill="#cdd6f4">:</tspan><tspan fill="#fab387">&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;</tspan><tspan fill="#fab387">EEE</tspan><tspan fill="#fab387">
-</tspan></text><text class="text-mono" x="0" y="7.500000em"><tspan fill="#fab387"></tspan><tspan fill="#fab387">Testing</tspan><tspan fill="#fab387">&#160;</tspan><tspan fill="#fab387">006</tspan><tspan fill="#cdd6f4">:</tspan><tspan fill="#fab387">&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;</tspan><tspan fill="#fab387">FFF</tspan><tspan fill="#fab387">
-</tspan></text><text class="text-mono" x="0" y="8.800000em"><tspan fill="#fab387"></tspan><tspan fill="#fab387">Testing</tspan><tspan fill="#fab387">&#160;</tspan><tspan fill="#fab387">007</tspan><tspan fill="#cdd6f4">:</tspan><tspan fill="#fab387">&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;</tspan><tspan fill="#fab387">GGG</tspan><tspan fill="#fab387">
-</tspan></text><text class="text-mono" x="0" y="10.100000em"><tspan fill="#fab387"></tspan><tspan fill="#fab387">Testing</tspan><tspan fill="#fab387">&#160;</tspan><tspan fill="#fab387">00</tspan><tspan fill="#fab387">8</tspan><tspan fill="#cdd6f4">:</tspan><tspan fill="#fab387">&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;</tspan><tspan fill="#fab387">HHH</tspan><tspan fill="#fab387">
-</tspan></text><text class="text-mono" x="0" y="11.400000em"><tspan fill="#fab387"></tspan><tspan fill="#fab387">Testing</tspan><tspan fill="#fab387">&#160;</tspan><tspan fill="#fab387">00</tspan><tspan fill="#fab387">9</tspan><tspan fill="#cdd6f4">:</tspan><tspan fill="#fab387">&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;</tspan><tspan fill="#fab387">III</tspan><tspan fill="#fab387">
-</tspan></text><text class="text-mono" x="0" y="12.700000em"><tspan fill="#fab387"></tspan><tspan fill="#fab387">Testing</tspan><tspan fill="#fab387">&#160;</tspan><tspan fill="#fab387">010</tspan><tspan fill="#cdd6f4">:</tspan><tspan fill="#fab387">&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;</tspan><tspan fill="#fab387">JJJ</tspan><tspan fill="#fab387">
-</tspan></text><text class="text-mono" x="0" y="14.000000em"><tspan fill="#fab387"></tspan><tspan fill="#fab387">Testing</tspan><tspan fill="#fab387">&#160;</tspan><tspan fill="#fab387">011</tspan><tspan fill="#cdd6f4">:</tspan><tspan fill="#fab387">&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;</tspan><tspan fill="#fab387">KKK</tspan><tspan fill="#fab387">
-</tspan></text><text class="text-mono" x="0" y="15.300000em"><tspan fill="#fab387"></tspan><tspan fill="#fab387">Testing</tspan><tspan fill="#fab387">&#160;</tspan><tspan fill="#fab387">012</tspan><tspan fill="#cdd6f4">:</tspan><tspan fill="#fab387">&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;</tspan><tspan fill="#fab387">LLL</tspan><tspan fill="#fab387">
-</tspan></text><text class="text-mono" x="0" y="16.600000em"><tspan fill="#fab387"></tspan><tspan fill="#fab387">Testing</tspan><tspan fill="#fab387">&#160;</tspan><tspan fill="#fab387">013</tspan><tspan fill="#cdd6f4">:</tspan><tspan fill="#fab387">&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;</tspan><tspan fill="#fab387">MMM</tspan><tspan fill="#fab387">
-</tspan></text><text class="text-mono" x="0" y="17.900000em"><tspan fill="#fab387"></tspan><tspan fill="#fab387">Testing</tspan><tspan fill="#fab387">&#160;</tspan><tspan fill="#fab387">014</tspan><tspan fill="#cdd6f4">:</tspan><tspan fill="#fab387">&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;</tspan><tspan fill="#fab387">NNN</tspan><tspan fill="#fab387">
-</tspan></text><text class="text-mono" x="0" y="19.200000em"><tspan fill="#fab387"></tspan><tspan fill="#fab387">Testing</tspan><tspan fill="#fab387">&#160;</tspan><tspan fill="#fab387">015</tspan><tspan fill="#cdd6f4">:</tspan><tspan fill="#fab387">&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;</tspan><tspan fill="#fab387">OOO</tspan></text></g></g></g><g id="(Data -- y)[0]"><path d="M 114.000000 459.500000 C 114.000000 507.000000 114.000000 531.000000 114.000000 569.000000" fill="none" class="connection stroke-B1" style="stroke-width:2;" mask="url(#d2-747351070)" /></g><g id="(x -- Data)[0]"><path d="M 114.000000 68.000000 C 114.000000 106.000000 114.000000 121.800003 114.000000 136.500000" fill="none" class="connection stroke-B1" style="stroke-width:2;" mask="url(#d2-747351070)" /></g><mask id="d2-747351070" maskUnits="userSpaceOnUse" x="2" y="-1" width="224" height="639">
->>>>>>> 33280fed5 (fixed e2e tests)
 <rect x="2" y="-1" width="224" height="639" fill="white"></rect>
 <rect x="88.000000" y="145.000000" width="52" height="36" fill="rgba(0,0,0,0.75)"></rect>
 <rect x="109.500000" y="593.500000" width="9" height="21" fill="rgba(0,0,0,0.75)"></rect>

e2etests/testdata/regression/code_font_size/elk/sketch.exp.svg

@@ -1,22 +1,6 @@
-<<<<<<< HEAD
+<?xml version="1.0" encoding="utf-8"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" d2Version="v0.6.8-HEAD" preserveAspectRatio="xMinYMin meet" viewBox="0 0 264 579"><svg id="d2-svg" class="d2-119284118" width="264" height="579" viewBox="4 11 264 579"><rect x="4.000000" y="11.000000" width="264.000000" height="579.000000" rx="0.000000" fill="#FFFFFF" class=" fill-N7" stroke-width="0" /><style type="text/css"><![CDATA[
-<<<<<<< HEAD
-<?xml version="1.0" encoding="utf-8"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" d2Version="v0.6.8-HEAD" preserveAspectRatio="xMinYMin meet" viewBox="0 0 264 579"><svg id="d2-svg" class="d2-3010012946" width="264" height="579" viewBox="4 11 264 579"><rect x="4.000000" y="11.000000" width="264.000000" height="579.000000" rx="0.000000" fill="#FFFFFF" class=" fill-N7" stroke-width="0" /><style type="text/css"><![CDATA[
-.d2-3010012946 .text {
-	font-family: "d2-3010012946-font-regular";
-||||||| parent of 33280fed5 (fixed e2e tests)
-<?xml version="1.0" encoding="utf-8"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" d2Version="v0.6.6-HEAD" preserveAspectRatio="xMinYMin meet" viewBox="0 0 264 579"><svg id="d2-svg" class="d2-3010012946" width="264" height="579" viewBox="4 11 264 579"><rect x="4.000000" y="11.000000" width="264.000000" height="579.000000" rx="0.000000" class=" fill-N7" stroke-width="0" /><style type="text/css"><![CDATA[
-.d2-3010012946 .text {
-	font-family: "d2-3010012946-font-regular";
-=======
-<?xml version="1.0" encoding="utf-8"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" d2Version="v0.6.5-HEAD" preserveAspectRatio="xMinYMin meet" viewBox="0 0 264 579"><svg id="d2-svg" class="d2-119284118" width="264" height="579" viewBox="4 11 264 579"><rect x="4.000000" y="11.000000" width="264.000000" height="579.000000" rx="0.000000" class=" fill-N7" stroke-width="0" /><style type="text/css"><![CDATA[
-||||||| parent of cb2f2823c (Fix changes)
-<?xml version="1.0" encoding="utf-8"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" d2Version="v0.6.5-HEAD" preserveAspectRatio="xMinYMin meet" viewBox="0 0 264 579"><svg id="d2-svg" class="d2-119284118" width="264" height="579" viewBox="4 11 264 579"><rect x="4.000000" y="11.000000" width="264.000000" height="579.000000" rx="0.000000" class=" fill-N7" stroke-width="0" /><style type="text/css"><![CDATA[
-=======
-<?xml version="1.0" encoding="utf-8"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" d2Version="v0.6.6-HEAD" preserveAspectRatio="xMinYMin meet" viewBox="0 0 264 579"><svg id="d2-svg" class="d2-119284118" width="264" height="579" viewBox="4 11 264 579"><rect x="4.000000" y="11.000000" width="264.000000" height="579.000000" rx="0.000000" class=" fill-N7" stroke-width="0" /><style type="text/css"><![CDATA[
->>>>>>> cb2f2823c (Fix changes)
 .d2-119284118 .text {
 	font-family: "d2-119284118-font-regular";
->>>>>>> 33280fed5 (fixed e2e tests)
 }
 @font-face {
 	font-family: d2-119284118-font-regular;
@@ -48,153 +32,6 @@
   opacity: 0.5;
 }
 
-<<<<<<< HEAD
-		.d2-3010012946 .fill-N1{fill:#0A0F25;}
-		.d2-3010012946 .fill-N2{fill:#676C7E;}
-		.d2-3010012946 .fill-N3{fill:#9499AB;}
-		.d2-3010012946 .fill-N4{fill:#CFD2DD;}
-		.d2-3010012946 .fill-N5{fill:#DEE1EB;}
-		.d2-3010012946 .fill-N6{fill:#EEF1F8;}
-		.d2-3010012946 .fill-N7{fill:#FFFFFF;}
-		.d2-3010012946 .fill-B1{fill:#0D32B2;}
-		.d2-3010012946 .fill-B2{fill:#0D32B2;}
-		.d2-3010012946 .fill-B3{fill:#E3E9FD;}
-		.d2-3010012946 .fill-B4{fill:#E3E9FD;}
-		.d2-3010012946 .fill-B5{fill:#EDF0FD;}
-		.d2-3010012946 .fill-B6{fill:#F7F8FE;}
-		.d2-3010012946 .fill-AA2{fill:#4A6FF3;}
-		.d2-3010012946 .fill-AA4{fill:#EDF0FD;}
-		.d2-3010012946 .fill-AA5{fill:#F7F8FE;}
-		.d2-3010012946 .fill-AB4{fill:#EDF0FD;}
-		.d2-3010012946 .fill-AB5{fill:#F7F8FE;}
-		.d2-3010012946 .stroke-N1{stroke:#0A0F25;}
-		.d2-3010012946 .stroke-N2{stroke:#676C7E;}
-		.d2-3010012946 .stroke-N3{stroke:#9499AB;}
-		.d2-3010012946 .stroke-N4{stroke:#CFD2DD;}
-		.d2-3010012946 .stroke-N5{stroke:#DEE1EB;}
-		.d2-3010012946 .stroke-N6{stroke:#EEF1F8;}
-		.d2-3010012946 .stroke-N7{stroke:#FFFFFF;}
-		.d2-3010012946 .stroke-B1{stroke:#0D32B2;}
-		.d2-3010012946 .stroke-B2{stroke:#0D32B2;}
-		.d2-3010012946 .stroke-B3{stroke:#E3E9FD;}
-		.d2-3010012946 .stroke-B4{stroke:#E3E9FD;}
-		.d2-3010012946 .stroke-B5{stroke:#EDF0FD;}
-		.d2-3010012946 .stroke-B6{stroke:#F7F8FE;}
-		.d2-3010012946 .stroke-AA2{stroke:#4A6FF3;}
-		.d2-3010012946 .stroke-AA4{stroke:#EDF0FD;}
-		.d2-3010012946 .stroke-AA5{stroke:#F7F8FE;}
-		.d2-3010012946 .stroke-AB4{stroke:#EDF0FD;}
-		.d2-3010012946 .stroke-AB5{stroke:#F7F8FE;}
-		.d2-3010012946 .background-color-N1{background-color:#0A0F25;}
-		.d2-3010012946 .background-color-N2{background-color:#676C7E;}
-		.d2-3010012946 .background-color-N3{background-color:#9499AB;}
-		.d2-3010012946 .background-color-N4{background-color:#CFD2DD;}
-		.d2-3010012946 .background-color-N5{background-color:#DEE1EB;}
-		.d2-3010012946 .background-color-N6{background-color:#EEF1F8;}
-		.d2-3010012946 .background-color-N7{background-color:#FFFFFF;}
-		.d2-3010012946 .background-color-B1{background-color:#0D32B2;}
-		.d2-3010012946 .background-color-B2{background-color:#0D32B2;}
-		.d2-3010012946 .background-color-B3{background-color:#E3E9FD;}
-		.d2-3010012946 .background-color-B4{background-color:#E3E9FD;}
-		.d2-3010012946 .background-color-B5{background-color:#EDF0FD;}
-		.d2-3010012946 .background-color-B6{background-color:#F7F8FE;}
-		.d2-3010012946 .background-color-AA2{background-color:#4A6FF3;}
-		.d2-3010012946 .background-color-AA4{background-color:#EDF0FD;}
-		.d2-3010012946 .background-color-AA5{background-color:#F7F8FE;}
-		.d2-3010012946 .background-color-AB4{background-color:#EDF0FD;}
-		.d2-3010012946 .background-color-AB5{background-color:#F7F8FE;}
-		.d2-3010012946 .color-N1{color:#0A0F25;}
-		.d2-3010012946 .color-N2{color:#676C7E;}
-		.d2-3010012946 .color-N3{color:#9499AB;}
-		.d2-3010012946 .color-N4{color:#CFD2DD;}
-		.d2-3010012946 .color-N5{color:#DEE1EB;}
-		.d2-3010012946 .color-N6{color:#EEF1F8;}
-		.d2-3010012946 .color-N7{color:#FFFFFF;}
-		.d2-3010012946 .color-B1{color:#0D32B2;}
-		.d2-3010012946 .color-B2{color:#0D32B2;}
-		.d2-3010012946 .color-B3{color:#E3E9FD;}
-		.d2-3010012946 .color-B4{color:#E3E9FD;}
-		.d2-3010012946 .color-B5{color:#EDF0FD;}
-		.d2-3010012946 .color-B6{color:#F7F8FE;}
-		.d2-3010012946 .color-AA2{color:#4A6FF3;}
-		.d2-3010012946 .color-AA4{color:#EDF0FD;}
-		.d2-3010012946 .color-AA5{color:#F7F8FE;}
-		.d2-3010012946 .color-AB4{color:#EDF0FD;}
-		.d2-3010012946 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]></style><g id="Data"><g class="shape" ><rect x="12.000000" y="148.000000" width="248.000000" height="305.000000" stroke="#c8e9ad" fill="#c8e9ad" style="stroke-width:15;" /></g><text x="136.000000" y="181.000000" fill="#0A0F25" class="text fill-N1" style="text-anchor:middle;font-size:28px">Data</text></g><g id="y"><g class="shape" ><rect x="109.000000" y="523.000000" width="54.000000" height="66.000000" stroke="#0D32B2" fill="#F7F8FE" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="136.000000" y="561.500000" fill="#0A0F25" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">y</text></g><g id="x"><g class="shape" ><rect x="109.000000" y="12.000000" width="53.000000" height="66.000000" stroke="#0D32B2" fill="#F7F8FE" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="135.500000" y="50.500000" fill="#0A0F25" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">x</text></g><g id="Data.ex"><g class="shape" ></g><g transform="translate(62.000000 198.000000)" class="light-code" style="font-size:10"><rect width="148.000000" height="205.000000" stroke="#0A0F25" class="shape stroke-N1" style="fill:#ffffff;stroke-width:2;" /><g transform="translate(5.000000 5.000000)"><text class="text-mono" x="0" y="1.000000em">Testing&#160;<tspan fill="#009999">001</tspan>:&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;AAA
-||||||| parent of 33280fed5 (fixed e2e tests)
-		.d2-3010012946 .fill-N1{fill:#0A0F25;}
-		.d2-3010012946 .fill-N2{fill:#676C7E;}
-		.d2-3010012946 .fill-N3{fill:#9499AB;}
-		.d2-3010012946 .fill-N4{fill:#CFD2DD;}
-		.d2-3010012946 .fill-N5{fill:#DEE1EB;}
-		.d2-3010012946 .fill-N6{fill:#EEF1F8;}
-		.d2-3010012946 .fill-N7{fill:#FFFFFF;}
-		.d2-3010012946 .fill-B1{fill:#0D32B2;}
-		.d2-3010012946 .fill-B2{fill:#0D32B2;}
-		.d2-3010012946 .fill-B3{fill:#E3E9FD;}
-		.d2-3010012946 .fill-B4{fill:#E3E9FD;}
-		.d2-3010012946 .fill-B5{fill:#EDF0FD;}
-		.d2-3010012946 .fill-B6{fill:#F7F8FE;}
-		.d2-3010012946 .fill-AA2{fill:#4A6FF3;}
-		.d2-3010012946 .fill-AA4{fill:#EDF0FD;}
-		.d2-3010012946 .fill-AA5{fill:#F7F8FE;}
-		.d2-3010012946 .fill-AB4{fill:#EDF0FD;}
-		.d2-3010012946 .fill-AB5{fill:#F7F8FE;}
-		.d2-3010012946 .stroke-N1{stroke:#0A0F25;}
-		.d2-3010012946 .stroke-N2{stroke:#676C7E;}
-		.d2-3010012946 .stroke-N3{stroke:#9499AB;}
-		.d2-3010012946 .stroke-N4{stroke:#CFD2DD;}
-		.d2-3010012946 .stroke-N5{stroke:#DEE1EB;}
-		.d2-3010012946 .stroke-N6{stroke:#EEF1F8;}
-		.d2-3010012946 .stroke-N7{stroke:#FFFFFF;}
-		.d2-3010012946 .stroke-B1{stroke:#0D32B2;}
-		.d2-3010012946 .stroke-B2{stroke:#0D32B2;}
-		.d2-3010012946 .stroke-B3{stroke:#E3E9FD;}
-		.d2-3010012946 .stroke-B4{stroke:#E3E9FD;}
-		.d2-3010012946 .stroke-B5{stroke:#EDF0FD;}
-		.d2-3010012946 .stroke-B6{stroke:#F7F8FE;}
-		.d2-3010012946 .stroke-AA2{stroke:#4A6FF3;}
-		.d2-3010012946 .stroke-AA4{stroke:#EDF0FD;}
-		.d2-3010012946 .stroke-AA5{stroke:#F7F8FE;}
-		.d2-3010012946 .stroke-AB4{stroke:#EDF0FD;}
-		.d2-3010012946 .stroke-AB5{stroke:#F7F8FE;}
-		.d2-3010012946 .background-color-N1{background-color:#0A0F25;}
-		.d2-3010012946 .background-color-N2{background-color:#676C7E;}
-		.d2-3010012946 .background-color-N3{background-color:#9499AB;}
-		.d2-3010012946 .background-color-N4{background-color:#CFD2DD;}
-		.d2-3010012946 .background-color-N5{background-color:#DEE1EB;}
-		.d2-3010012946 .background-color-N6{background-color:#EEF1F8;}
-		.d2-3010012946 .background-color-N7{background-color:#FFFFFF;}
-		.d2-3010012946 .background-color-B1{background-color:#0D32B2;}
-		.d2-3010012946 .background-color-B2{background-color:#0D32B2;}
-		.d2-3010012946 .background-color-B3{background-color:#E3E9FD;}
-		.d2-3010012946 .background-color-B4{background-color:#E3E9FD;}
-		.d2-3010012946 .background-color-B5{background-color:#EDF0FD;}
-		.d2-3010012946 .background-color-B6{background-color:#F7F8FE;}
-		.d2-3010012946 .background-color-AA2{background-color:#4A6FF3;}
-		.d2-3010012946 .background-color-AA4{background-color:#EDF0FD;}
-		.d2-3010012946 .background-color-AA5{background-color:#F7F8FE;}
-		.d2-3010012946 .background-color-AB4{background-color:#EDF0FD;}
-		.d2-3010012946 .background-color-AB5{background-color:#F7F8FE;}
-		.d2-3010012946 .color-N1{color:#0A0F25;}
-		.d2-3010012946 .color-N2{color:#676C7E;}
-		.d2-3010012946 .color-N3{color:#9499AB;}
-		.d2-3010012946 .color-N4{color:#CFD2DD;}
-		.d2-3010012946 .color-N5{color:#DEE1EB;}
-		.d2-3010012946 .color-N6{color:#EEF1F8;}
-		.d2-3010012946 .color-N7{color:#FFFFFF;}
-		.d2-3010012946 .color-B1{color:#0D32B2;}
-		.d2-3010012946 .color-B2{color:#0D32B2;}
-		.d2-3010012946 .color-B3{color:#E3E9FD;}
-		.d2-3010012946 .color-B4{color:#E3E9FD;}
-		.d2-3010012946 .color-B5{color:#EDF0FD;}
-		.d2-3010012946 .color-B6{color:#F7F8FE;}
-		.d2-3010012946 .color-AA2{color:#4A6FF3;}
-		.d2-3010012946 .color-AA4{color:#EDF0FD;}
-		.d2-3010012946 .color-AA5{color:#F7F8FE;}
-		.d2-3010012946 .color-AB4{color:#EDF0FD;}
-		.d2-3010012946 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]></style><g id="Data"><g class="shape" ><rect x="12.000000" y="148.000000" width="248.000000" height="305.000000" stroke="#c8e9ad" fill="#c8e9ad" style="stroke-width:15;" /></g><text x="136.000000" y="181.000000" class="text fill-N1" style="text-anchor:middle;font-size:28px">Data</text></g><g id="y"><g class="shape" ><rect x="109.000000" y="523.000000" width="54.000000" height="66.000000" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="136.000000" y="561.500000" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">y</text></g><g id="x"><g class="shape" ><rect x="109.000000" y="12.000000" width="53.000000" height="66.000000" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="135.500000" y="50.500000" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">x</text></g><g id="Data.ex"><g class="shape" ></g><g transform="translate(62.000000 198.000000)" class="light-code" style="font-size:10"><rect width="148.000000" height="205.000000" class="shape stroke-N1" style="fill:#ffffff;stroke-width:2;" /><g transform="translate(5.000000 5.000000)"><text class="text-mono" x="0" y="1.000000em">Testing&#160;<tspan fill="#009999">001</tspan>:&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;AAA
-=======
 		.d2-119284118 .fill-N1{fill:#0A0F25;}
 		.d2-119284118 .fill-N2{fill:#676C7E;}
 		.d2-119284118 .fill-N3{fill:#9499AB;}
@@ -266,8 +103,7 @@
 		.d2-119284118 .color-AA4{color:#EDF0FD;}
 		.d2-119284118 .color-AA5{color:#F7F8FE;}
 		.d2-119284118 .color-AB4{color:#EDF0FD;}
-		.d2-119284118 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]></style><g id="Data"><g class="shape" ><rect x="12.000000" y="148.000000" width="248.000000" height="305.000000" stroke="#c8e9ad" fill="#c8e9ad" style="stroke-width:15;" /></g><text x="136.000000" y="181.000000" class="text fill-N1" style="text-anchor:middle;font-size:28px">Data</text></g><g id="y"><g class="shape" ><rect x="109.000000" y="523.000000" width="54.000000" height="66.000000" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="136.000000" y="561.500000" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">y</text></g><g id="x"><g class="shape" ><rect x="109.000000" y="12.000000" width="53.000000" height="66.000000" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="135.500000" y="50.500000" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">x</text></g><g id="Data.ex"><g class="shape" ></g><g transform="translate(62.000000 198.000000)" class="light-code" style="font-size:10"><rect width="148.000000" height="205.000000" class="shape stroke-N1" style="fill:#ffffff;stroke-width:2;" /><g transform="translate(5.000000 5.000000)"><text class="text-mono" x="0" y="1.000000em">Testing&#160;<tspan fill="#009999">001</tspan>:&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;AAA
+		.d2-119284118 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]></style><g id="Data"><g class="shape" ><rect x="12.000000" y="148.000000" width="248.000000" height="305.000000" stroke="#c8e9ad" fill="#c8e9ad" style="stroke-width:15;" /></g><text x="136.000000" y="181.000000" fill="#0A0F25" class="text fill-N1" style="text-anchor:middle;font-size:28px">Data</text></g><g id="y"><g class="shape" ><rect x="109.000000" y="523.000000" width="54.000000" height="66.000000" stroke="#0D32B2" fill="#F7F8FE" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="136.000000" y="561.500000" fill="#0A0F25" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">y</text></g><g id="x"><g class="shape" ><rect x="109.000000" y="12.000000" width="53.000000" height="66.000000" stroke="#0D32B2" fill="#F7F8FE" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="135.500000" y="50.500000" fill="#0A0F25" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">x</text></g><g id="Data.ex"><g class="shape" ></g><g transform="translate(62.000000 198.000000)" class="light-code" style="font-size:10"><rect width="148.000000" height="205.000000" stroke="#0A0F25" class="shape stroke-N1" style="fill:#ffffff;stroke-width:2;" /><g transform="translate(5.000000 5.000000)"><text class="text-mono" x="0" y="1.000000em">Testing&#160;<tspan fill="#009999">001</tspan>:&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;AAA
->>>>>>> 33280fed5 (fixed e2e tests)
 </text><text class="text-mono" x="0" y="2.300000em">Testing&#160;<tspan fill="#009999">002</tspan>:&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;BBB
 </text><text class="text-mono" x="0" y="3.600000em">Testing&#160;<tspan fill="#009999">003</tspan>:&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;CCC
 </text><text class="text-mono" x="0" y="4.900000em">Testing&#160;<tspan fill="#009999">004</tspan>:&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;DDD
@@ -281,7 +117,6 @@
 </text><text class="text-mono" x="0" y="15.300000em">Testing&#160;<tspan fill="#009999">012</tspan>:&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;LLL
 </text><text class="text-mono" x="0" y="16.600000em">Testing&#160;<tspan fill="#009999">013</tspan>:&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;MMM
 </text><text class="text-mono" x="0" y="17.900000em">Testing&#160;<tspan fill="#009999">014</tspan>:&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;NNN
-<<<<<<< HEAD
 </text><text class="text-mono" x="0" y="19.200000em">Testing&#160;<tspan fill="#009999">015</tspan>:&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;OOO</text></g></g><g transform="translate(62.000000 198.000000)" class="dark-code" style="font-size:10"><rect width="148.000000" height="205.000000" stroke="#0A0F25" class="shape stroke-N1" style="fill:#1e1e2e;stroke-width:2;" /><g transform="translate(5.000000 5.000000)"><text class="text-mono" x="0" y="1.000000em"><tspan fill="#cdd6f4">Testing</tspan><tspan fill="#cdd6f4">&#160;</tspan><tspan fill="#fab387">001</tspan><tspan fill="#cdd6f4">:</tspan><tspan fill="#cdd6f4">&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;</tspan><tspan fill="#cdd6f4">AAA</tspan><tspan fill="#cdd6f4">
 </tspan></text><text class="text-mono" x="0" y="2.300000em"><tspan fill="#cdd6f4"></tspan><tspan fill="#cdd6f4">Testing</tspan><tspan fill="#cdd6f4">&#160;</tspan><tspan fill="#fab387">002</tspan><tspan fill="#cdd6f4">:</tspan><tspan fill="#cdd6f4">&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;</tspan><tspan fill="#cdd6f4">BBB</tspan><tspan fill="#cdd6f4">
 </tspan></text><text class="text-mono" x="0" y="3.600000em"><tspan fill="#cdd6f4"></tspan><tspan fill="#cdd6f4">Testing</tspan><tspan fill="#cdd6f4">&#160;</tspan><tspan fill="#fab387">003</tspan><tspan fill="#cdd6f4">:</tspan><tspan fill="#cdd6f4">&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;</tspan><tspan fill="#cdd6f4">CCC</tspan><tspan fill="#cdd6f4">
@@ -296,40 +131,7 @@
 </tspan></text><text class="text-mono" x="0" y="15.300000em"><tspan fill="#cdd6f4"></tspan><tspan fill="#cdd6f4">Testing</tspan><tspan fill="#cdd6f4">&#160;</tspan><tspan fill="#fab387">012</tspan><tspan fill="#cdd6f4">:</tspan><tspan fill="#cdd6f4">&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;</tspan><tspan fill="#cdd6f4">LLL</tspan><tspan fill="#cdd6f4">
 </tspan></text><text class="text-mono" x="0" y="16.600000em"><tspan fill="#cdd6f4"></tspan><tspan fill="#cdd6f4">Testing</tspan><tspan fill="#cdd6f4">&#160;</tspan><tspan fill="#fab387">013</tspan><tspan fill="#cdd6f4">:</tspan><tspan fill="#cdd6f4">&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;</tspan><tspan fill="#cdd6f4">MMM</tspan><tspan fill="#cdd6f4">
 </tspan></text><text class="text-mono" x="0" y="17.900000em"><tspan fill="#cdd6f4"></tspan><tspan fill="#cdd6f4">Testing</tspan><tspan fill="#cdd6f4">&#160;</tspan><tspan fill="#fab387">014</tspan><tspan fill="#cdd6f4">:</tspan><tspan fill="#cdd6f4">&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;</tspan><tspan fill="#cdd6f4">NNN</tspan><tspan fill="#cdd6f4">
-</tspan></text><text class="text-mono" x="0" y="19.200000em"><tspan fill="#cdd6f4"></tspan><tspan fill="#cdd6f4">Testing</tspan><tspan fill="#cdd6f4">&#160;</tspan><tspan fill="#fab387">015</tspan><tspan fill="#cdd6f4">:</tspan><tspan fill="#cdd6f4">&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;</tspan><tspan fill="#cdd6f4">OOO</tspan></text></g></g></g><g id="(Data -- y)[0]"><path d="M 136.000000 461.500000 L 136.000000 521.000000" stroke="#0D32B2" fill="none" class="connection stroke-B1" style="stroke-width:2;" mask="url(#d2-3010012946)" /></g><g id="(x -- Data)[0]"><path d="M 136.000000 80.000000 L 136.000000 139.500000" stroke="#0D32B2" fill="none" class="connection stroke-B1" style="stroke-width:2;" mask="url(#d2-3010012946)" /></g><mask id="d2-3010012946" maskUnits="userSpaceOnUse" x="4" y="11" width="264" height="579">
+</tspan></text><text class="text-mono" x="0" y="19.200000em"><tspan fill="#cdd6f4"></tspan><tspan fill="#cdd6f4">Testing</tspan><tspan fill="#cdd6f4">&#160;</tspan><tspan fill="#fab387">015</tspan><tspan fill="#cdd6f4">:</tspan><tspan fill="#cdd6f4">&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;</tspan><tspan fill="#cdd6f4">OOO</tspan></text></g></g></g><g id="(Data -- y)[0]"><path d="M 136.000000 461.500000 L 136.000000 521.000000" stroke="#0D32B2" fill="none" class="connection stroke-B1" style="stroke-width:2;" mask="url(#d2-119284118)" /></g><g id="(x -- Data)[0]"><path d="M 136.000000 80.000000 L 136.000000 139.500000" stroke="#0D32B2" fill="none" class="connection stroke-B1" style="stroke-width:2;" mask="url(#d2-119284118)" /></g><mask id="d2-119284118" maskUnits="userSpaceOnUse" x="4" y="11" width="264" height="579">
-||||||| parent of 33280fed5 (fixed e2e tests)
-</text><text class="text-mono" x="0" y="19.200000em">Testing&#160;<tspan fill="#009999">015</tspan>:&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;OOO</text></g></g><g transform="translate(62.000000 198.000000)" class="dark-code" style="font-size:10"><rect width="148.000000" height="205.000000" class="shape stroke-N1" style="fill:#1e1e2e;stroke-width:2;" /><g transform="translate(5.000000 5.000000)"><text class="text-mono" x="0" y="1.000000em"><tspan fill="#fab387">Testing</tspan><tspan fill="#fab387">&#160;</tspan><tspan fill="#fab387">001</tspan><tspan fill="#cdd6f4">:</tspan><tspan fill="#fab387">&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;</tspan><tspan fill="#fab387">AAA</tspan><tspan fill="#fab387">
-</tspan></text><text class="text-mono" x="0" y="2.300000em"><tspan fill="#fab387"></tspan><tspan fill="#fab387">Testing</tspan><tspan fill="#fab387">&#160;</tspan><tspan fill="#fab387">002</tspan><tspan fill="#cdd6f4">:</tspan><tspan fill="#fab387">&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;</tspan><tspan fill="#fab387">BBB</tspan><tspan fill="#fab387">
-</tspan></text><text class="text-mono" x="0" y="3.600000em"><tspan fill="#fab387"></tspan><tspan fill="#fab387">Testing</tspan><tspan fill="#fab387">&#160;</tspan><tspan fill="#fab387">003</tspan><tspan fill="#cdd6f4">:</tspan><tspan fill="#fab387">&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;</tspan><tspan fill="#fab387">CCC</tspan><tspan fill="#fab387">
-</tspan></text><text class="text-mono" x="0" y="4.900000em"><tspan fill="#fab387"></tspan><tspan fill="#fab387">Testing</tspan><tspan fill="#fab387">&#160;</tspan><tspan fill="#fab387">004</tspan><tspan fill="#cdd6f4">:</tspan><tspan fill="#fab387">&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;</tspan><tspan fill="#fab387">DDD</tspan><tspan fill="#fab387">
-</tspan></text><text class="text-mono" x="0" y="6.200000em"><tspan fill="#fab387"></tspan><tspan fill="#fab387">Testing</tspan><tspan fill="#fab387">&#160;</tspan><tspan fill="#fab387">005</tspan><tspan fill="#cdd6f4">:</tspan><tspan fill="#fab387">&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;</tspan><tspan fill="#fab387">EEE</tspan><tspan fill="#fab387">
-</tspan></text><text class="text-mono" x="0" y="7.500000em"><tspan fill="#fab387"></tspan><tspan fill="#fab387">Testing</tspan><tspan fill="#fab387">&#160;</tspan><tspan fill="#fab387">006</tspan><tspan fill="#cdd6f4">:</tspan><tspan fill="#fab387">&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;</tspan><tspan fill="#fab387">FFF</tspan><tspan fill="#fab387">
-</tspan></text><text class="text-mono" x="0" y="8.800000em"><tspan fill="#fab387"></tspan><tspan fill="#fab387">Testing</tspan><tspan fill="#fab387">&#160;</tspan><tspan fill="#fab387">007</tspan><tspan fill="#cdd6f4">:</tspan><tspan fill="#fab387">&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;</tspan><tspan fill="#fab387">GGG</tspan><tspan fill="#fab387">
-</tspan></text><text class="text-mono" x="0" y="10.100000em"><tspan fill="#fab387"></tspan><tspan fill="#fab387">Testing</tspan><tspan fill="#fab387">&#160;</tspan><tspan fill="#fab387">00</tspan><tspan fill="#fab387">8</tspan><tspan fill="#cdd6f4">:</tspan><tspan fill="#fab387">&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;</tspan><tspan fill="#fab387">HHH</tspan><tspan fill="#fab387">
-</tspan></text><text class="text-mono" x="0" y="11.400000em"><tspan fill="#fab387"></tspan><tspan fill="#fab387">Testing</tspan><tspan fill="#fab387">&#160;</tspan><tspan fill="#fab387">00</tspan><tspan fill="#fab387">9</tspan><tspan fill="#cdd6f4">:</tspan><tspan fill="#fab387">&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;</tspan><tspan fill="#fab387">III</tspan><tspan fill="#fab387">
-</tspan></text><text class="text-mono" x="0" y="12.700000em"><tspan fill="#fab387"></tspan><tspan fill="#fab387">Testing</tspan><tspan fill="#fab387">&#160;</tspan><tspan fill="#fab387">010</tspan><tspan fill="#cdd6f4">:</tspan><tspan fill="#fab387">&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;</tspan><tspan fill="#fab387">JJJ</tspan><tspan fill="#fab387">
-</tspan></text><text class="text-mono" x="0" y="14.000000em"><tspan fill="#fab387"></tspan><tspan fill="#fab387">Testing</tspan><tspan fill="#fab387">&#160;</tspan><tspan fill="#fab387">011</tspan><tspan fill="#cdd6f4">:</tspan><tspan fill="#fab387">&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;</tspan><tspan fill="#fab387">KKK</tspan><tspan fill="#fab387">
-</tspan></text><text class="text-mono" x="0" y="15.300000em"><tspan fill="#fab387"></tspan><tspan fill="#fab387">Testing</tspan><tspan fill="#fab387">&#160;</tspan><tspan fill="#fab387">012</tspan><tspan fill="#cdd6f4">:</tspan><tspan fill="#fab387">&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;</tspan><tspan fill="#fab387">LLL</tspan><tspan fill="#fab387">
-</tspan></text><text class="text-mono" x="0" y="16.600000em"><tspan fill="#fab387"></tspan><tspan fill="#fab387">Testing</tspan><tspan fill="#fab387">&#160;</tspan><tspan fill="#fab387">013</tspan><tspan fill="#cdd6f4">:</tspan><tspan fill="#fab387">&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;</tspan><tspan fill="#fab387">MMM</tspan><tspan fill="#fab387">
-</tspan></text><text class="text-mono" x="0" y="17.900000em"><tspan fill="#fab387"></tspan><tspan fill="#fab387">Testing</tspan><tspan fill="#fab387">&#160;</tspan><tspan fill="#fab387">014</tspan><tspan fill="#cdd6f4">:</tspan><tspan fill="#fab387">&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;</tspan><tspan fill="#fab387">NNN</tspan><tspan fill="#fab387">
-</tspan></text><text class="text-mono" x="0" y="19.200000em"><tspan fill="#fab387"></tspan><tspan fill="#fab387">Testing</tspan><tspan fill="#fab387">&#160;</tspan><tspan fill="#fab387">015</tspan><tspan fill="#cdd6f4">:</tspan><tspan fill="#fab387">&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;</tspan><tspan fill="#fab387">OOO</tspan></text></g></g></g><g id="(Data -- y)[0]"><path d="M 136.000000 461.500000 L 136.000000 521.000000" fill="none" class="connection stroke-B1" style="stroke-width:2;" mask="url(#d2-3010012946)" /></g><g id="(x -- Data)[0]"><path d="M 136.000000 80.000000 L 136.000000 139.500000" fill="none" class="connection stroke-B1" style="stroke-width:2;" mask="url(#d2-3010012946)" /></g><mask id="d2-3010012946" maskUnits="userSpaceOnUse" x="4" y="11" width="264" height="579">
-=======
-</text><text class="text-mono" x="0" y="19.200000em">Testing&#160;<tspan fill="#009999">015</tspan>:&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;OOO</text></g></g><g transform="translate(62.000000 198.000000)" class="dark-code" style="font-size:10"><rect width="148.000000" height="205.000000" class="shape stroke-N1" style="fill:#1e1e2e;stroke-width:2;" /><g transform="translate(5.000000 5.000000)"><text class="text-mono" x="0" y="1.000000em"><tspan fill="#fab387">Testing</tspan><tspan fill="#fab387">&#160;</tspan><tspan fill="#fab387">001</tspan><tspan fill="#cdd6f4">:</tspan><tspan fill="#fab387">&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;</tspan><tspan fill="#fab387">AAA</tspan><tspan fill="#fab387">
-</tspan></text><text class="text-mono" x="0" y="2.300000em"><tspan fill="#fab387"></tspan><tspan fill="#fab387">Testing</tspan><tspan fill="#fab387">&#160;</tspan><tspan fill="#fab387">002</tspan><tspan fill="#cdd6f4">:</tspan><tspan fill="#fab387">&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;</tspan><tspan fill="#fab387">BBB</tspan><tspan fill="#fab387">
-</tspan></text><text class="text-mono" x="0" y="3.600000em"><tspan fill="#fab387"></tspan><tspan fill="#fab387">Testing</tspan><tspan fill="#fab387">&#160;</tspan><tspan fill="#fab387">003</tspan><tspan fill="#cdd6f4">:</tspan><tspan fill="#fab387">&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;</tspan><tspan fill="#fab387">CCC</tspan><tspan fill="#fab387">
-</tspan></text><text class="text-mono" x="0" y="4.900000em"><tspan fill="#fab387"></tspan><tspan fill="#fab387">Testing</tspan><tspan fill="#fab387">&#160;</tspan><tspan fill="#fab387">004</tspan><tspan fill="#cdd6f4">:</tspan><tspan fill="#fab387">&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;</tspan><tspan fill="#fab387">DDD</tspan><tspan fill="#fab387">
-</tspan></text><text class="text-mono" x="0" y="6.200000em"><tspan fill="#fab387"></tspan><tspan fill="#fab387">Testing</tspan><tspan fill="#fab387">&#160;</tspan><tspan fill="#fab387">005</tspan><tspan fill="#cdd6f4">:</tspan><tspan fill="#fab387">&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;</tspan><tspan fill="#fab387">EEE</tspan><tspan fill="#fab387">
-</tspan></text><text class="text-mono" x="0" y="7.500000em"><tspan fill="#fab387"></tspan><tspan fill="#fab387">Testing</tspan><tspan fill="#fab387">&#160;</tspan><tspan fill="#fab387">006</tspan><tspan fill="#cdd6f4">:</tspan><tspan fill="#fab387">&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;</tspan><tspan fill="#fab387">FFF</tspan><tspan fill="#fab387">
-</tspan></text><text class="text-mono" x="0" y="8.800000em"><tspan fill="#fab387"></tspan><tspan fill="#fab387">Testing</tspan><tspan fill="#fab387">&#160;</tspan><tspan fill="#fab387">007</tspan><tspan fill="#cdd6f4">:</tspan><tspan fill="#fab387">&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;</tspan><tspan fill="#fab387">GGG</tspan><tspan fill="#fab387">
-</tspan></text><text class="text-mono" x="0" y="10.100000em"><tspan fill="#fab387"></tspan><tspan fill="#fab387">Testing</tspan><tspan fill="#fab387">&#160;</tspan><tspan fill="#fab387">00</tspan><tspan fill="#fab387">8</tspan><tspan fill="#cdd6f4">:</tspan><tspan fill="#fab387">&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;</tspan><tspan fill="#fab387">HHH</tspan><tspan fill="#fab387">
-</tspan></text><text class="text-mono" x="0" y="11.400000em"><tspan fill="#fab387"></tspan><tspan fill="#fab387">Testing</tspan><tspan fill="#fab387">&#160;</tspan><tspan fill="#fab387">00</tspan><tspan fill="#fab387">9</tspan><tspan fill="#cdd6f4">:</tspan><tspan fill="#fab387">&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;</tspan><tspan fill="#fab387">III</tspan><tspan fill="#fab387">
-</tspan></text><text class="text-mono" x="0" y="12.700000em"><tspan fill="#fab387"></tspan><tspan fill="#fab387">Testing</tspan><tspan fill="#fab387">&#160;</tspan><tspan fill="#fab387">010</tspan><tspan fill="#cdd6f4">:</tspan><tspan fill="#fab387">&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;</tspan><tspan fill="#fab387">JJJ</tspan><tspan fill="#fab387">
-</tspan></text><text class="text-mono" x="0" y="14.000000em"><tspan fill="#fab387"></tspan><tspan fill="#fab387">Testing</tspan><tspan fill="#fab387">&#160;</tspan><tspan fill="#fab387">011</tspan><tspan fill="#cdd6f4">:</tspan><tspan fill="#fab387">&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;</tspan><tspan fill="#fab387">KKK</tspan><tspan fill="#fab387">
-</tspan></text><text class="text-mono" x="0" y="15.300000em"><tspan fill="#fab387"></tspan><tspan fill="#fab387">Testing</tspan><tspan fill="#fab387">&#160;</tspan><tspan fill="#fab387">012</tspan><tspan fill="#cdd6f4">:</tspan><tspan fill="#fab387">&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;</tspan><tspan fill="#fab387">LLL</tspan><tspan fill="#fab387">
-</tspan></text><text class="text-mono" x="0" y="16.600000em"><tspan fill="#fab387"></tspan><tspan fill="#fab387">Testing</tspan><tspan fill="#fab387">&#160;</tspan><tspan fill="#fab387">013</tspan><tspan fill="#cdd6f4">:</tspan><tspan fill="#fab387">&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;</tspan><tspan fill="#fab387">MMM</tspan><tspan fill="#fab387">
-</tspan></text><text class="text-mono" x="0" y="17.900000em"><tspan fill="#fab387"></tspan><tspan fill="#fab387">Testing</tspan><tspan fill="#fab387">&#160;</tspan><tspan fill="#fab387">014</tspan><tspan fill="#cdd6f4">:</tspan><tspan fill="#fab387">&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;</tspan><tspan fill="#fab387">NNN</tspan><tspan fill="#fab387">
-</tspan></text><text class="text-mono" x="0" y="19.200000em"><tspan fill="#fab387"></tspan><tspan fill="#fab387">Testing</tspan><tspan fill="#fab387">&#160;</tspan><tspan fill="#fab387">015</tspan><tspan fill="#cdd6f4">:</tspan><tspan fill="#fab387">&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;</tspan><tspan fill="#fab387">OOO</tspan></text></g></g></g><g id="(Data -- y)[0]"><path d="M 136.000000 461.500000 L 136.000000 521.000000" fill="none" class="connection stroke-B1" style="stroke-width:2;" mask="url(#d2-119284118)" /></g><g id="(x -- Data)[0]"><path d="M 136.000000 80.000000 L 136.000000 139.500000" fill="none" class="connection stroke-B1" style="stroke-width:2;" mask="url(#d2-119284118)" /></g><mask id="d2-119284118" maskUnits="userSpaceOnUse" x="4" y="11" width="264" height="579">
->>>>>>> 33280fed5 (fixed e2e tests)
 <rect x="4" y="11" width="264" height="579" fill="white"></rect>
 <rect x="110.000000" y="153.000000" width="52" height="36" fill="rgba(0,0,0,0.75)"></rect>
 <rect x="131.500000" y="545.500000" width="9" height="21" fill="rgba(0,0,0,0.75)"></rect>

e2etests/testdata/regression/dagre_child_id_id/dagre/sketch.exp.svg

@@ -1,22 +1,6 @@
-<<<<<<< HEAD
+<?xml version="1.0" encoding="utf-8"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" d2Version="v0.6.8-HEAD" preserveAspectRatio="xMinYMin meet" viewBox="0 0 639 239"><svg id="d2-svg" class="d2-966517206" width="639" height="239" viewBox="-1 35 639 239"><rect x="-1.000000" y="35.000000" width="639.000000" height="239.000000" rx="0.000000" fill="#FFFFFF" class=" fill-N7" stroke-width="0" /><style type="text/css"><![CDATA[
-<<<<<<< HEAD
-<?xml version="1.0" encoding="utf-8"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" d2Version="v0.6.8-HEAD" preserveAspectRatio="xMinYMin meet" viewBox="0 0 639 239"><svg id="d2-svg" class="d2-4115810162" width="639" height="239" viewBox="-1 35 639 239"><rect x="-1.000000" y="35.000000" width="639.000000" height="239.000000" rx="0.000000" fill="#FFFFFF" class=" fill-N7" stroke-width="0" /><style type="text/css"><![CDATA[
-.d2-4115810162 .text {
-	font-family: "d2-4115810162-font-regular";
-||||||| parent of 33280fed5 (fixed e2e tests)
-<?xml version="1.0" encoding="utf-8"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" d2Version="v0.6.6-HEAD" preserveAspectRatio="xMinYMin meet" viewBox="0 0 639 239"><svg id="d2-svg" class="d2-4115810162" width="639" height="239" viewBox="-1 35 639 239"><rect x="-1.000000" y="35.000000" width="639.000000" height="239.000000" rx="0.000000" class=" fill-N7" stroke-width="0" /><style type="text/css"><![CDATA[
-.d2-4115810162 .text {
-	font-family: "d2-4115810162-font-regular";
-=======
-<?xml version="1.0" encoding="utf-8"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" d2Version="v0.6.5-HEAD" preserveAspectRatio="xMinYMin meet" viewBox="0 0 639 239"><svg id="d2-svg" class="d2-966517206" width="639" height="239" viewBox="-1 35 639 239"><rect x="-1.000000" y="35.000000" width="639.000000" height="239.000000" rx="0.000000" class=" fill-N7" stroke-width="0" /><style type="text/css"><![CDATA[
-||||||| parent of cb2f2823c (Fix changes)
-<?xml version="1.0" encoding="utf-8"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" d2Version="v0.6.5-HEAD" preserveAspectRatio="xMinYMin meet" viewBox="0 0 639 239"><svg id="d2-svg" class="d2-966517206" width="639" height="239" viewBox="-1 35 639 239"><rect x="-1.000000" y="35.000000" width="639.000000" height="239.000000" rx="0.000000" class=" fill-N7" stroke-width="0" /><style type="text/css"><![CDATA[
-=======
-<?xml version="1.0" encoding="utf-8"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" d2Version="v0.6.6-HEAD" preserveAspectRatio="xMinYMin meet" viewBox="0 0 639 239"><svg id="d2-svg" class="d2-966517206" width="639" height="239" viewBox="-1 35 639 239"><rect x="-1.000000" y="35.000000" width="639.000000" height="239.000000" rx="0.000000" class=" fill-N7" stroke-width="0" /><style type="text/css"><![CDATA[
->>>>>>> cb2f2823c (Fix changes)
 .d2-966517206 .text {
 	font-family: "d2-966517206-font-regular";
->>>>>>> 33280fed5 (fixed e2e tests)
 }
 @font-face {
 	font-family: d2-966517206-font-regular;
@@ -41,153 +25,6 @@
   opacity: 0.5;
 }
 
-<<<<<<< HEAD
-		.d2-4115810162 .fill-N1{fill:#0A0F25;}
-		.d2-4115810162 .fill-N2{fill:#676C7E;}
-		.d2-4115810162 .fill-N3{fill:#9499AB;}
-		.d2-4115810162 .fill-N4{fill:#CFD2DD;}
-		.d2-4115810162 .fill-N5{fill:#DEE1EB;}
-		.d2-4115810162 .fill-N6{fill:#EEF1F8;}
-		.d2-4115810162 .fill-N7{fill:#FFFFFF;}
-		.d2-4115810162 .fill-B1{fill:#0D32B2;}
-		.d2-4115810162 .fill-B2{fill:#0D32B2;}
-		.d2-4115810162 .fill-B3{fill:#E3E9FD;}
-		.d2-4115810162 .fill-B4{fill:#E3E9FD;}
-		.d2-4115810162 .fill-B5{fill:#EDF0FD;}
-		.d2-4115810162 .fill-B6{fill:#F7F8FE;}
-		.d2-4115810162 .fill-AA2{fill:#4A6FF3;}
-		.d2-4115810162 .fill-AA4{fill:#EDF0FD;}
-		.d2-4115810162 .fill-AA5{fill:#F7F8FE;}
-		.d2-4115810162 .fill-AB4{fill:#EDF0FD;}
-		.d2-4115810162 .fill-AB5{fill:#F7F8FE;}
-		.d2-4115810162 .stroke-N1{stroke:#0A0F25;}
-		.d2-4115810162 .stroke-N2{stroke:#676C7E;}
-		.d2-4115810162 .stroke-N3{stroke:#9499AB;}
-		.d2-4115810162 .stroke-N4{stroke:#CFD2DD;}
-		.d2-4115810162 .stroke-N5{stroke:#DEE1EB;}
-		.d2-4115810162 .stroke-N6{stroke:#EEF1F8;}
-		.d2-4115810162 .stroke-N7{stroke:#FFFFFF;}
-		.d2-4115810162 .stroke-B1{stroke:#0D32B2;}
-		.d2-4115810162 .stroke-B2{stroke:#0D32B2;}
-		.d2-4115810162 .stroke-B3{stroke:#E3E9FD;}
-		.d2-4115810162 .stroke-B4{stroke:#E3E9FD;}
-		.d2-4115810162 .stroke-B5{stroke:#EDF0FD;}
-		.d2-4115810162 .stroke-B6{stroke:#F7F8FE;}
-		.d2-4115810162 .stroke-AA2{stroke:#4A6FF3;}
-		.d2-4115810162 .stroke-AA4{stroke:#EDF0FD;}
-		.d2-4115810162 .stroke-AA5{stroke:#F7F8FE;}
-		.d2-4115810162 .stroke-AB4{stroke:#EDF0FD;}
-		.d2-4115810162 .stroke-AB5{stroke:#F7F8FE;}
-		.d2-4115810162 .background-color-N1{background-color:#0A0F25;}
-		.d2-4115810162 .background-color-N2{background-color:#676C7E;}
-		.d2-4115810162 .background-color-N3{background-color:#9499AB;}
-		.d2-4115810162 .background-color-N4{background-color:#CFD2DD;}
-		.d2-4115810162 .background-color-N5{background-color:#DEE1EB;}
-		.d2-4115810162 .background-color-N6{background-color:#EEF1F8;}
-		.d2-4115810162 .background-color-N7{background-color:#FFFFFF;}
-		.d2-4115810162 .background-color-B1{background-color:#0D32B2;}
-		.d2-4115810162 .background-color-B2{background-color:#0D32B2;}
-		.d2-4115810162 .background-color-B3{background-color:#E3E9FD;}
-		.d2-4115810162 .background-color-B4{background-color:#E3E9FD;}
-		.d2-4115810162 .background-color-B5{background-color:#EDF0FD;}
-		.d2-4115810162 .background-color-B6{background-color:#F7F8FE;}
-		.d2-4115810162 .background-color-AA2{background-color:#4A6FF3;}
-		.d2-4115810162 .background-color-AA4{background-color:#EDF0FD;}
-		.d2-4115810162 .background-color-AA5{background-color:#F7F8FE;}
-		.d2-4115810162 .background-color-AB4{background-color:#EDF0FD;}
-		.d2-4115810162 .background-color-AB5{background-color:#F7F8FE;}
-		.d2-4115810162 .color-N1{color:#0A0F25;}
-		.d2-4115810162 .color-N2{color:#676C7E;}
-		.d2-4115810162 .color-N3{color:#9499AB;}
-		.d2-4115810162 .color-N4{color:#CFD2DD;}
-		.d2-4115810162 .color-N5{color:#DEE1EB;}
-		.d2-4115810162 .color-N6{color:#EEF1F8;}
-		.d2-4115810162 .color-N7{color:#FFFFFF;}
-		.d2-4115810162 .color-B1{color:#0D32B2;}
-		.d2-4115810162 .color-B2{color:#0D32B2;}
-		.d2-4115810162 .color-B3{color:#E3E9FD;}
-		.d2-4115810162 .color-B4{color:#E3E9FD;}
-		.d2-4115810162 .color-B5{color:#EDF0FD;}
-		.d2-4115810162 .color-B6{color:#F7F8FE;}
-		.d2-4115810162 .color-AA2{color:#4A6FF3;}
-		.d2-4115810162 .color-AA4{color:#EDF0FD;}
-		.d2-4115810162 .color-AA5{color:#F7F8FE;}
-		.d2-4115810162 .color-AB4{color:#EDF0FD;}
-		.d2-4115810162 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]></style><g id="id"><g class="shape" ><rect x="0.000000" y="147.000000" width="59.000000" height="66.000000" stroke="#0D32B2" fill="#F7F8FE" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="29.500000" y="185.500000" fill="#0A0F25" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">id</text></g><g id="x"><g class="shape" ><rect x="179.000000" y="117.000000" width="119.000000" height="126.000000" stroke="#0D32B2" fill="#E3E9FD" class=" stroke-B1 fill-B4" style="stroke-width:2;" /></g><text x="238.500000" y="104.000000" fill="#0A0F25" class="text fill-N1" style="text-anchor:middle;font-size:28px">x</text></g><g id="y"><g class="shape" ><rect x="458.000000" y="76.000000" width="179.000000" height="197.000000" stroke="#0D32B2" fill="#E3E9FD" class=" stroke-B1 fill-B4" style="stroke-width:2;" /></g><text x="547.500000" y="63.000000" fill="#0A0F25" class="text fill-N1" style="text-anchor:middle;font-size:28px">y</text></g><g id="x.id"><g class="shape" ><rect x="209.000000" y="147.000000" width="59.000000" height="66.000000" stroke="#0D32B2" fill="#EDF0FD" class=" stroke-B1 fill-B5" style="stroke-width:2;" /></g><text x="238.500000" y="185.500000" fill="#0A0F25" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">id</text></g><g id="y.z"><g class="shape" ><rect x="488.000000" y="117.000000" width="119.000000" height="126.000000" stroke="#0D32B2" fill="#EDF0FD" class=" stroke-B1 fill-B5" style="stroke-width:2;" /></g><text x="547.500000" y="105.000000" fill="#0A0F25" class="text fill-N1" style="text-anchor:middle;font-size:24px">z</text></g><g id="y.z.id"><g class="shape" ><rect x="518.000000" y="147.000000" width="59.000000" height="66.000000" stroke="#0D32B2" fill="#F7F8FE" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="547.500000" y="185.500000" fill="#0A0F25" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">id</text></g><g id="(id -&gt; x.id)[0]"><marker id="mk-3488378134" markerWidth="10.000000" markerHeight="12.000000" refX="7.000000" refY="6.000000" viewBox="0.000000 0.000000 10.000000 12.000000" orient="auto" markerUnits="userSpaceOnUse"> <polygon points="0.000000,0.000000 10.000000,6.000000 0.000000,12.000000" fill="#0D32B2" class="connection fill-B1" stroke-width="2" /> </marker><path d="M 61.000000 180.000000 C 99.000000 180.000000 169.000000 180.000000 205.000000 180.000000" stroke="#0D32B2" fill="none" class="connection stroke-B1" style="stroke-width:2;" marker-end="url(#mk-3488378134)" mask="url(#d2-4115810162)" /></g><g id="(x.id -&gt; y.z.id)[0]"><path d="M 270.000000 180.000000 C 308.000000 180.000000 328.000000 180.000000 343.000000 180.000000 C 358.000000 180.000000 378.000000 180.000000 393.000000 180.000000 C 408.000000 180.000000 478.000000 180.000000 514.000000 180.000000" stroke="#0D32B2" fill="none" class="connection stroke-B1" style="stroke-width:2;" marker-end="url(#mk-3488378134)" mask="url(#d2-4115810162)" /></g><mask id="d2-4115810162" maskUnits="userSpaceOnUse" x="-1" y="35" width="639" height="239">
-||||||| parent of 33280fed5 (fixed e2e tests)
-		.d2-4115810162 .fill-N1{fill:#0A0F25;}
-		.d2-4115810162 .fill-N2{fill:#676C7E;}
-		.d2-4115810162 .fill-N3{fill:#9499AB;}
-		.d2-4115810162 .fill-N4{fill:#CFD2DD;}
-		.d2-4115810162 .fill-N5{fill:#DEE1EB;}
-		.d2-4115810162 .fill-N6{fill:#EEF1F8;}
-		.d2-4115810162 .fill-N7{fill:#FFFFFF;}
-		.d2-4115810162 .fill-B1{fill:#0D32B2;}
-		.d2-4115810162 .fill-B2{fill:#0D32B2;}
-		.d2-4115810162 .fill-B3{fill:#E3E9FD;}
-		.d2-4115810162 .fill-B4{fill:#E3E9FD;}
-		.d2-4115810162 .fill-B5{fill:#EDF0FD;}
-		.d2-4115810162 .fill-B6{fill:#F7F8FE;}
-		.d2-4115810162 .fill-AA2{fill:#4A6FF3;}
-		.d2-4115810162 .fill-AA4{fill:#EDF0FD;}
-		.d2-4115810162 .fill-AA5{fill:#F7F8FE;}
-		.d2-4115810162 .fill-AB4{fill:#EDF0FD;}
-		.d2-4115810162 .fill-AB5{fill:#F7F8FE;}
-		.d2-4115810162 .stroke-N1{stroke:#0A0F25;}
-		.d2-4115810162 .stroke-N2{stroke:#676C7E;}
-		.d2-4115810162 .stroke-N3{stroke:#9499AB;}
-		.d2-4115810162 .stroke-N4{stroke:#CFD2DD;}
-		.d2-4115810162 .stroke-N5{stroke:#DEE1EB;}
-		.d2-4115810162 .stroke-N6{stroke:#EEF1F8;}
-		.d2-4115810162 .stroke-N7{stroke:#FFFFFF;}
-		.d2-4115810162 .stroke-B1{stroke:#0D32B2;}
-		.d2-4115810162 .stroke-B2{stroke:#0D32B2;}
-		.d2-4115810162 .stroke-B3{stroke:#E3E9FD;}
-		.d2-4115810162 .stroke-B4{stroke:#E3E9FD;}
-		.d2-4115810162 .stroke-B5{stroke:#EDF0FD;}
-		.d2-4115810162 .stroke-B6{stroke:#F7F8FE;}
-		.d2-4115810162 .stroke-AA2{stroke:#4A6FF3;}
-		.d2-4115810162 .stroke-AA4{stroke:#EDF0FD;}
-		.d2-4115810162 .stroke-AA5{stroke:#F7F8FE;}
-		.d2-4115810162 .stroke-AB4{stroke:#EDF0FD;}
-		.d2-4115810162 .stroke-AB5{stroke:#F7F8FE;}
-		.d2-4115810162 .background-color-N1{background-color:#0A0F25;}
-		.d2-4115810162 .background-color-N2{background-color:#676C7E;}
-		.d2-4115810162 .background-color-N3{background-color:#9499AB;}
-		.d2-4115810162 .background-color-N4{background-color:#CFD2DD;}
-		.d2-4115810162 .background-color-N5{background-color:#DEE1EB;}
-		.d2-4115810162 .background-color-N6{background-color:#EEF1F8;}
-		.d2-4115810162 .background-color-N7{background-color:#FFFFFF;}
-		.d2-4115810162 .background-color-B1{background-color:#0D32B2;}
-		.d2-4115810162 .background-color-B2{background-color:#0D32B2;}
-		.d2-4115810162 .background-color-B3{background-color:#E3E9FD;}
-		.d2-4115810162 .background-color-B4{background-color:#E3E9FD;}
-		.d2-4115810162 .background-color-B5{background-color:#EDF0FD;}
-		.d2-4115810162 .background-color-B6{background-color:#F7F8FE;}
-		.d2-4115810162 .background-color-AA2{background-color:#4A6FF3;}
-		.d2-4115810162 .background-color-AA4{background-color:#EDF0FD;}
-		.d2-4115810162 .background-color-AA5{background-color:#F7F8FE;}
-		.d2-4115810162 .background-color-AB4{background-color:#EDF0FD;}
-		.d2-4115810162 .background-color-AB5{background-color:#F7F8FE;}
-		.d2-4115810162 .color-N1{color:#0A0F25;}
-		.d2-4115810162 .color-N2{color:#676C7E;}
-		.d2-4115810162 .color-N3{color:#9499AB;}
-		.d2-4115810162 .color-N4{color:#CFD2DD;}
-		.d2-4115810162 .color-N5{color:#DEE1EB;}
-		.d2-4115810162 .color-N6{color:#EEF1F8;}
-		.d2-4115810162 .color-N7{color:#FFFFFF;}
-		.d2-4115810162 .color-B1{color:#0D32B2;}
-		.d2-4115810162 .color-B2{color:#0D32B2;}
-		.d2-4115810162 .color-B3{color:#E3E9FD;}
-		.d2-4115810162 .color-B4{color:#E3E9FD;}
-		.d2-4115810162 .color-B5{color:#EDF0FD;}
-		.d2-4115810162 .color-B6{color:#F7F8FE;}
-		.d2-4115810162 .color-AA2{color:#4A6FF3;}
-		.d2-4115810162 .color-AA4{color:#EDF0FD;}
-		.d2-4115810162 .color-AA5{color:#F7F8FE;}
-		.d2-4115810162 .color-AB4{color:#EDF0FD;}
-		.d2-4115810162 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]></style><g id="id"><g class="shape" ><rect x="0.000000" y="147.000000" width="59.000000" height="66.000000" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="29.500000" y="185.500000" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">id</text></g><g id="x"><g class="shape" ><rect x="179.000000" y="117.000000" width="119.000000" height="126.000000" class=" stroke-B1 fill-B4" style="stroke-width:2;" /></g><text x="238.500000" y="104.000000" class="text fill-N1" style="text-anchor:middle;font-size:28px">x</text></g><g id="y"><g class="shape" ><rect x="458.000000" y="76.000000" width="179.000000" height="197.000000" class=" stroke-B1 fill-B4" style="stroke-width:2;" /></g><text x="547.500000" y="63.000000" class="text fill-N1" style="text-anchor:middle;font-size:28px">y</text></g><g id="x.id"><g class="shape" ><rect x="209.000000" y="147.000000" width="59.000000" height="66.000000" class=" stroke-B1 fill-B5" style="stroke-width:2;" /></g><text x="238.500000" y="185.500000" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">id</text></g><g id="y.z"><g class="shape" ><rect x="488.000000" y="117.000000" width="119.000000" height="126.000000" class=" stroke-B1 fill-B5" style="stroke-width:2;" /></g><text x="547.500000" y="105.000000" class="text fill-N1" style="text-anchor:middle;font-size:24px">z</text></g><g id="y.z.id"><g class="shape" ><rect x="518.000000" y="147.000000" width="59.000000" height="66.000000" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="547.500000" y="185.500000" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">id</text></g><g id="(id -&gt; x.id)[0]"><marker id="mk-3488378134" markerWidth="10.000000" markerHeight="12.000000" refX="7.000000" refY="6.000000" viewBox="0.000000 0.000000 10.000000 12.000000" orient="auto" markerUnits="userSpaceOnUse"> <polygon points="0.000000,0.000000 10.000000,6.000000 0.000000,12.000000" class="connection fill-B1" stroke-width="2" /> </marker><path d="M 61.000000 180.000000 C 99.000000 180.000000 169.000000 180.000000 205.000000 180.000000" fill="none" class="connection stroke-B1" style="stroke-width:2;" marker-end="url(#mk-3488378134)" mask="url(#d2-4115810162)" /></g><g id="(x.id -&gt; y.z.id)[0]"><path d="M 270.000000 180.000000 C 308.000000 180.000000 328.000000 180.000000 343.000000 180.000000 C 358.000000 180.000000 378.000000 180.000000 393.000000 180.000000 C 408.000000 180.000000 478.000000 180.000000 514.000000 180.000000" fill="none" class="connection stroke-B1" style="stroke-width:2;" marker-end="url(#mk-3488378134)" mask="url(#d2-4115810162)" /></g><mask id="d2-4115810162" maskUnits="userSpaceOnUse" x="-1" y="35" width="639" height="239">
-=======
 		.d2-966517206 .fill-N1{fill:#0A0F25;}
 		.d2-966517206 .fill-N2{fill:#676C7E;}
 		.d2-966517206 .fill-N3{fill:#9499AB;}
@@ -259,8 +96,7 @@
 		.d2-966517206 .color-AA4{color:#EDF0FD;}
 		.d2-966517206 .color-AA5{color:#F7F8FE;}
 		.d2-966517206 .color-AB4{color:#EDF0FD;}
-		.d2-966517206 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]></style><g id="id"><g class="shape" ><rect x="0.000000" y="147.000000" width="59.000000" height="66.000000" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="29.500000" y="185.500000" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">id</text></g><g id="x"><g class="shape" ><rect x="179.000000" y="117.000000" width="119.000000" height="126.000000" class=" stroke-B1 fill-B4" style="stroke-width:2;" /></g><text x="238.500000" y="104.000000" class="text fill-N1" style="text-anchor:middle;font-size:28px">x</text></g><g id="y"><g class="shape" ><rect x="458.000000" y="76.000000" width="179.000000" height="197.000000" class=" stroke-B1 fill-B4" style="stroke-width:2;" /></g><text x="547.500000" y="63.000000" class="text fill-N1" style="text-anchor:middle;font-size:28px">y</text></g><g id="x.id"><g class="shape" ><rect x="209.000000" y="147.000000" width="59.000000" height="66.000000" class=" stroke-B1 fill-B5" style="stroke-width:2;" /></g><text x="238.500000" y="185.500000" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">id</text></g><g id="y.z"><g class="shape" ><rect x="488.000000" y="117.000000" width="119.000000" height="126.000000" class=" stroke-B1 fill-B5" style="stroke-width:2;" /></g><text x="547.500000" y="105.000000" class="text fill-N1" style="text-anchor:middle;font-size:24px">z</text></g><g id="y.z.id"><g class="shape" ><rect x="518.000000" y="147.000000" width="59.000000" height="66.000000" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="547.500000" y="185.500000" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">id</text></g><g id="(id -&gt; x.id)[0]"><marker id="mk-3488378134" markerWidth="10.000000" markerHeight="12.000000" refX="7.000000" refY="6.000000" viewBox="0.000000 0.000000 10.000000 12.000000" orient="auto" markerUnits="userSpaceOnUse"> <polygon points="0.000000,0.000000 10.000000,6.000000 0.000000,12.000000" class="connection fill-B1" stroke-width="2" /> </marker><path d="M 61.000000 180.000000 C 99.000000 180.000000 169.000000 180.000000 205.000000 180.000000" fill="none" class="connection stroke-B1" style="stroke-width:2;" marker-end="url(#mk-3488378134)" mask="url(#d2-966517206)" /></g><g id="(x.id -&gt; y.z.id)[0]"><path d="M 270.000000 180.000000 C 308.000000 180.000000 328.000000 180.000000 343.000000 180.000000 C 358.000000 180.000000 378.000000 180.000000 393.000000 180.000000 C 408.000000 180.000000 478.000000 180.000000 514.000000 180.000000" fill="none" class="connection stroke-B1" style="stroke-width:2;" marker-end="url(#mk-3488378134)" mask="url(#d2-966517206)" /></g><mask id="d2-966517206" maskUnits="userSpaceOnUse" x="-1" y="35" width="639" height="239">
+		.d2-966517206 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]></style><g id="id"><g class="shape" ><rect x="0.000000" y="147.000000" width="59.000000" height="66.000000" stroke="#0D32B2" fill="#F7F8FE" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="29.500000" y="185.500000" fill="#0A0F25" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">id</text></g><g id="x"><g class="shape" ><rect x="179.000000" y="117.000000" width="119.000000" height="126.000000" stroke="#0D32B2" fill="#E3E9FD" class=" stroke-B1 fill-B4" style="stroke-width:2;" /></g><text x="238.500000" y="104.000000" fill="#0A0F25" class="text fill-N1" style="text-anchor:middle;font-size:28px">x</text></g><g id="y"><g class="shape" ><rect x="458.000000" y="76.000000" width="179.000000" height="197.000000" stroke="#0D32B2" fill="#E3E9FD" class=" stroke-B1 fill-B4" style="stroke-width:2;" /></g><text x="547.500000" y="63.000000" fill="#0A0F25" class="text fill-N1" style="text-anchor:middle;font-size:28px">y</text></g><g id="x.id"><g class="shape" ><rect x="209.000000" y="147.000000" width="59.000000" height="66.000000" stroke="#0D32B2" fill="#EDF0FD" class=" stroke-B1 fill-B5" style="stroke-width:2;" /></g><text x="238.500000" y="185.500000" fill="#0A0F25" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">id</text></g><g id="y.z"><g class="shape" ><rect x="488.000000" y="117.000000" width="119.000000" height="126.000000" stroke="#0D32B2" fill="#EDF0FD" class=" stroke-B1 fill-B5" style="stroke-width:2;" /></g><text x="547.500000" y="105.000000" fill="#0A0F25" class="text fill-N1" style="text-anchor:middle;font-size:24px">z</text></g><g id="y.z.id"><g class="shape" ><rect x="518.000000" y="147.000000" width="59.000000" height="66.000000" stroke="#0D32B2" fill="#F7F8FE" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="547.500000" y="185.500000" fill="#0A0F25" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">id</text></g><g id="(id -&gt; x.id)[0]"><marker id="mk-3488378134" markerWidth="10.000000" markerHeight="12.000000" refX="7.000000" refY="6.000000" viewBox="0.000000 0.000000 10.000000 12.000000" orient="auto" markerUnits="userSpaceOnUse"> <polygon points="0.000000,0.000000 10.000000,6.000000 0.000000,12.000000" fill="#0D32B2" class="connection fill-B1" stroke-width="2" /> </marker><path d="M 61.000000 180.000000 C 99.000000 180.000000 169.000000 180.000000 205.000000 180.000000" stroke="#0D32B2" fill="none" class="connection stroke-B1" style="stroke-width:2;" marker-end="url(#mk-3488378134)" mask="url(#d2-966517206)" /></g><g id="(x.id -&gt; y.z.id)[0]"><path d="M 270.000000 180.000000 C 308.000000 180.000000 328.000000 180.000000 343.000000 180.000000 C 358.000000 180.000000 378.000000 180.000000 393.000000 180.000000 C 408.000000 180.000000 478.000000 180.000000 514.000000 180.000000" stroke="#0D32B2" fill="none" class="connection stroke-B1" style="stroke-width:2;" marker-end="url(#mk-3488378134)" mask="url(#d2-966517206)" /></g><mask id="d2-966517206" maskUnits="userSpaceOnUse" x="-1" y="35" width="639" height="239">
->>>>>>> 33280fed5 (fixed e2e tests)
 <rect x="-1" y="35" width="639" height="239" fill="white"></rect>
 <rect x="22.500000" y="169.500000" width="14" height="21" fill="rgba(0,0,0,0.75)"></rect>
 <rect x="232.000000" y="76.000000" width="13" height="36" fill="rgba(0,0,0,0.75)"></rect>

e2etests/testdata/regression/dagre_child_id_id/elk/sketch.exp.svg

@@ -1,22 +1,6 @@
-<<<<<<< HEAD
+<?xml version="1.0" encoding="utf-8"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" d2Version="v0.6.8-HEAD" preserveAspectRatio="xMinYMin meet" viewBox="0 0 639 268"><svg id="d2-svg" class="d2-1783928571" width="639" height="268" viewBox="11 11 639 268"><rect x="11.000000" y="11.000000" width="639.000000" height="268.000000" rx="0.000000" fill="#FFFFFF" class=" fill-N7" stroke-width="0" /><style type="text/css"><![CDATA[
-<<<<<<< HEAD
-<?xml version="1.0" encoding="utf-8"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" d2Version="v0.6.8-HEAD" preserveAspectRatio="xMinYMin meet" viewBox="0 0 639 268"><svg id="d2-svg" class="d2-1613854675" width="639" height="268" viewBox="11 11 639 268"><rect x="11.000000" y="11.000000" width="639.000000" height="268.000000" rx="0.000000" fill="#FFFFFF" class=" fill-N7" stroke-width="0" /><style type="text/css"><![CDATA[
-.d2-1613854675 .text {
-	font-family: "d2-1613854675-font-regular";
-||||||| parent of 33280fed5 (fixed e2e tests)
-<?xml version="1.0" encoding="utf-8"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" d2Version="v0.6.6-HEAD" preserveAspectRatio="xMinYMin meet" viewBox="0 0 639 268"><svg id="d2-svg" class="d2-1613854675" width="639" height="268" viewBox="11 11 639 268"><rect x="11.000000" y="11.000000" width="639.000000" height="268.000000" rx="0.000000" class=" fill-N7" stroke-width="0" /><style type="text/css"><![CDATA[
-.d2-1613854675 .text {
-	font-family: "d2-1613854675-font-regular";
-=======
-<?xml version="1.0" encoding="utf-8"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" d2Version="v0.6.5-HEAD" preserveAspectRatio="xMinYMin meet" viewBox="0 0 639 268"><svg id="d2-svg" class="d2-1783928571" width="639" height="268" viewBox="11 11 639 268"><rect x="11.000000" y="11.000000" width="639.000000" height="268.000000" rx="0.000000" class=" fill-N7" stroke-width="0" /><style type="text/css"><![CDATA[
-||||||| parent of cb2f2823c (Fix changes)
-<?xml version="1.0" encoding="utf-8"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" d2Version="v0.6.5-HEAD" preserveAspectRatio="xMinYMin meet" viewBox="0 0 639 268"><svg id="d2-svg" class="d2-1783928571" width="639" height="268" viewBox="11 11 639 268"><rect x="11.000000" y="11.000000" width="639.000000" height="268.000000" rx="0.000000" class=" fill-N7" stroke-width="0" /><style type="text/css"><![CDATA[
-=======
-<?xml version="1.0" encoding="utf-8"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" d2Version="v0.6.6-HEAD" preserveAspectRatio="xMinYMin meet" viewBox="0 0 639 268"><svg id="d2-svg" class="d2-1783928571" width="639" height="268" viewBox="11 11 639 268"><rect x="11.000000" y="11.000000" width="639.000000" height="268.000000" rx="0.000000" class=" fill-N7" stroke-width="0" /><style type="text/css"><![CDATA[
->>>>>>> cb2f2823c (Fix changes)
 .d2-1783928571 .text {
 	font-family: "d2-1783928571-font-regular";
->>>>>>> 33280fed5 (fixed e2e tests)
 }
 @font-face {
 	font-family: d2-1783928571-font-regular;
@@ -41,153 +25,6 @@
   opacity: 0.5;
 }
 
-<<<<<<< HEAD
-		.d2-1613854675 .fill-N1{fill:#0A0F25;}
-		.d2-1613854675 .fill-N2{fill:#676C7E;}
-		.d2-1613854675 .fill-N3{fill:#9499AB;}
-		.d2-1613854675 .fill-N4{fill:#CFD2DD;}
-		.d2-1613854675 .fill-N5{fill:#DEE1EB;}
-		.d2-1613854675 .fill-N6{fill:#EEF1F8;}
-		.d2-1613854675 .fill-N7{fill:#FFFFFF;}
-		.d2-1613854675 .fill-B1{fill:#0D32B2;}
-		.d2-1613854675 .fill-B2{fill:#0D32B2;}
-		.d2-1613854675 .fill-B3{fill:#E3E9FD;}
-		.d2-1613854675 .fill-B4{fill:#E3E9FD;}
-		.d2-1613854675 .fill-B5{fill:#EDF0FD;}
-		.d2-1613854675 .fill-B6{fill:#F7F8FE;}
-		.d2-1613854675 .fill-AA2{fill:#4A6FF3;}
-		.d2-1613854675 .fill-AA4{fill:#EDF0FD;}
-		.d2-1613854675 .fill-AA5{fill:#F7F8FE;}
-		.d2-1613854675 .fill-AB4{fill:#EDF0FD;}
-		.d2-1613854675 .fill-AB5{fill:#F7F8FE;}
-		.d2-1613854675 .stroke-N1{stroke:#0A0F25;}
-		.d2-1613854675 .stroke-N2{stroke:#676C7E;}
-		.d2-1613854675 .stroke-N3{stroke:#9499AB;}
-		.d2-1613854675 .stroke-N4{stroke:#CFD2DD;}
-		.d2-1613854675 .stroke-N5{stroke:#DEE1EB;}
-		.d2-1613854675 .stroke-N6{stroke:#EEF1F8;}
-		.d2-1613854675 .stroke-N7{stroke:#FFFFFF;}
-		.d2-1613854675 .stroke-B1{stroke:#0D32B2;}
-		.d2-1613854675 .stroke-B2{stroke:#0D32B2;}
-		.d2-1613854675 .stroke-B3{stroke:#E3E9FD;}
-		.d2-1613854675 .stroke-B4{stroke:#E3E9FD;}
-		.d2-1613854675 .stroke-B5{stroke:#EDF0FD;}
-		.d2-1613854675 .stroke-B6{stroke:#F7F8FE;}
-		.d2-1613854675 .stroke-AA2{stroke:#4A6FF3;}
-		.d2-1613854675 .stroke-AA4{stroke:#EDF0FD;}
-		.d2-1613854675 .stroke-AA5{stroke:#F7F8FE;}
-		.d2-1613854675 .stroke-AB4{stroke:#EDF0FD;}
-		.d2-1613854675 .stroke-AB5{stroke:#F7F8FE;}
-		.d2-1613854675 .background-color-N1{background-color:#0A0F25;}
-		.d2-1613854675 .background-color-N2{background-color:#676C7E;}
-		.d2-1613854675 .background-color-N3{background-color:#9499AB;}
-		.d2-1613854675 .background-color-N4{background-color:#CFD2DD;}
-		.d2-1613854675 .background-color-N5{background-color:#DEE1EB;}
-		.d2-1613854675 .background-color-N6{background-color:#EEF1F8;}
-		.d2-1613854675 .background-color-N7{background-color:#FFFFFF;}
-		.d2-1613854675 .background-color-B1{background-color:#0D32B2;}
-		.d2-1613854675 .background-color-B2{background-color:#0D32B2;}
-		.d2-1613854675 .background-color-B3{background-color:#E3E9FD;}
-		.d2-1613854675 .background-color-B4{background-color:#E3E9FD;}
-		.d2-1613854675 .background-color-B5{background-color:#EDF0FD;}
-		.d2-1613854675 .background-color-B6{background-color:#F7F8FE;}
-		.d2-1613854675 .background-color-AA2{background-color:#4A6FF3;}
-		.d2-1613854675 .background-color-AA4{background-color:#EDF0FD;}
-		.d2-1613854675 .background-color-AA5{background-color:#F7F8FE;}
-		.d2-1613854675 .background-color-AB4{background-color:#EDF0FD;}
-		.d2-1613854675 .background-color-AB5{background-color:#F7F8FE;}
-		.d2-1613854675 .color-N1{color:#0A0F25;}
-		.d2-1613854675 .color-N2{color:#676C7E;}
-		.d2-1613854675 .color-N3{color:#9499AB;}
-		.d2-1613854675 .color-N4{color:#CFD2DD;}
-		.d2-1613854675 .color-N5{color:#DEE1EB;}
-		.d2-1613854675 .color-N6{color:#EEF1F8;}
-		.d2-1613854675 .color-N7{color:#FFFFFF;}
-		.d2-1613854675 .color-B1{color:#0D32B2;}
-		.d2-1613854675 .color-B2{color:#0D32B2;}
-		.d2-1613854675 .color-B3{color:#E3E9FD;}
-		.d2-1613854675 .color-B4{color:#E3E9FD;}
-		.d2-1613854675 .color-B5{color:#EDF0FD;}
-		.d2-1613854675 .color-B6{color:#F7F8FE;}
-		.d2-1613854675 .color-AA2{color:#4A6FF3;}
-		.d2-1613854675 .color-AA4{color:#EDF0FD;}
-		.d2-1613854675 .color-AA5{color:#F7F8FE;}
-		.d2-1613854675 .color-AB4{color:#EDF0FD;}
-		.d2-1613854675 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]></style><g id="id"><g class="shape" ><rect x="12.000000" y="112.000000" width="59.000000" height="66.000000" stroke="#0D32B2" fill="#F7F8FE" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="41.500000" y="150.500000" fill="#0A0F25" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">id</text></g><g id="x"><g class="shape" ><rect x="146.000000" y="62.000000" width="159.000000" height="166.000000" stroke="#0D32B2" fill="#E3E9FD" class=" stroke-B1 fill-B4" style="stroke-width:2;" /></g><text x="225.500000" y="95.000000" fill="#0A0F25" class="text fill-N1" style="text-anchor:middle;font-size:28px">x</text></g><g id="y"><g class="shape" ><rect x="385.000000" y="12.000000" width="264.000000" height="266.000000" stroke="#0D32B2" fill="#E3E9FD" class=" stroke-B1 fill-B4" style="stroke-width:2;" /></g><text x="517.000000" y="45.000000" fill="#0A0F25" class="text fill-N1" style="text-anchor:middle;font-size:28px">y</text></g><g id="x.id"><g class="shape" ><rect x="196.000000" y="112.000000" width="59.000000" height="66.000000" stroke="#0D32B2" fill="#EDF0FD" class=" stroke-B1 fill-B5" style="stroke-width:2;" /></g><text x="225.500000" y="150.500000" fill="#0A0F25" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">id</text></g><g id="y.z"><g class="shape" ><rect x="440.000000" y="62.000000" width="159.000000" height="166.000000" stroke="#0D32B2" fill="#EDF0FD" class=" stroke-B1 fill-B5" style="stroke-width:2;" /></g><text x="519.500000" y="91.000000" fill="#0A0F25" class="text fill-N1" style="text-anchor:middle;font-size:24px">z</text></g><g id="y.z.id"><g class="shape" ><rect x="490.000000" y="112.000000" width="59.000000" height="66.000000" stroke="#0D32B2" fill="#F7F8FE" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="519.500000" y="150.500000" fill="#0A0F25" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">id</text></g><g id="(id -&gt; x.id)[0]"><marker id="mk-3488378134" markerWidth="10.000000" markerHeight="12.000000" refX="7.000000" refY="6.000000" viewBox="0.000000 0.000000 10.000000 12.000000" orient="auto" markerUnits="userSpaceOnUse"> <polygon points="0.000000,0.000000 10.000000,6.000000 0.000000,12.000000" fill="#0D32B2" class="connection fill-B1" stroke-width="2" /> </marker><path d="M 73.000000 145.000000 L 192.000000 145.000000" stroke="#0D32B2" fill="none" class="connection stroke-B1" style="stroke-width:2;" marker-end="url(#mk-3488378134)" mask="url(#d2-1613854675)" /></g><g id="(x.id -&gt; y.z.id)[0]"><path d="M 257.000000 145.000000 L 486.000000 145.000000" stroke="#0D32B2" fill="none" class="connection stroke-B1" style="stroke-width:2;" marker-end="url(#mk-3488378134)" mask="url(#d2-1613854675)" /></g><mask id="d2-1613854675" maskUnits="userSpaceOnUse" x="11" y="11" width="639" height="268">
-||||||| parent of 33280fed5 (fixed e2e tests)
-		.d2-1613854675 .fill-N1{fill:#0A0F25;}
-		.d2-1613854675 .fill-N2{fill:#676C7E;}
-		.d2-1613854675 .fill-N3{fill:#9499AB;}
-		.d2-1613854675 .fill-N4{fill:#CFD2DD;}
-		.d2-1613854675 .fill-N5{fill:#DEE1EB;}
-		.d2-1613854675 .fill-N6{fill:#EEF1F8;}
-		.d2-1613854675 .fill-N7{fill:#FFFFFF;}
-		.d2-1613854675 .fill-B1{fill:#0D32B2;}
-		.d2-1613854675 .fill-B2{fill:#0D32B2;}
-		.d2-1613854675 .fill-B3{fill:#E3E9FD;}
-		.d2-1613854675 .fill-B4{fill:#E3E9FD;}
-		.d2-1613854675 .fill-B5{fill:#EDF0FD;}
-		.d2-1613854675 .fill-B6{fill:#F7F8FE;}
-		.d2-1613854675 .fill-AA2{fill:#4A6FF3;}
-		.d2-1613854675 .fill-AA4{fill:#EDF0FD;}
-		.d2-1613854675 .fill-AA5{fill:#F7F8FE;}
-		.d2-1613854675 .fill-AB4{fill:#EDF0FD;}
-		.d2-1613854675 .fill-AB5{fill:#F7F8FE;}
-		.d2-1613854675 .stroke-N1{stroke:#0A0F25;}
-		.d2-1613854675 .stroke-N2{stroke:#676C7E;}
-		.d2-1613854675 .stroke-N3{stroke:#9499AB;}
-		.d2-1613854675 .stroke-N4{stroke:#CFD2DD;}
-		.d2-1613854675 .stroke-N5{stroke:#DEE1EB;}
-		.d2-1613854675 .stroke-N6{stroke:#EEF1F8;}
-		.d2-1613854675 .stroke-N7{stroke:#FFFFFF;}
-		.d2-1613854675 .stroke-B1{stroke:#0D32B2;}
-		.d2-1613854675 .stroke-B2{stroke:#0D32B2;}
-		.d2-1613854675 .stroke-B3{stroke:#E3E9FD;}
-		.d2-1613854675 .stroke-B4{stroke:#E3E9FD;}
-		.d2-1613854675 .stroke-B5{stroke:#EDF0FD;}
-		.d2-1613854675 .stroke-B6{stroke:#F7F8FE;}
-		.d2-1613854675 .stroke-AA2{stroke:#4A6FF3;}
-		.d2-1613854675 .stroke-AA4{stroke:#EDF0FD;}
-		.d2-1613854675 .stroke-AA5{stroke:#F7F8FE;}
-		.d2-1613854675 .stroke-AB4{stroke:#EDF0FD;}
-		.d2-1613854675 .stroke-AB5{stroke:#F7F8FE;}
-		.d2-1613854675 .background-color-N1{background-color:#0A0F25;}
-		.d2-1613854675 .background-color-N2{background-color:#676C7E;}
-		.d2-1613854675 .background-color-N3{background-color:#9499AB;}
-		.d2-1613854675 .background-color-N4{background-color:#CFD2DD;}
-		.d2-1613854675 .background-color-N5{background-color:#DEE1EB;}
-		.d2-1613854675 .background-color-N6{background-color:#EEF1F8;}
-		.d2-1613854675 .background-color-N7{background-color:#FFFFFF;}
-		.d2-1613854675 .background-color-B1{background-color:#0D32B2;}
-		.d2-1613854675 .background-color-B2{background-color:#0D32B2;}
-		.d2-1613854675 .background-color-B3{background-color:#E3E9FD;}
-		.d2-1613854675 .background-color-B4{background-color:#E3E9FD;}
-		.d2-1613854675 .background-color-B5{background-color:#EDF0FD;}
-		.d2-1613854675 .background-color-B6{background-color:#F7F8FE;}
-		.d2-1613854675 .background-color-AA2{background-color:#4A6FF3;}
-		.d2-1613854675 .background-color-AA4{background-color:#EDF0FD;}
-		.d2-1613854675 .background-color-AA5{background-color:#F7F8FE;}
-		.d2-1613854675 .background-color-AB4{background-color:#EDF0FD;}
-		.d2-1613854675 .background-color-AB5{background-color:#F7F8FE;}
-		.d2-1613854675 .color-N1{color:#0A0F25;}
-		.d2-1613854675 .color-N2{color:#676C7E;}
-		.d2-1613854675 .color-N3{color:#9499AB;}
-		.d2-1613854675 .color-N4{color:#CFD2DD;}
-		.d2-1613854675 .color-N5{color:#DEE1EB;}
-		.d2-1613854675 .color-N6{color:#EEF1F8;}
-		.d2-1613854675 .color-N7{color:#FFFFFF;}
-		.d2-1613854675 .color-B1{color:#0D32B2;}
-		.d2-1613854675 .color-B2{color:#0D32B2;}
-		.d2-1613854675 .color-B3{color:#E3E9FD;}
-		.d2-1613854675 .color-B4{color:#E3E9FD;}
-		.d2-1613854675 .color-B5{color:#EDF0FD;}
-		.d2-1613854675 .color-B6{color:#F7F8FE;}
-		.d2-1613854675 .color-AA2{color:#4A6FF3;}
-		.d2-1613854675 .color-AA4{color:#EDF0FD;}
-		.d2-1613854675 .color-AA5{color:#F7F8FE;}
-		.d2-1613854675 .color-AB4{color:#EDF0FD;}
-		.d2-1613854675 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]></style><g id="id"><g class="shape" ><rect x="12.000000" y="112.000000" width="59.000000" height="66.000000" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="41.500000" y="150.500000" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">id</text></g><g id="x"><g class="shape" ><rect x="146.000000" y="62.000000" width="159.000000" height="166.000000" class=" stroke-B1 fill-B4" style="stroke-width:2;" /></g><text x="225.500000" y="95.000000" class="text fill-N1" style="text-anchor:middle;font-size:28px">x</text></g><g id="y"><g class="shape" ><rect x="385.000000" y="12.000000" width="264.000000" height="266.000000" class=" stroke-B1 fill-B4" style="stroke-width:2;" /></g><text x="517.000000" y="45.000000" class="text fill-N1" style="text-anchor:middle;font-size:28px">y</text></g><g id="x.id"><g class="shape" ><rect x="196.000000" y="112.000000" width="59.000000" height="66.000000" class=" stroke-B1 fill-B5" style="stroke-width:2;" /></g><text x="225.500000" y="150.500000" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">id</text></g><g id="y.z"><g class="shape" ><rect x="440.000000" y="62.000000" width="159.000000" height="166.000000" class=" stroke-B1 fill-B5" style="stroke-width:2;" /></g><text x="519.500000" y="91.000000" class="text fill-N1" style="text-anchor:middle;font-size:24px">z</text></g><g id="y.z.id"><g class="shape" ><rect x="490.000000" y="112.000000" width="59.000000" height="66.000000" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="519.500000" y="150.500000" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">id</text></g><g id="(id -&gt; x.id)[0]"><marker id="mk-3488378134" markerWidth="10.000000" markerHeight="12.000000" refX="7.000000" refY="6.000000" viewBox="0.000000 0.000000 10.000000 12.000000" orient="auto" markerUnits="userSpaceOnUse"> <polygon points="0.000000,0.000000 10.000000,6.000000 0.000000,12.000000" class="connection fill-B1" stroke-width="2" /> </marker><path d="M 73.000000 145.000000 L 192.000000 145.000000" fill="none" class="connection stroke-B1" style="stroke-width:2;" marker-end="url(#mk-3488378134)" mask="url(#d2-1613854675)" /></g><g id="(x.id -&gt; y.z.id)[0]"><path d="M 257.000000 145.000000 L 486.000000 145.000000" fill="none" class="connection stroke-B1" style="stroke-width:2;" marker-end="url(#mk-3488378134)" mask="url(#d2-1613854675)" /></g><mask id="d2-1613854675" maskUnits="userSpaceOnUse" x="11" y="11" width="639" height="268">
-=======
 		.d2-1783928571 .fill-N1{fill:#0A0F25;}
 		.d2-1783928571 .fill-N2{fill:#676C7E;}
 		.d2-1783928571 .fill-N3{fill:#9499AB;}
@@ -259,8 +96,7 @@
 		.d2-1783928571 .color-AA4{color:#EDF0FD;}
 		.d2-1783928571 .color-AA5{color:#F7F8FE;}
 		.d2-1783928571 .color-AB4{color:#EDF0FD;}
-		.d2-1783928571 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]></style><g id="id"><g class="shape" ><rect x="12.000000" y="112.000000" width="59.000000" height="66.000000" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="41.500000" y="150.500000" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">id</text></g><g id="x"><g class="shape" ><rect x="146.000000" y="62.000000" width="159.000000" height="166.000000" class=" stroke-B1 fill-B4" style="stroke-width:2;" /></g><text x="225.500000" y="95.000000" class="text fill-N1" style="text-anchor:middle;font-size:28px">x</text></g><g id="y"><g class="shape" ><rect x="385.000000" y="12.000000" width="264.000000" height="266.000000" class=" stroke-B1 fill-B4" style="stroke-width:2;" /></g><text x="517.000000" y="45.000000" class="text fill-N1" style="text-anchor:middle;font-size:28px">y</text></g><g id="x.id"><g class="shape" ><rect x="196.000000" y="112.000000" width="59.000000" height="66.000000" class=" stroke-B1 fill-B5" style="stroke-width:2;" /></g><text x="225.500000" y="150.500000" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">id</text></g><g id="y.z"><g class="shape" ><rect x="440.000000" y="62.000000" width="159.000000" height="166.000000" class=" stroke-B1 fill-B5" style="stroke-width:2;" /></g><text x="519.500000" y="91.000000" class="text fill-N1" style="text-anchor:middle;font-size:24px">z</text></g><g id="y.z.id"><g class="shape" ><rect x="490.000000" y="112.000000" width="59.000000" height="66.000000" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="519.500000" y="150.500000" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">id</text></g><g id="(id -&gt; x.id)[0]"><marker id="mk-3488378134" markerWidth="10.000000" markerHeight="12.000000" refX="7.000000" refY="6.000000" viewBox="0.000000 0.000000 10.000000 12.000000" orient="auto" markerUnits="userSpaceOnUse"> <polygon points="0.000000,0.000000 10.000000,6.000000 0.000000,12.000000" class="connection fill-B1" stroke-width="2" /> </marker><path d="M 73.000000 145.000000 L 192.000000 145.000000" fill="none" class="connection stroke-B1" style="stroke-width:2;" marker-end="url(#mk-3488378134)" mask="url(#d2-1783928571)" /></g><g id="(x.id -&gt; y.z.id)[0]"><path d="M 257.000000 145.000000 L 486.000000 145.000000" fill="none" class="connection stroke-B1" style="stroke-width:2;" marker-end="url(#mk-3488378134)" mask="url(#d2-1783928571)" /></g><mask id="d2-1783928571" maskUnits="userSpaceOnUse" x="11" y="11" width="639" height="268">
+		.d2-1783928571 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]></style><g id="id"><g class="shape" ><rect x="12.000000" y="112.000000" width="59.000000" height="66.000000" stroke="#0D32B2" fill="#F7F8FE" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="41.500000" y="150.500000" fill="#0A0F25" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">id</text></g><g id="x"><g class="shape" ><rect x="146.000000" y="62.000000" width="159.000000" height="166.000000" stroke="#0D32B2" fill="#E3E9FD" class=" stroke-B1 fill-B4" style="stroke-width:2;" /></g><text x="225.500000" y="95.000000" fill="#0A0F25" class="text fill-N1" style="text-anchor:middle;font-size:28px">x</text></g><g id="y"><g class="shape" ><rect x="385.000000" y="12.000000" width="264.000000" height="266.000000" stroke="#0D32B2" fill="#E3E9FD" class=" stroke-B1 fill-B4" style="stroke-width:2;" /></g><text x="517.000000" y="45.000000" fill="#0A0F25" class="text fill-N1" style="text-anchor:middle;font-size:28px">y</text></g><g id="x.id"><g class="shape" ><rect x="196.000000" y="112.000000" width="59.000000" height="66.000000" stroke="#0D32B2" fill="#EDF0FD" class=" stroke-B1 fill-B5" style="stroke-width:2;" /></g><text x="225.500000" y="150.500000" fill="#0A0F25" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">id</text></g><g id="y.z"><g class="shape" ><rect x="440.000000" y="62.000000" width="159.000000" height="166.000000" stroke="#0D32B2" fill="#EDF0FD" class=" stroke-B1 fill-B5" style="stroke-width:2;" /></g><text x="519.500000" y="91.000000" fill="#0A0F25" class="text fill-N1" style="text-anchor:middle;font-size:24px">z</text></g><g id="y.z.id"><g class="shape" ><rect x="490.000000" y="112.000000" width="59.000000" height="66.000000" stroke="#0D32B2" fill="#F7F8FE" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="519.500000" y="150.500000" fill="#0A0F25" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">id</text></g><g id="(id -&gt; x.id)[0]"><marker id="mk-3488378134" markerWidth="10.000000" markerHeight="12.000000" refX="7.000000" refY="6.000000" viewBox="0.000000 0.000000 10.000000 12.000000" orient="auto" markerUnits="userSpaceOnUse"> <polygon points="0.000000,0.000000 10.000000,6.000000 0.000000,12.000000" fill="#0D32B2" class="connection fill-B1" stroke-width="2" /> </marker><path d="M 73.000000 145.000000 L 192.000000 145.000000" stroke="#0D32B2" fill="none" class="connection stroke-B1" style="stroke-width:2;" marker-end="url(#mk-3488378134)" mask="url(#d2-1783928571)" /></g><g id="(x.id -&gt; y.z.id)[0]"><path d="M 257.000000 145.000000 L 486.000000 145.000000" stroke="#0D32B2" fill="none" class="connection stroke-B1" style="stroke-width:2;" marker-end="url(#mk-3488378134)" mask="url(#d2-1783928571)" /></g><mask id="d2-1783928571" maskUnits="userSpaceOnUse" x="11" y="11" width="639" height="268">
->>>>>>> 33280fed5 (fixed e2e tests)
 <rect x="11" y="11" width="639" height="268" fill="white"></rect>
 <rect x="34.500000" y="134.500000" width="14" height="21" fill="rgba(0,0,0,0.75)"></rect>
 <rect x="219.000000" y="67.000000" width="13" height="36" fill="rgba(0,0,0,0.75)"></rect>

e2etests/testdata/regression/dagre_disconnected_edge/dagre/sketch.exp.svg

@@ -1,22 +1,6 @@
-<<<<<<< HEAD
+<?xml version="1.0" encoding="utf-8"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" d2Version="v0.6.8-HEAD" preserveAspectRatio="xMinYMin meet" viewBox="0 0 176 336"><svg id="d2-svg" class="d2-2564580976" width="176" height="336" viewBox="30 -51 176 336"><rect x="30.000000" y="-51.000000" width="176.000000" height="336.000000" rx="0.000000" fill="#FFFFFF" class=" fill-N7" stroke-width="0" /><style type="text/css"><![CDATA[
-<<<<<<< HEAD
-<?xml version="1.0" encoding="utf-8"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" d2Version="v0.6.8-HEAD" preserveAspectRatio="xMinYMin meet" viewBox="0 0 176 336"><svg id="d2-svg" class="d2-1021923722" width="176" height="336" viewBox="30 -51 176 336"><rect x="30.000000" y="-51.000000" width="176.000000" height="336.000000" rx="0.000000" fill="#FFFFFF" class=" fill-N7" stroke-width="0" /><style type="text/css"><![CDATA[
-.d2-1021923722 .text-bold {
-	font-family: "d2-1021923722-font-bold";
-||||||| parent of 33280fed5 (fixed e2e tests)
-<?xml version="1.0" encoding="utf-8"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" d2Version="v0.6.6-HEAD" preserveAspectRatio="xMinYMin meet" viewBox="0 0 176 336"><svg id="d2-svg" class="d2-1021923722" width="176" height="336" viewBox="30 -51 176 336"><rect x="30.000000" y="-51.000000" width="176.000000" height="336.000000" rx="0.000000" class=" fill-N7" stroke-width="0" /><style type="text/css"><![CDATA[
-.d2-1021923722 .text-bold {
-	font-family: "d2-1021923722-font-bold";
-=======
-<?xml version="1.0" encoding="utf-8"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" d2Version="v0.6.5-HEAD" preserveAspectRatio="xMinYMin meet" viewBox="0 0 176 336"><svg id="d2-svg" class="d2-2564580976" width="176" height="336" viewBox="30 -51 176 336"><rect x="30.000000" y="-51.000000" width="176.000000" height="336.000000" rx="0.000000" class=" fill-N7" stroke-width="0" /><style type="text/css"><![CDATA[
-||||||| parent of cb2f2823c (Fix changes)
-<?xml version="1.0" encoding="utf-8"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" d2Version="v0.6.5-HEAD" preserveAspectRatio="xMinYMin meet" viewBox="0 0 176 336"><svg id="d2-svg" class="d2-2564580976" width="176" height="336" viewBox="30 -51 176 336"><rect x="30.000000" y="-51.000000" width="176.000000" height="336.000000" rx="0.000000" class=" fill-N7" stroke-width="0" /><style type="text/css"><![CDATA[
-=======
-<?xml version="1.0" encoding="utf-8"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" d2Version="v0.6.6-HEAD" preserveAspectRatio="xMinYMin meet" viewBox="0 0 176 336"><svg id="d2-svg" class="d2-2564580976" width="176" height="336" viewBox="30 -51 176 336"><rect x="30.000000" y="-51.000000" width="176.000000" height="336.000000" rx="0.000000" class=" fill-N7" stroke-width="0" /><style type="text/css"><![CDATA[
->>>>>>> cb2f2823c (Fix changes)
 .d2-2564580976 .text-bold {
 	font-family: "d2-2564580976-font-bold";
->>>>>>> 33280fed5 (fixed e2e tests)
 }
 @font-face {
 	font-family: d2-2564580976-font-bold;
@@ -34,153 +18,6 @@
   opacity: 0.5;
 }
 
-<<<<<<< HEAD
-		.d2-1021923722 .fill-N1{fill:#0A0F25;}
-		.d2-1021923722 .fill-N2{fill:#676C7E;}
-		.d2-1021923722 .fill-N3{fill:#9499AB;}
-		.d2-1021923722 .fill-N4{fill:#CFD2DD;}
-		.d2-1021923722 .fill-N5{fill:#DEE1EB;}
-		.d2-1021923722 .fill-N6{fill:#EEF1F8;}
-		.d2-1021923722 .fill-N7{fill:#FFFFFF;}
-		.d2-1021923722 .fill-B1{fill:#0D32B2;}
-		.d2-1021923722 .fill-B2{fill:#0D32B2;}
-		.d2-1021923722 .fill-B3{fill:#E3E9FD;}
-		.d2-1021923722 .fill-B4{fill:#E3E9FD;}
-		.d2-1021923722 .fill-B5{fill:#EDF0FD;}
-		.d2-1021923722 .fill-B6{fill:#F7F8FE;}
-		.d2-1021923722 .fill-AA2{fill:#4A6FF3;}
-		.d2-1021923722 .fill-AA4{fill:#EDF0FD;}
-		.d2-1021923722 .fill-AA5{fill:#F7F8FE;}
-		.d2-1021923722 .fill-AB4{fill:#EDF0FD;}
-		.d2-1021923722 .fill-AB5{fill:#F7F8FE;}
-		.d2-1021923722 .stroke-N1{stroke:#0A0F25;}
-		.d2-1021923722 .stroke-N2{stroke:#676C7E;}
-		.d2-1021923722 .stroke-N3{stroke:#9499AB;}
-		.d2-1021923722 .stroke-N4{stroke:#CFD2DD;}
-		.d2-1021923722 .stroke-N5{stroke:#DEE1EB;}
-		.d2-1021923722 .stroke-N6{stroke:#EEF1F8;}
-		.d2-1021923722 .stroke-N7{stroke:#FFFFFF;}
-		.d2-1021923722 .stroke-B1{stroke:#0D32B2;}
-		.d2-1021923722 .stroke-B2{stroke:#0D32B2;}
-		.d2-1021923722 .stroke-B3{stroke:#E3E9FD;}
-		.d2-1021923722 .stroke-B4{stroke:#E3E9FD;}
-		.d2-1021923722 .stroke-B5{stroke:#EDF0FD;}
-		.d2-1021923722 .stroke-B6{stroke:#F7F8FE;}
-		.d2-1021923722 .stroke-AA2{stroke:#4A6FF3;}
-		.d2-1021923722 .stroke-AA4{stroke:#EDF0FD;}
-		.d2-1021923722 .stroke-AA5{stroke:#F7F8FE;}
-		.d2-1021923722 .stroke-AB4{stroke:#EDF0FD;}
-		.d2-1021923722 .stroke-AB5{stroke:#F7F8FE;}
-		.d2-1021923722 .background-color-N1{background-color:#0A0F25;}
-		.d2-1021923722 .background-color-N2{background-color:#676C7E;}
-		.d2-1021923722 .background-color-N3{background-color:#9499AB;}
-		.d2-1021923722 .background-color-N4{background-color:#CFD2DD;}
-		.d2-1021923722 .background-color-N5{background-color:#DEE1EB;}
-		.d2-1021923722 .background-color-N6{background-color:#EEF1F8;}
-		.d2-1021923722 .background-color-N7{background-color:#FFFFFF;}
-		.d2-1021923722 .background-color-B1{background-color:#0D32B2;}
-		.d2-1021923722 .background-color-B2{background-color:#0D32B2;}
-		.d2-1021923722 .background-color-B3{background-color:#E3E9FD;}
-		.d2-1021923722 .background-color-B4{background-color:#E3E9FD;}
-		.d2-1021923722 .background-color-B5{background-color:#EDF0FD;}
-		.d2-1021923722 .background-color-B6{background-color:#F7F8FE;}
-		.d2-1021923722 .background-color-AA2{background-color:#4A6FF3;}
-		.d2-1021923722 .background-color-AA4{background-color:#EDF0FD;}
-		.d2-1021923722 .background-color-AA5{background-color:#F7F8FE;}
-		.d2-1021923722 .background-color-AB4{background-color:#EDF0FD;}
-		.d2-1021923722 .background-color-AB5{background-color:#F7F8FE;}
-		.d2-1021923722 .color-N1{color:#0A0F25;}
-		.d2-1021923722 .color-N2{color:#676C7E;}
-		.d2-1021923722 .color-N3{color:#9499AB;}
-		.d2-1021923722 .color-N4{color:#CFD2DD;}
-		.d2-1021923722 .color-N5{color:#DEE1EB;}
-		.d2-1021923722 .color-N6{color:#EEF1F8;}
-		.d2-1021923722 .color-N7{color:#FFFFFF;}
-		.d2-1021923722 .color-B1{color:#0D32B2;}
-		.d2-1021923722 .color-B2{color:#0D32B2;}
-		.d2-1021923722 .color-B3{color:#E3E9FD;}
-		.d2-1021923722 .color-B4{color:#E3E9FD;}
-		.d2-1021923722 .color-B5{color:#EDF0FD;}
-		.d2-1021923722 .color-B6{color:#F7F8FE;}
-		.d2-1021923722 .color-AA2{color:#4A6FF3;}
-		.d2-1021923722 .color-AA4{color:#EDF0FD;}
-		.d2-1021923722 .color-AA5{color:#F7F8FE;}
-		.d2-1021923722 .color-AB4{color:#EDF0FD;}
-		.d2-1021923722 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]></style><g id="x"><g class="shape" ><rect x="74.000000" y="0.000000" width="131.000000" height="92.000000" stroke="#0D32B2" fill="#F7F8FE" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><image href="https://icons.terrastruct.com/essentials%2F005-programmer.svg" x="154.000000" y="-51.000000" width="46" height="46" /><text x="139.500000" y="21.000000" fill="#0A0F25" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">program</text></g><g id="y"><g class="shape" ><rect x="81.000000" y="192.000000" width="118.000000" height="92.000000" stroke="#0D32B2" fill="#F7F8FE" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><image href="https://icons.terrastruct.com/essentials%2Fprofits.svg" x="30.000000" y="215.000000" width="46" height="46" /><text x="170.500000" y="274.000000" fill="#0A0F25" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">profits</text></g><g id="(x -&gt; y)[0]"><marker id="mk-3488378134" markerWidth="10.000000" markerHeight="12.000000" refX="7.000000" refY="6.000000" viewBox="0.000000 0.000000 10.000000 12.000000" orient="auto" markerUnits="userSpaceOnUse"> <polygon points="0.000000,0.000000 10.000000,6.000000 0.000000,12.000000" fill="#0D32B2" class="connection fill-B1" stroke-width="2" /> </marker><path d="M 139.500000 94.000000 C 139.500000 132.000000 139.500000 152.000000 139.500000 188.000000" stroke="#0D32B2" fill="none" class="connection stroke-B1" style="stroke-width:2;" marker-end="url(#mk-3488378134)" mask="url(#d2-1021923722)" /></g><mask id="d2-1021923722" maskUnits="userSpaceOnUse" x="30" y="-51" width="176" height="336">
-||||||| parent of 33280fed5 (fixed e2e tests)
-		.d2-1021923722 .fill-N1{fill:#0A0F25;}
-		.d2-1021923722 .fill-N2{fill:#676C7E;}
-		.d2-1021923722 .fill-N3{fill:#9499AB;}
-		.d2-1021923722 .fill-N4{fill:#CFD2DD;}
-		.d2-1021923722 .fill-N5{fill:#DEE1EB;}
-		.d2-1021923722 .fill-N6{fill:#EEF1F8;}
-		.d2-1021923722 .fill-N7{fill:#FFFFFF;}
-		.d2-1021923722 .fill-B1{fill:#0D32B2;}
-		.d2-1021923722 .fill-B2{fill:#0D32B2;}
-		.d2-1021923722 .fill-B3{fill:#E3E9FD;}
-		.d2-1021923722 .fill-B4{fill:#E3E9FD;}
-		.d2-1021923722 .fill-B5{fill:#EDF0FD;}
-		.d2-1021923722 .fill-B6{fill:#F7F8FE;}
-		.d2-1021923722 .fill-AA2{fill:#4A6FF3;}
-		.d2-1021923722 .fill-AA4{fill:#EDF0FD;}
-		.d2-1021923722 .fill-AA5{fill:#F7F8FE;}
-		.d2-1021923722 .fill-AB4{fill:#EDF0FD;}
-		.d2-1021923722 .fill-AB5{fill:#F7F8FE;}
-		.d2-1021923722 .stroke-N1{stroke:#0A0F25;}
-		.d2-1021923722 .stroke-N2{stroke:#676C7E;}
-		.d2-1021923722 .stroke-N3{stroke:#9499AB;}
-		.d2-1021923722 .stroke-N4{stroke:#CFD2DD;}
-		.d2-1021923722 .stroke-N5{stroke:#DEE1EB;}
-		.d2-1021923722 .stroke-N6{stroke:#EEF1F8;}
-		.d2-1021923722 .stroke-N7{stroke:#FFFFFF;}
-		.d2-1021923722 .stroke-B1{stroke:#0D32B2;}
-		.d2-1021923722 .stroke-B2{stroke:#0D32B2;}
-		.d2-1021923722 .stroke-B3{stroke:#E3E9FD;}
-		.d2-1021923722 .stroke-B4{stroke:#E3E9FD;}
-		.d2-1021923722 .stroke-B5{stroke:#EDF0FD;}
-		.d2-1021923722 .stroke-B6{stroke:#F7F8FE;}
-		.d2-1021923722 .stroke-AA2{stroke:#4A6FF3;}
-		.d2-1021923722 .stroke-AA4{stroke:#EDF0FD;}
-		.d2-1021923722 .stroke-AA5{stroke:#F7F8FE;}
-		.d2-1021923722 .stroke-AB4{stroke:#EDF0FD;}
-		.d2-1021923722 .stroke-AB5{stroke:#F7F8FE;}
-		.d2-1021923722 .background-color-N1{background-color:#0A0F25;}
-		.d2-1021923722 .background-color-N2{background-color:#676C7E;}
-		.d2-1021923722 .background-color-N3{background-color:#9499AB;}
-		.d2-1021923722 .background-color-N4{background-color:#CFD2DD;}
-		.d2-1021923722 .background-color-N5{background-color:#DEE1EB;}
-		.d2-1021923722 .background-color-N6{background-color:#EEF1F8;}
-		.d2-1021923722 .background-color-N7{background-color:#FFFFFF;}
-		.d2-1021923722 .background-color-B1{background-color:#0D32B2;}
-		.d2-1021923722 .background-color-B2{background-color:#0D32B2;}
-		.d2-1021923722 .background-color-B3{background-color:#E3E9FD;}
-		.d2-1021923722 .background-color-B4{background-color:#E3E9FD;}
-		.d2-1021923722 .background-color-B5{background-color:#EDF0FD;}
-		.d2-1021923722 .background-color-B6{background-color:#F7F8FE;}
-		.d2-1021923722 .background-color-AA2{background-color:#4A6FF3;}
-		.d2-1021923722 .background-color-AA4{background-color:#EDF0FD;}
-		.d2-1021923722 .background-color-AA5{background-color:#F7F8FE;}
-		.d2-1021923722 .background-color-AB4{background-color:#EDF0FD;}
-		.d2-1021923722 .background-color-AB5{background-color:#F7F8FE;}
-		.d2-1021923722 .color-N1{color:#0A0F25;}
-		.d2-1021923722 .color-N2{color:#676C7E;}
-		.d2-1021923722 .color-N3{color:#9499AB;}
-		.d2-1021923722 .color-N4{color:#CFD2DD;}
-		.d2-1021923722 .color-N5{color:#DEE1EB;}
-		.d2-1021923722 .color-N6{color:#EEF1F8;}
-		.d2-1021923722 .color-N7{color:#FFFFFF;}
-		.d2-1021923722 .color-B1{color:#0D32B2;}
-		.d2-1021923722 .color-B2{color:#0D32B2;}
-		.d2-1021923722 .color-B3{color:#E3E9FD;}
-		.d2-1021923722 .color-B4{color:#E3E9FD;}
-		.d2-1021923722 .color-B5{color:#EDF0FD;}
-		.d2-1021923722 .color-B6{color:#F7F8FE;}
-		.d2-1021923722 .color-AA2{color:#4A6FF3;}
-		.d2-1021923722 .color-AA4{color:#EDF0FD;}
-		.d2-1021923722 .color-AA5{color:#F7F8FE;}
-		.d2-1021923722 .color-AB4{color:#EDF0FD;}
-		.d2-1021923722 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]></style><g id="x"><g class="shape" ><rect x="74.000000" y="0.000000" width="131.000000" height="92.000000" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><image href="https://icons.terrastruct.com/essentials%2F005-programmer.svg" x="154.000000" y="-51.000000" width="46" height="46" /><text x="139.500000" y="21.000000" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">program</text></g><g id="y"><g class="shape" ><rect x="81.000000" y="192.000000" width="118.000000" height="92.000000" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><image href="https://icons.terrastruct.com/essentials%2Fprofits.svg" x="30.000000" y="215.000000" width="46" height="46" /><text x="170.500000" y="274.000000" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">profits</text></g><g id="(x -&gt; y)[0]"><marker id="mk-3488378134" markerWidth="10.000000" markerHeight="12.000000" refX="7.000000" refY="6.000000" viewBox="0.000000 0.000000 10.000000 12.000000" orient="auto" markerUnits="userSpaceOnUse"> <polygon points="0.000000,0.000000 10.000000,6.000000 0.000000,12.000000" class="connection fill-B1" stroke-width="2" /> </marker><path d="M 139.500000 94.000000 C 139.500000 132.000000 139.500000 152.000000 139.500000 188.000000" fill="none" class="connection stroke-B1" style="stroke-width:2;" marker-end="url(#mk-3488378134)" mask="url(#d2-1021923722)" /></g><mask id="d2-1021923722" maskUnits="userSpaceOnUse" x="30" y="-51" width="176" height="336">
-=======
 		.d2-2564580976 .fill-N1{fill:#0A0F25;}
 		.d2-2564580976 .fill-N2{fill:#676C7E;}
 		.d2-2564580976 .fill-N3{fill:#9499AB;}
@@ -252,8 +89,7 @@
 		.d2-2564580976 .color-AA4{color:#EDF0FD;}
 		.d2-2564580976 .color-AA5{color:#F7F8FE;}
 		.d2-2564580976 .color-AB4{color:#EDF0FD;}
-		.d2-2564580976 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]></style><g id="x"><g class="shape" ><rect x="74.000000" y="0.000000" width="131.000000" height="92.000000" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><image href="https://icons.terrastruct.com/essentials%2F005-programmer.svg" x="154.000000" y="-51.000000" width="46" height="46" /><text x="139.500000" y="21.000000" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">program</text></g><g id="y"><g class="shape" ><rect x="81.000000" y="192.000000" width="118.000000" height="92.000000" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><image href="https://icons.terrastruct.com/essentials%2Fprofits.svg" x="30.000000" y="215.000000" width="46" height="46" /><text x="170.500000" y="274.000000" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">profits</text></g><g id="(x -&gt; y)[0]"><marker id="mk-3488378134" markerWidth="10.000000" markerHeight="12.000000" refX="7.000000" refY="6.000000" viewBox="0.000000 0.000000 10.000000 12.000000" orient="auto" markerUnits="userSpaceOnUse"> <polygon points="0.000000,0.000000 10.000000,6.000000 0.000000,12.000000" class="connection fill-B1" stroke-width="2" /> </marker><path d="M 139.500000 94.000000 C 139.500000 132.000000 139.500000 152.000000 139.500000 188.000000" fill="none" class="connection stroke-B1" style="stroke-width:2;" marker-end="url(#mk-3488378134)" mask="url(#d2-2564580976)" /></g><mask id="d2-2564580976" maskUnits="userSpaceOnUse" x="30" y="-51" width="176" height="336">
+		.d2-2564580976 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]></style><g id="x"><g class="shape" ><rect x="74.000000" y="0.000000" width="131.000000" height="92.000000" stroke="#0D32B2" fill="#F7F8FE" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><image href="https://icons.terrastruct.com/essentials%2F005-programmer.svg" x="154.000000" y="-51.000000" width="46" height="46" /><text x="139.500000" y="21.000000" fill="#0A0F25" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">program</text></g><g id="y"><g class="shape" ><rect x="81.000000" y="192.000000" width="118.000000" height="92.000000" stroke="#0D32B2" fill="#F7F8FE" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><image href="https://icons.terrastruct.com/essentials%2Fprofits.svg" x="30.000000" y="215.000000" width="46" height="46" /><text x="170.500000" y="274.000000" fill="#0A0F25" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">profits</text></g><g id="(x -&gt; y)[0]"><marker id="mk-3488378134" markerWidth="10.000000" markerHeight="12.000000" refX="7.000000" refY="6.000000" viewBox="0.000000 0.000000 10.000000 12.000000" orient="auto" markerUnits="userSpaceOnUse"> <polygon points="0.000000,0.000000 10.000000,6.000000 0.000000,12.000000" fill="#0D32B2" class="connection fill-B1" stroke-width="2" /> </marker><path d="M 139.500000 94.000000 C 139.500000 132.000000 139.500000 152.000000 139.500000 188.000000" stroke="#0D32B2" fill="none" class="connection stroke-B1" style="stroke-width:2;" marker-end="url(#mk-3488378134)" mask="url(#d2-2564580976)" /></g><mask id="d2-2564580976" maskUnits="userSpaceOnUse" x="30" y="-51" width="176" height="336">
->>>>>>> 33280fed5 (fixed e2e tests)
 <rect x="30" y="-51" width="176" height="336" fill="white"></rect>
 <rect x="109.500000" y="5.000000" width="60" height="21" fill="rgba(0,0,0,0.75)"></rect>
 <rect x="147.000000" y="258.000000" width="47" height="21" fill="rgba(0,0,0,0.75)"></rect>

e2etests/testdata/regression/dagre_disconnected_edge/elk/sketch.exp.svg

@@ -1,22 +1,6 @@
-<<<<<<< HEAD
+<?xml version="1.0" encoding="utf-8"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" d2Version="v0.6.8-HEAD" preserveAspectRatio="xMinYMin meet" viewBox="0 0 183 371"><svg id="d2-svg" class="d2-788656292" width="183" height="371" viewBox="12 12 183 371"><rect x="12.000000" y="12.000000" width="183.000000" height="371.000000" rx="0.000000" fill="#FFFFFF" class=" fill-N7" stroke-width="0" /><style type="text/css"><![CDATA[
-<<<<<<< HEAD
-<?xml version="1.0" encoding="utf-8"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" d2Version="v0.6.8-HEAD" preserveAspectRatio="xMinYMin meet" viewBox="0 0 183 371"><svg id="d2-svg" class="d2-1296623166" width="183" height="371" viewBox="12 12 183 371"><rect x="12.000000" y="12.000000" width="183.000000" height="371.000000" rx="0.000000" fill="#FFFFFF" class=" fill-N7" stroke-width="0" /><style type="text/css"><![CDATA[
-.d2-1296623166 .text-bold {
-	font-family: "d2-1296623166-font-bold";
-||||||| parent of 33280fed5 (fixed e2e tests)
-<?xml version="1.0" encoding="utf-8"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" d2Version="v0.6.6-HEAD" preserveAspectRatio="xMinYMin meet" viewBox="0 0 183 371"><svg id="d2-svg" class="d2-1296623166" width="183" height="371" viewBox="12 12 183 371"><rect x="12.000000" y="12.000000" width="183.000000" height="371.000000" rx="0.000000" class=" fill-N7" stroke-width="0" /><style type="text/css"><![CDATA[
-.d2-1296623166 .text-bold {
-	font-family: "d2-1296623166-font-bold";
-=======
-<?xml version="1.0" encoding="utf-8"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" d2Version="v0.6.5-HEAD" preserveAspectRatio="xMinYMin meet" viewBox="0 0 183 371"><svg id="d2-svg" class="d2-788656292" width="183" height="371" viewBox="12 12 183 371"><rect x="12.000000" y="12.000000" width="183.000000" height="371.000000" rx="0.000000" class=" fill-N7" stroke-width="0" /><style type="text/css"><![CDATA[
-||||||| parent of cb2f2823c (Fix changes)
-<?xml version="1.0" encoding="utf-8"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" d2Version="v0.6.5-HEAD" preserveAspectRatio="xMinYMin meet" viewBox="0 0 183 371"><svg id="d2-svg" class="d2-788656292" width="183" height="371" viewBox="12 12 183 371"><rect x="12.000000" y="12.000000" width="183.000000" height="371.000000" rx="0.000000" class=" fill-N7" stroke-width="0" /><style type="text/css"><![CDATA[
-=======
-<?xml version="1.0" encoding="utf-8"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" d2Version="v0.6.6-HEAD" preserveAspectRatio="xMinYMin meet" viewBox="0 0 183 371"><svg id="d2-svg" class="d2-788656292" width="183" height="371" viewBox="12 12 183 371"><rect x="12.000000" y="12.000000" width="183.000000" height="371.000000" rx="0.000000" class=" fill-N7" stroke-width="0" /><style type="text/css"><![CDATA[
->>>>>>> cb2f2823c (Fix changes)
 .d2-788656292 .text-bold {
 	font-family: "d2-788656292-font-bold";
->>>>>>> 33280fed5 (fixed e2e tests)
 }
 @font-face {
 	font-family: d2-788656292-font-bold;
@@ -34,153 +18,6 @@
   opacity: 0.5;
 }
 
-<<<<<<< HEAD
-		.d2-1296623166 .fill-N1{fill:#0A0F25;}
-		.d2-1296623166 .fill-N2{fill:#676C7E;}
-		.d2-1296623166 .fill-N3{fill:#9499AB;}
-		.d2-1296623166 .fill-N4{fill:#CFD2DD;}
-		.d2-1296623166 .fill-N5{fill:#DEE1EB;}
-		.d2-1296623166 .fill-N6{fill:#EEF1F8;}
-		.d2-1296623166 .fill-N7{fill:#FFFFFF;}
-		.d2-1296623166 .fill-B1{fill:#0D32B2;}
-		.d2-1296623166 .fill-B2{fill:#0D32B2;}
-		.d2-1296623166 .fill-B3{fill:#E3E9FD;}
-		.d2-1296623166 .fill-B4{fill:#E3E9FD;}
-		.d2-1296623166 .fill-B5{fill:#EDF0FD;}
-		.d2-1296623166 .fill-B6{fill:#F7F8FE;}
-		.d2-1296623166 .fill-AA2{fill:#4A6FF3;}
-		.d2-1296623166 .fill-AA4{fill:#EDF0FD;}
-		.d2-1296623166 .fill-AA5{fill:#F7F8FE;}
-		.d2-1296623166 .fill-AB4{fill:#EDF0FD;}
-		.d2-1296623166 .fill-AB5{fill:#F7F8FE;}
-		.d2-1296623166 .stroke-N1{stroke:#0A0F25;}
-		.d2-1296623166 .stroke-N2{stroke:#676C7E;}
-		.d2-1296623166 .stroke-N3{stroke:#9499AB;}
-		.d2-1296623166 .stroke-N4{stroke:#CFD2DD;}
-		.d2-1296623166 .stroke-N5{stroke:#DEE1EB;}
-		.d2-1296623166 .stroke-N6{stroke:#EEF1F8;}
-		.d2-1296623166 .stroke-N7{stroke:#FFFFFF;}
-		.d2-1296623166 .stroke-B1{stroke:#0D32B2;}
-		.d2-1296623166 .stroke-B2{stroke:#0D32B2;}
-		.d2-1296623166 .stroke-B3{stroke:#E3E9FD;}
-		.d2-1296623166 .stroke-B4{stroke:#E3E9FD;}
-		.d2-1296623166 .stroke-B5{stroke:#EDF0FD;}
-		.d2-1296623166 .stroke-B6{stroke:#F7F8FE;}
-		.d2-1296623166 .stroke-AA2{stroke:#4A6FF3;}
-		.d2-1296623166 .stroke-AA4{stroke:#EDF0FD;}
-		.d2-1296623166 .stroke-AA5{stroke:#F7F8FE;}
-		.d2-1296623166 .stroke-AB4{stroke:#EDF0FD;}
-		.d2-1296623166 .stroke-AB5{stroke:#F7F8FE;}
-		.d2-1296623166 .background-color-N1{background-color:#0A0F25;}
-		.d2-1296623166 .background-color-N2{background-color:#676C7E;}
-		.d2-1296623166 .background-color-N3{background-color:#9499AB;}
-		.d2-1296623166 .background-color-N4{background-color:#CFD2DD;}
-		.d2-1296623166 .background-color-N5{background-color:#DEE1EB;}
-		.d2-1296623166 .background-color-N6{background-color:#EEF1F8;}
-		.d2-1296623166 .background-color-N7{background-color:#FFFFFF;}
-		.d2-1296623166 .background-color-B1{background-color:#0D32B2;}
-		.d2-1296623166 .background-color-B2{background-color:#0D32B2;}
-		.d2-1296623166 .background-color-B3{background-color:#E3E9FD;}
-		.d2-1296623166 .background-color-B4{background-color:#E3E9FD;}
-		.d2-1296623166 .background-color-B5{background-color:#EDF0FD;}
-		.d2-1296623166 .background-color-B6{background-color:#F7F8FE;}
-		.d2-1296623166 .background-color-AA2{background-color:#4A6FF3;}
-		.d2-1296623166 .background-color-AA4{background-color:#EDF0FD;}
-		.d2-1296623166 .background-color-AA5{background-color:#F7F8FE;}
-		.d2-1296623166 .background-color-AB4{background-color:#EDF0FD;}
-		.d2-1296623166 .background-color-AB5{background-color:#F7F8FE;}
-		.d2-1296623166 .color-N1{color:#0A0F25;}
-		.d2-1296623166 .color-N2{color:#676C7E;}
-		.d2-1296623166 .color-N3{color:#9499AB;}
-		.d2-1296623166 .color-N4{color:#CFD2DD;}
-		.d2-1296623166 .color-N5{color:#DEE1EB;}
-		.d2-1296623166 .color-N6{color:#EEF1F8;}
-		.d2-1296623166 .color-N7{color:#FFFFFF;}
-		.d2-1296623166 .color-B1{color:#0D32B2;}
-		.d2-1296623166 .color-B2{color:#0D32B2;}
-		.d2-1296623166 .color-B3{color:#E3E9FD;}
-		.d2-1296623166 .color-B4{color:#E3E9FD;}
-		.d2-1296623166 .color-B5{color:#EDF0FD;}
-		.d2-1296623166 .color-B6{color:#F7F8FE;}
-		.d2-1296623166 .color-AA2{color:#4A6FF3;}
-		.d2-1296623166 .color-AA4{color:#EDF0FD;}
-		.d2-1296623166 .color-AA5{color:#F7F8FE;}
-		.d2-1296623166 .color-AB4{color:#EDF0FD;}
-		.d2-1296623166 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]></style><g id="x"><g class="shape" ><rect x="37.000000" y="76.000000" width="131.000000" height="118.000000" stroke="#0D32B2" fill="#F7F8FE" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><image href="https://icons.terrastruct.com/essentials%2F005-programmer.svg" x="104.000000" y="12.000000" width="59" height="59" /><text x="102.500000" y="97.000000" fill="#0A0F25" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">program</text></g><g id="y"><g class="shape" ><rect x="76.000000" y="264.000000" width="118.000000" height="118.000000" stroke="#0D32B2" fill="#F7F8FE" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><image href="https://icons.terrastruct.com/essentials%2Fprofits.svg" x="12.000000" y="293.500000" width="59" height="59" /><text x="165.500000" y="372.000000" fill="#0A0F25" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">profits</text></g><g id="(x -&gt; y)[0]"><marker id="mk-3488378134" markerWidth="10.000000" markerHeight="12.000000" refX="7.000000" refY="6.000000" viewBox="0.000000 0.000000 10.000000 12.000000" orient="auto" markerUnits="userSpaceOnUse"> <polygon points="0.000000,0.000000 10.000000,6.000000 0.000000,12.000000" fill="#0D32B2" class="connection fill-B1" stroke-width="2" /> </marker><path d="M 103.000000 196.000000 L 103.000000 260.000000" stroke="#0D32B2" fill="none" class="connection stroke-B1" style="stroke-width:2;" marker-end="url(#mk-3488378134)" mask="url(#d2-1296623166)" /></g><mask id="d2-1296623166" maskUnits="userSpaceOnUse" x="12" y="12" width="183" height="371">
-||||||| parent of 33280fed5 (fixed e2e tests)
-		.d2-1296623166 .fill-N1{fill:#0A0F25;}
-		.d2-1296623166 .fill-N2{fill:#676C7E;}
-		.d2-1296623166 .fill-N3{fill:#9499AB;}
-		.d2-1296623166 .fill-N4{fill:#CFD2DD;}
-		.d2-1296623166 .fill-N5{fill:#DEE1EB;}
-		.d2-1296623166 .fill-N6{fill:#EEF1F8;}
-		.d2-1296623166 .fill-N7{fill:#FFFFFF;}
-		.d2-1296623166 .fill-B1{fill:#0D32B2;}
-		.d2-1296623166 .fill-B2{fill:#0D32B2;}
-		.d2-1296623166 .fill-B3{fill:#E3E9FD;}
-		.d2-1296623166 .fill-B4{fill:#E3E9FD;}
-		.d2-1296623166 .fill-B5{fill:#EDF0FD;}
-		.d2-1296623166 .fill-B6{fill:#F7F8FE;}
-		.d2-1296623166 .fill-AA2{fill:#4A6FF3;}
-		.d2-1296623166 .fill-AA4{fill:#EDF0FD;}
-		.d2-1296623166 .fill-AA5{fill:#F7F8FE;}
-		.d2-1296623166 .fill-AB4{fill:#EDF0FD;}
-		.d2-1296623166 .fill-AB5{fill:#F7F8FE;}
-		.d2-1296623166 .stroke-N1{stroke:#0A0F25;}
-		.d2-1296623166 .stroke-N2{stroke:#676C7E;}
-		.d2-1296623166 .stroke-N3{stroke:#9499AB;}
-		.d2-1296623166 .stroke-N4{stroke:#CFD2DD;}
-		.d2-1296623166 .stroke-N5{stroke:#DEE1EB;}
-		.d2-1296623166 .stroke-N6{stroke:#EEF1F8;}
-		.d2-1296623166 .stroke-N7{stroke:#FFFFFF;}
-		.d2-1296623166 .stroke-B1{stroke:#0D32B2;}
-		.d2-1296623166 .stroke-B2{stroke:#0D32B2;}
-		.d2-1296623166 .stroke-B3{stroke:#E3E9FD;}
-		.d2-1296623166 .stroke-B4{stroke:#E3E9FD;}
-		.d2-1296623166 .stroke-B5{stroke:#EDF0FD;}
-		.d2-1296623166 .stroke-B6{stroke:#F7F8FE;}
-		.d2-1296623166 .stroke-AA2{stroke:#4A6FF3;}
-		.d2-1296623166 .stroke-AA4{stroke:#EDF0FD;}
-		.d2-1296623166 .stroke-AA5{stroke:#F7F8FE;}
-		.d2-1296623166 .stroke-AB4{stroke:#EDF0FD;}
-		.d2-1296623166 .stroke-AB5{stroke:#F7F8FE;}
-		.d2-1296623166 .background-color-N1{background-color:#0A0F25;}
-		.d2-1296623166 .background-color-N2{background-color:#676C7E;}
-		.d2-1296623166 .background-color-N3{background-color:#9499AB;}
-		.d2-1296623166 .background-color-N4{background-color:#CFD2DD;}
-		.d2-1296623166 .background-color-N5{background-color:#DEE1EB;}
-		.d2-1296623166 .background-color-N6{background-color:#EEF1F8;}
-		.d2-1296623166 .background-color-N7{background-color:#FFFFFF;}
-		.d2-1296623166 .background-color-B1{background-color:#0D32B2;}
-		.d2-1296623166 .background-color-B2{background-color:#0D32B2;}
-		.d2-1296623166 .background-color-B3{background-color:#E3E9FD;}
-		.d2-1296623166 .background-color-B4{background-color:#E3E9FD;}
-		.d2-1296623166 .background-color-B5{background-color:#EDF0FD;}
-		.d2-1296623166 .background-color-B6{background-color:#F7F8FE;}
-		.d2-1296623166 .background-color-AA2{background-color:#4A6FF3;}
-		.d2-1296623166 .background-color-AA4{background-color:#EDF0FD;}
-		.d2-1296623166 .background-color-AA5{background-color:#F7F8FE;}
-		.d2-1296623166 .background-color-AB4{background-color:#EDF0FD;}
-		.d2-1296623166 .background-color-AB5{background-color:#F7F8FE;}
-		.d2-1296623166 .color-N1{color:#0A0F25;}
-		.d2-1296623166 .color-N2{color:#676C7E;}
-		.d2-1296623166 .color-N3{color:#9499AB;}
-		.d2-1296623166 .color-N4{color:#CFD2DD;}
-		.d2-1296623166 .color-N5{color:#DEE1EB;}
-		.d2-1296623166 .color-N6{color:#EEF1F8;}
-		.d2-1296623166 .color-N7{color:#FFFFFF;}
-		.d2-1296623166 .color-B1{color:#0D32B2;}
-		.d2-1296623166 .color-B2{color:#0D32B2;}
-		.d2-1296623166 .color-B3{color:#E3E9FD;}
-		.d2-1296623166 .color-B4{color:#E3E9FD;}
-		.d2-1296623166 .color-B5{color:#EDF0FD;}
-		.d2-1296623166 .color-B6{color:#F7F8FE;}
-		.d2-1296623166 .color-AA2{color:#4A6FF3;}
-		.d2-1296623166 .color-AA4{color:#EDF0FD;}
-		.d2-1296623166 .color-AA5{color:#F7F8FE;}
-		.d2-1296623166 .color-AB4{color:#EDF0FD;}
-		.d2-1296623166 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]></style><g id="x"><g class="shape" ><rect x="37.000000" y="76.000000" width="131.000000" height="118.000000" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><image href="https://icons.terrastruct.com/essentials%2F005-programmer.svg" x="104.000000" y="12.000000" width="59" height="59" /><text x="102.500000" y="97.000000" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">program</text></g><g id="y"><g class="shape" ><rect x="76.000000" y="264.000000" width="118.000000" height="118.000000" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><image href="https://icons.terrastruct.com/essentials%2Fprofits.svg" x="12.000000" y="293.500000" width="59" height="59" /><text x="165.500000" y="372.000000" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">profits</text></g><g id="(x -&gt; y)[0]"><marker id="mk-3488378134" markerWidth="10.000000" markerHeight="12.000000" refX="7.000000" refY="6.000000" viewBox="0.000000 0.000000 10.000000 12.000000" orient="auto" markerUnits="userSpaceOnUse"> <polygon points="0.000000,0.000000 10.000000,6.000000 0.000000,12.000000" class="connection fill-B1" stroke-width="2" /> </marker><path d="M 103.000000 196.000000 L 103.000000 260.000000" fill="none" class="connection stroke-B1" style="stroke-width:2;" marker-end="url(#mk-3488378134)" mask="url(#d2-1296623166)" /></g><mask id="d2-1296623166" maskUnits="userSpaceOnUse" x="12" y="12" width="183" height="371">
-=======
 		.d2-788656292 .fill-N1{fill:#0A0F25;}
 		.d2-788656292 .fill-N2{fill:#676C7E;}
 		.d2-788656292 .fill-N3{fill:#9499AB;}
@@ -252,8 +89,7 @@
 		.d2-788656292 .color-AA4{color:#EDF0FD;}
 		.d2-788656292 .color-AA5{color:#F7F8FE;}
 		.d2-788656292 .color-AB4{color:#EDF0FD;}
-		.d2-788656292 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]></style><g id="x"><g class="shape" ><rect x="37.000000" y="76.000000" width="131.000000" height="118.000000" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><image href="https://icons.terrastruct.com/essentials%2F005-programmer.svg" x="104.000000" y="12.000000" width="59" height="59" /><text x="102.500000" y="97.000000" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">program</text></g><g id="y"><g class="shape" ><rect x="76.000000" y="264.000000" width="118.000000" height="118.000000" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><image href="https://icons.terrastruct.com/essentials%2Fprofits.svg" x="12.000000" y="293.500000" width="59" height="59" /><text x="165.500000" y="372.000000" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">profits</text></g><g id="(x -&gt; y)[0]"><marker id="mk-3488378134" markerWidth="10.000000" markerHeight="12.000000" refX="7.000000" refY="6.000000" viewBox="0.000000 0.000000 10.000000 12.000000" orient="auto" markerUnits="userSpaceOnUse"> <polygon points="0.000000,0.000000 10.000000,6.000000 0.000000,12.000000" class="connection fill-B1" stroke-width="2" /> </marker><path d="M 103.000000 196.000000 L 103.000000 260.000000" fill="none" class="connection stroke-B1" style="stroke-width:2;" marker-end="url(#mk-3488378134)" mask="url(#d2-788656292)" /></g><mask id="d2-788656292" maskUnits="userSpaceOnUse" x="12" y="12" width="183" height="371">
+		.d2-788656292 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]></style><g id="x"><g class="shape" ><rect x="37.000000" y="76.000000" width="131.000000" height="118.000000" stroke="#0D32B2" fill="#F7F8FE" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><image href="https://icons.terrastruct.com/essentials%2F005-programmer.svg" x="104.000000" y="12.000000" width="59" height="59" /><text x="102.500000" y="97.000000" fill="#0A0F25" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">program</text></g><g id="y"><g class="shape" ><rect x="76.000000" y="264.000000" width="118.000000" height="118.000000" stroke="#0D32B2" fill="#F7F8FE" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><image href="https://icons.terrastruct.com/essentials%2Fprofits.svg" x="12.000000" y="293.500000" width="59" height="59" /><text x="165.500000" y="372.000000" fill="#0A0F25" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">profits</text></g><g id="(x -&gt; y)[0]"><marker id="mk-3488378134" markerWidth="10.000000" markerHeight="12.000000" refX="7.000000" refY="6.000000" viewBox="0.000000 0.000000 10.000000 12.000000" orient="auto" markerUnits="userSpaceOnUse"> <polygon points="0.000000,0.000000 10.000000,6.000000 0.000000,12.000000" fill="#0D32B2" class="connection fill-B1" stroke-width="2" /> </marker><path d="M 103.000000 196.000000 L 103.000000 260.000000" stroke="#0D32B2" fill="none" class="connection stroke-B1" style="stroke-width:2;" marker-end="url(#mk-3488378134)" mask="url(#d2-788656292)" /></g><mask id="d2-788656292" maskUnits="userSpaceOnUse" x="12" y="12" width="183" height="371">
->>>>>>> 33280fed5 (fixed e2e tests)
 <rect x="12" y="12" width="183" height="371" fill="white"></rect>
 <rect x="72.500000" y="81.000000" width="60" height="21" fill="rgba(0,0,0,0.75)"></rect>
 <rect x="142.000000" y="356.000000" width="47" height="21" fill="rgba(0,0,0,0.75)"></rect>