diff --git a/.obsidian/appearance.json b/.obsidian/appearance.json
index b7ae1ef..7a919d3 100644
--- a/.obsidian/appearance.json
+++ b/.obsidian/appearance.json
@@ -1,6 +1,6 @@
 {
   "accentColor": "#1291a9",
   "textFontFamily": "Domaine Text",
-  "baseFontSize": 20,
+  "baseFontSize": 15,
   "baseFontSizeAction": true
 }
\ No newline at end of file
diff --git a/.obsidian/workspace-mobile.json b/.obsidian/workspace-mobile.json
index 9015622..7f24522 100644
--- a/.obsidian/workspace-mobile.json
+++ b/.obsidian/workspace-mobile.json
@@ -13,13 +13,13 @@
             "state": {
               "type": "markdown",
               "state": {
-                "file": "content/posts/Using Hugo to generate a podcast feed.md",
+                "file": "content/week-notes/028.md",
                 "mode": "source",
                 "source": false,
                 "backlinks": false
               },
               "icon": "lucide-file",
-              "title": "Using Hugo to generate a podcast feed"
+              "title": "028"
             }
           }
         ]
@@ -133,6 +133,7 @@
   },
   "active": "df152da4c3c17af0",
   "lastOpenFiles": [
+    "content/posts/Using Hugo to generate a podcast feed.md",
     "content/week-notes/028.md",
     "themes/neverhungoveragain/assets/css/syntax.css",
     "public/week-notes/028/index.html",
@@ -144,7 +145,6 @@
     "public/posts/hosting-a-podcast-for-pennies-a-day/index.html",
     "public/posts/hosting-a-podcast-for-pennies-a-day",
     "public/hugo-podcast/index.html",
-    "content/posts/Using Hugo to generate a podcast feed.md",
     "content/posts/turning 30.md",
     "content/week-notes/027.md",
     "content/week-notes/026.md",
diff --git a/.obsidian/workspace.json b/.obsidian/workspace.json
index 77c5373..3bd2655 100644
--- a/.obsidian/workspace.json
+++ b/.obsidian/workspace.json
@@ -8,18 +8,17 @@
         "type": "tabs",
         "children": [
           {
-            "id": "cf03b0656e0056cc",
+            "id": "8b1d7f8281789803",
             "type": "leaf",
             "state": {
-              "type": "markdown",
+              "type": "split-diff-view",
               "state": {
-                "file": "content/week-notes/028.md",
-                "mode": "source",
-                "source": false,
-                "backlinks": false
+                "aFile": "conflict-files-obsidian-git.md",
+                "bFile": "conflict-files-obsidian-git.md",
+                "aRef": ""
               },
-              "icon": "lucide-file",
-              "title": "028"
+              "icon": "diff",
+              "title": "Diff: conflict-files-obsidian-git"
             }
           }
         ]
@@ -158,10 +157,11 @@
       "obsidian-git:Open Git source control": false
     }
   },
-  "active": "cf03b0656e0056cc",
+  "active": "8b1d7f8281789803",
   "lastOpenFiles": [
-    "content/posts/Intentional Listening.md",
     "content/week-notes/028.md",
+    "conflict-files-obsidian-git.md",
+    "content/posts/Intentional Listening.md",
     "content/week-notes/027.md",
     "content/posts/Using Hugo to generate a podcast feed.md",
     "syntax_dark.css",
@@ -194,7 +194,6 @@
     "content/week-notes/011.md",
     "content/week-notes/012.md",
     "content/week-notes/013.md",
-    "content/week-notes/014.md",
-    "content/week-notes/015.md"
+    "content/week-notes/014.md"
   ]
 }
\ No newline at end of file
diff --git a/content/week-notes/028.md b/content/week-notes/028.md
index 726b980..8985f28 100644
--- a/content/week-notes/028.md
+++ b/content/week-notes/028.md
@@ -30,5 +30,9 @@ I chatted with my sister about music a bit and we reminisced about Paramore —
 3. **Emergency** - I also still really like this song. Josh Farro is an ass but the guitar on this song smashes.
 4. **Brighter** - I recall being a diehard for this song as a teen; today, I find it a little fatiguing to listen to. That might be in the mix, and I really like the outro still, but it's a notable downturn after the Pressure-Emergency one-two.
 5. **Here We Go Again** - This one feels like a bit of a recall of the band's funk roots. I still really love this song. I remember being a fan of an acoustic live performance someone had put on YouTube. Farro really did have an ear for a catchy guitar hook.
+=======
+As part of trying to get back into listening to podcasts, too, here are the episodes I listened to this week:
+* Cyberpunk 2077 from BGM Gems - a little challenging to listen to because I've never played Cyberpunk nor listened to the soundtrack, but I really appreciate the conversations, and I think highlighting music in games and using it as a lens to discuss them is a rad concept for a show. Excited to hear more!
+>>>>>>> origin/master
 
 [^1]: I had [similar beef](https://cassie.ink/week-notes/021/) with Mac Miller's *Circles*.
\ No newline at end of file