diff --git a/readme.md b/readme.md
index c4009b7468..e94f936efc 100644
--- a/readme.md
+++ b/readme.md
@@ -7,7 +7,11 @@ Welcome to **EpicNabbo 2.0**, a powerful and highly optimized catalogue system d
 
 ---
 
+<<<<<<< Updated upstream
 ## 🚀 Status: Stable
+=======
+## 🚀 Status: Stable not done
+>>>>>>> Stashed changes
 
 EpicNabbo 2.0 has undergone extensive testing to ensure that the core database handling, page rendering, and item structures are completely **stable** for production environments. You can rely on this version for day-to-day operations without worrying about critical crashes or data corruption.