diff --git a/conflict.txt b/conflict.txt
new file mode 100644
index 0000000..cb248c0
--- /dev/null
+++ b/conflict.txt
@@ -0,0 +1,2 @@
+This line is from ex15 branch
+This line is from master branch
diff --git a/xyz test b/xyz test
new file mode 100644
index 0000000..514031a
--- /dev/null
+++ b/xyz test	
@@ -0,0 +1 @@
+mic testing