diff --git a/file2 b/file2
index a7cd44b..0658220 100644
--- a/file2
+++ b/file2
@@ -1,6 +1,8 @@
 yet another file
 
-abhishek
+<<<<<<< HEAD
 this line will be shown in git diff and not in git diff --staged
 
-rahul
+Natansh
+
+
diff --git a/natansh.txt b/natansh.txt
new file mode 100644
index 0000000..a63042e
--- /dev/null
+++ b/natansh.txt
@@ -0,0 +1 @@
+this is a new file - natansh
\ No newline at end of file