diff --git a/aid_github_practice b/aid_github_practice
new file mode 100644
index 0000000..44669ee
--- /dev/null
+++ b/aid_github_practice
@@ -0,0 +1 @@
+new_file_hello
diff --git a/test.txt b/test.txt
index 42a89d3..f4713ce 100644
--- a/test.txt
+++ b/test.txt
@@ -1 +1,5 @@
-qwqwq
+<<<<<<< HEAD
+main_hello
+=======
+hello
+>>>>>>> mylocal