diff --git a/journals/2023_05_22.md b/journals/2023_05_22.md
index bdc34240..1194a396 100644
--- a/journals/2023_05_22.md
+++ b/journals/2023_05_22.md
@@ -1,5 +1,3 @@
-<<<<<<< HEAD
-
 - [[English Lesson]]
 	- modern business English expressions
 		- **“could you give me a ballpark figure?”**
@@ -41,7 +39,6 @@
 			- how do you ask your manager if that's okay to do so?
 				- I've got an idea that I like** to run up the flagpole**, if that's okay?
 				- I've got an idea that I'd like to **throw in the fire,** if that's okay.
-		- =======
 - Verkauf ebay-kleinanzeigen
 	- #+BEGIN_QUOTE
 	  Zu Verkauf steht eine Garmin Forerunner 965 in weiß. Habe mittlerweile die kleinere Variante...