diff --git a/Flag_of_Maryland.svg b/Flag_of_Maryland.svg
new file mode 100644
index 000000000..00f22b826
--- /dev/null
+++ b/Flag_of_Maryland.svg
@@ -0,0 +1,23 @@
+<svg viewBox="0 0 36 24" width="750" height="500" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+
+<defs>
+<path id="cross" transform="scale(.024)" d="M0,215 a32 32 0 0 0 32 -32 v-16 h31 a32 32 0 0 0 0 -64 h-31 V32 H231 v31 a32 32 0 0 0 64 0 v-31 h28 a32 32 0 0 0 32 -32 L0,0 z"/>
+</defs>
+
+<rect fill="#000" width="36" height="24"/>
+<path fill="#eaaa00" d="M0,24 V2 L3,4 V24 h3 V0 h3 V24 h3 V0 h3 V24 h3 V0 h3 V24 h3 V0 h3 V24 h3 V0 h3 V24 h3 V22 L3,0 V4 L33,24 z"/>
+
+<g id="q2">
+<path fill="#fff" d="M18,0 h9 v12 h9 v-6 h-18 z"/>
+<path fill="#9d2235" d="M27,0 h9 v6 h-18 v6 h9 z"/>
+<g transform="translate(27,6)">
+<use fill="#9d2235" xlink:href="#cross"/>
+<use fill="#fff" transform="scale(-1 1)" xlink:href="#cross"/>
+<use fill="#fff" transform="scale(1 -1)" xlink:href="#cross"/>
+<use fill="#9d2235" transform="scale(-1)" xlink:href="#cross"/>
+</g>
+</g>
+
+<use id="q3" x="-18" y="12" xlink:href="#q2"/>
+
+</svg>
\ No newline at end of file
diff --git a/Flag_of_Maryland.svg.png b/Flag_of_Maryland.svg.png
new file mode 100644
index 000000000..096415e7f
Binary files /dev/null and b/Flag_of_Maryland.svg.png differ
diff --git a/journal/2023-03-25.md b/journal/2023-03-25.md
index dd2235cd7..0954daf9a 100644
--- a/journal/2023-03-25.md
+++ b/journal/2023-03-25.md
@@ -1,7 +1,5 @@
 - [[flancia]]
-<<<<<<< HEAD
   - [[yoga with x]]
-=======
   - [[flancia meet]] was live with [[mpd]] and [[venisa]] :)
 - There's a variety of things I'd like to make progress on today, here go a few.
   - [ ] answer [[mb]]
@@ -19,4 +17,3 @@
     - it shouldn't be too hard to get a recipe put together for [[coop cloud]], and it'd be cool
   - [ ] fix hedgedoc error condition, e.g. https://github.com/flancia-coop/doc.anagora.org/commit/be8d8ea000b33e0c90799a8420ca3dc1dab5d145
 - Then I plan to go to [[pall]]'s party :)
->>>>>>> 1d984c07c1742628dd360243822a9a6df8ae6171
diff --git a/las-jaras.jpg b/las-jaras.jpg
new file mode 100644
index 000000000..7fa36b939
Binary files /dev/null and b/las-jaras.jpg differ