diff --git a/doc/git-test.txt b/doc/git-test.txt
index 0aa9fa2..577566c 100644
--- a/doc/git-test.txt
+++ b/doc/git-test.txt
@@ -1 +1,6 @@
+<<<<<<< HEAD
+这是一个Git测试文件
+这是一个zhanglin_branch分支添加的内容
+=======
 这是一个master分支添加的内容
+>>>>>>> master
diff --git a/src/DateTimePickerDialog.java b/src/DateTimePickerDialog.java
index e69de29..75b701b 100644
--- a/src/DateTimePickerDialog.java
+++ b/src/DateTimePickerDialog.java
@@ -0,0 +1 @@
+//This is a test comment