diff --git a/README.md b/README.md
index f2b6c54..fbf1d69 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,7 @@
 # knightonline
 
-Knight Online Clone Project v1.0
\ No newline at end of file
+<<<<<<< HEAD
+Knight Online Clone Project v1.0
+=======
+Knight Online Clone Project
+>>>>>>> 191661329532817bf0e8da163c8ac248afc0cddd