diff --git a/dev.txt b/dev.txt
index 2527b0a..32027d6 100644
--- a/dev.txt
+++ b/dev.txt
@@ -1 +1,2 @@
 a new file in branch dev
+hello add a line
diff --git a/new.txt b/new.txt
new file mode 100644
index 0000000..ffd4024
--- /dev/null
+++ b/new.txt
@@ -0,0 +1 @@
+add a file "new.txt"
diff --git a/readme.txt b/readme.txt
index a9bc64e..46f6b9c 100644
--- a/readme.txt
+++ b/readme.txt
@@ -1,10 +1,4 @@
-git is a distributed version control system.
-git is free software unter the GPL
-a new line added
-git has mutable index called stage.
-git tracks changes.
-<<<<<<< HEAD
-new test
-=======
-git tracks changes of files.
->>>>>>> b3221380b0291a631ba9b4d70ef8d6fcdb171661
+Just a Test
+===
+
+a line 
diff --git a/test.txt b/test.txt
index beed9e7..e8f384c 100644
--- a/test.txt
+++ b/test.txt
@@ -1,3 +1,8 @@
 a test file
 new
 
+int fun(){
+}
+
+int main(){
+}