diff --git a/README.md b/README.md
index 5396590..76ab5d7 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 # Hello World - Bun.js
 
 A simple Hello World application built with Bun.js.
@@ -46,3 +47,8 @@ docker pull <your-gitea-url>/<owner>/<repo>:latest
 ```
 Hello World! 🌍
 ```
+=======
+
+
+Test
+>>>>>>> origin/main