diff --git a/hello.txt b/hello.txt
new file mode 100644
index 0000000..da579e4
--- /dev/null
+++ b/hello.txt
@@ -0,0 +1,3 @@
+I have added this new file
+commit for mixed
+new commit for 3merging
\ No newline at end of file
diff --git a/pr-example.txt b/pr-example.txt
new file mode 100644
index 0000000..4714763
--- /dev/null
+++ b/pr-example.txt
@@ -0,0 +1 @@
+this is pull request
\ No newline at end of file
diff --git a/rebasingbranch.txt b/rebasingbranch.txt
new file mode 100644
index 0000000..f12fa40
--- /dev/null
+++ b/rebasingbranch.txt
@@ -0,0 +1 @@
+rebasing file
\ No newline at end of file
diff --git a/test-branch1.txt b/test-branch1.txt
new file mode 100644
index 0000000..f1f9b98
--- /dev/null
+++ b/test-branch1.txt
@@ -0,0 +1,8 @@
+this is the branch1
+<<<<<<< HEAD
+Hello from resolvingbranch
+Hello from main 
+=======
+Hello from resolvingbranch
+>>>>>>> resolvingbranch
+rebasing file
\ No newline at end of file
diff --git a/test-branch2.txt b/test-branch2.txt
new file mode 100644
index 0000000..f529af9
--- /dev/null
+++ b/test-branch2.txt
@@ -0,0 +1 @@
+this is the branch2 
\ No newline at end of file