diff --git a/test05 b/test05
index da3c3c9..fc440a6 100644
--- a/test05
+++ b/test05
@@ -1,2 +1,6 @@
-test05 file
-more text here
\ No newline at end of file
+
+
+test05 file after fix conflict
+
+test05 file changed
+
diff --git a/test07 b/test07
new file mode 100644
index 0000000..49d8dc5
--- /dev/null
+++ b/test07
@@ -0,0 +1 @@
+test07 
\ No newline at end of file
diff --git a/test08 b/test08
new file mode 100644
index 0000000..1db9f1b
--- /dev/null
+++ b/test08
@@ -0,0 +1 @@
+file test08 
diff --git a/test09 b/test09
new file mode 100644
index 0000000..b6857ef
--- /dev/null
+++ b/test09
@@ -0,0 +1 @@
+file test09
diff --git a/test10 b/test10
new file mode 100644
index 0000000..7323ce1
--- /dev/null
+++ b/test10
@@ -0,0 +1,2 @@
+test10
+test rebase command 
diff --git a/test11 b/test11
new file mode 100644
index 0000000..496b6d5
--- /dev/null
+++ b/test11
@@ -0,0 +1,2 @@
+test11
+