diff --git a/CNAME b/CNAME
new file mode 100644
index 0000000..f721f26
--- /dev/null
+++ b/CNAME
@@ -0,0 +1 @@
+sangyufeiwan.com
\ No newline at end of file
diff --git a/README.md b/README.md
index 69b95a4..ff53324 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
简体中文 | [English](./README_EN.md)
> [!IMPORTANT]
@@ -246,3 +247,21 @@ if (type == 0) {
[](https://star-history.com/#imsyy/home&Date)
+=======
+## Hi there 👋
+
+
+>>>>>>> sangyu520/main