diff --git a/README.md b/README.md
index 79ccf8b34..daa77b5c6 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 <p align="center">
   <a href="https://opencode.ai">
     <picture>
@@ -139,3 +140,7 @@ It's very similar to Claude Code in terms of capability. Here are the key differ
 ---
 
 **Join our community** [Discord](https://discord.gg/opencode) | [X.com](https://x.com/opencode)
+=======
+# opencode_offline
+
+>>>>>>> 3fb665ae808161d7bb783129b8ee6ee0ee2cc9bf