diff --git a/Conflict.txt b/Conflict.txt
new file mode 100644
index 0000000..e11f06c
--- /dev/null
+++ b/Conflict.txt
@@ -0,0 +1,2 @@
+hello!
+Im a conflict
\ No newline at end of file