diff --git a/inbox.md b/inbox.md
index 2101c12..06a36d1 100644
--- a/inbox.md
+++ b/inbox.md
@@ -1,19 +1,15 @@
-<<<<<<< HEAD
 CSC Study Things:
 Repo & Reverse Repo
 
 =======
-<<<<<<< HEAD
 STOAT: mobile/desktop apps, music bots, gifs
 make sure AWS doesn't charge
 wiki and blog
 Sergei's PDF & Discord networking challenge
 =======
->>>>>>> 30e0573572bf2f74c80ecef3c74c96121630fd69
 maybe add work experience to resume
 maybe change resume to be for tech support
 Discord networking challenge
->>>>>>> 6347eca7b71b9e05471fbc5fb8184d36de09b6f8
 electronics books/art of programming (I want this, but it's not necessary)
 nivm debugger/double cursor
 weekday visible somewhere in waybar