diff --git a/journal/2021-09-30.md b/journal/2021-09-30.md
index 8ea001849..5f2656925 100644
--- a/journal/2021-09-30.md
+++ b/journal/2021-09-30.md
@@ -7,9 +7,6 @@
 
 - Just got out of work -- it was a sleepy day, not super productive but getting at least some things done.
 - [[guaranteed income]]
-<<<<<<< HEAD
+- [[an agora]]
 
 Me gusta la estática [[I like static]].
-=======
-- [[an agora]]
->>>>>>> 0d9842d722cb58cb0ff1942c8315cfe7f4a98398
diff --git a/roxanne gay.md b/roxanne gay.md
new file mode 100644
index 000000000..155d31690
--- /dev/null
+++ b/roxanne gay.md	
@@ -0,0 +1,2 @@
+# roxanne gay
+