diff --git a/journals/2023_07_03.md b/journals/2023_07_03.md
index b4989919..6fba735a 100644
--- a/journals/2023_07_03.md
+++ b/journals/2023_07_03.md
@@ -1,11 +1,5 @@
-<<<<<<< HEAD
 - Fixing 'Umount Target is Busy' Error in Linux
 	- https://linuxhandbook.com/umount-target-busy/#:~:text=this%20problem%20first.-,The%20reason%20behind%20Umount%20target%20is%20busy,t%20allow%20you%20to%20unmount.
 	- ``sudo lsof /mnt/ext-fast``
 		- samba is the culprit
-	- `` sudo service smbd stop``
-	-
-=======
--
--
->>>>>>> 522cf26 (Auto saved by Logseq)
+	- `` sudo service smbd stop``
\ No newline at end of file