change file as base for merge conflict

XukunXiang · XukunXiang · commit e33632b9d88d · 2024-11-26T22:40:35.000+01:00
diff --git a/README.md b/README.md
@@ -281,4 +281,5 @@ Code of
 Conduct](https://contributor-covenant.org/version/2/1/CODE_OF_CONDUCT.html).
 By contributing to this project, you agree to abide by its terms.
 
-# just for testing
+# just for demo
+# I want to change this line
