diff --git a/README.md b/README.md
index 4e28b37..f4a3637 100644
--- a/README.md
+++ b/README.md
@@ -1 +1,5 @@
+<<<<<<< HEAD
 # BasicJavaExamplesupdated readme
+=======
+testinh
+>>>>>>> new feature in this branch
diff --git a/diff.txt b/diff.txt
new file mode 100644
index 0000000..a79b8ec
--- /dev/null
+++ b/diff.txt
@@ -0,0 +1,7 @@
+diff --git a/README.md b/README.md
+index 4e28b37..743307b 100644
+--- a/README.md
++++ b/README.md
+@@ -1 +1,2 @@
+ # BasicJavaExamplesupdated readme
++check difference
diff --git a/file.txt b/file.txt
new file mode 100644
index 0000000..3e23ae4
--- /dev/null
+++ b/file.txt
@@ -0,0 +1,2 @@
+
+hello