diff --git a/content/Shopping.md b/content/Shopping.md
index c375bd966..139597f9c 100644
--- a/content/Shopping.md
+++ b/content/Shopping.md
@@ -1,18 +1,2 @@
-Indian
-Pork chops
-Pork noodles
-
-Rice
-Milk
-Chips
-Tomatoes Tim plus fresh
-Mushroom
 
 
-Sun, venison pasta
-Mon chops
-Tue nachos
-Wed pork noodle
-Thur sausages
-Fri curry
-
diff --git a/content/Shopping.sync-conflict-20230118-170424-PV7R7AH.md b/content/Shopping.sync-conflict-20230118-170424-PV7R7AH.md
new file mode 100644
index 000000000..c375bd966
--- /dev/null
+++ b/content/Shopping.sync-conflict-20230118-170424-PV7R7AH.md
@@ -0,0 +1,18 @@
+Indian
+Pork chops
+Pork noodles
+
+Rice
+Milk
+Chips
+Tomatoes Tim plus fresh
+Mushroom
+
+
+Sun, venison pasta
+Mon chops
+Tue nachos
+Wed pork noodle
+Thur sausages
+Fri curry
+
diff --git a/content/notes/media.md b/content/notes/media.md
index aa24091a1..92a7998b6 100644
--- a/content/notes/media.md
+++ b/content/notes/media.md
@@ -24,9 +24,9 @@ tags:
 	- a midsummer nights dream, shakespeare
 	- the amazing maurice and his educated rodents, terry pratchet
 	- the ocean at the end of the lane
+	- the curious case of the dog in the night time
 - current
 	- cryptonomicon, neal stephenson
-	- the curious case of the dog in the night time
 	- thinking fast and slow
 	- the second sex, simone de beauvoir
 - future
@@ -34,6 +34,7 @@ tags:
 	- woman in the dunes
 	- sophies world
 	- on the trail of genghis khan
+	- A psalm for the wild built
 
 # Podcasts
 - [philosophize-this](notes/philosophize-this.md)
diff --git a/content/notes/travel.md b/content/notes/travel.md
index 34c22e212..5cb8459d7 100644
--- a/content/notes/travel.md
+++ b/content/notes/travel.md
@@ -19,18 +19,17 @@ Japan stage 2 25th -
 ~~other (accom, transport, passes): 1800~~ paid
 
 asses
-- 2700 bank
+- 2000 bank
 - 2000 project
-- 1500 studylink (1000 course related costs + 500 living costs)
-total 6200
+- 500 studylink
+total 4500
 
 expenses:
 - japan 3500
 - rent 960
-- insurance 480
-total: 4940
+- ~~insurance 480~~ paid
+total: 4460
 
-leftover: 1260
 
 # Utah