diff --git a/conflictFile.txt b/conflictFile.txt
new file mode 100644
index 0000000..f217a1c
--- /dev/null
+++ b/conflictFile.txt
@@ -0,0 +1,2 @@
+asdfaaaaaaaaaaaaa
+aaaaaaaaaa
diff --git a/test.txt b/test.txt
index 19e26ce..06b9862 100644
--- a/test.txt
+++ b/test.txt
@@ -1 +1 @@
-asdfasdfasdfasdf
\ No newline at end of file
+asdfasdfasdfasdfaasdfaasdfasdfasdfasdfasdfasdfasdfaaaaaaaaaaaaaaaaa
\ No newline at end of file