diff --git a/conflictFile.js b/conflictFile.js
new file mode 100644
index 0000000..15b8b08
--- /dev/null
+++ b/conflictFile.js
@@ -0,0 +1,9 @@
+var foo = "lalala";
+
+if (foo === "lalala") {
+	console.log("foo");
+} else {
+	console.log("nah dawg");
+}
+
+foo += " ich verstehe nicht";
\ No newline at end of file
diff --git a/test.txt b/test.txt
index 06b9862..39dafef 100644
--- a/test.txt
+++ b/test.txt
@@ -1 +1 @@
-asdfasdfasdfasdfaasdfaasdfasdfasdfasdfasdfasdfasdfaaaaaaaaaaaaaaaaa
\ No newline at end of file
+asdfasdfasdfasdfaasdfa
diff --git a/walletIsTheBest.txt b/walletIsTheBest.txt
new file mode 100644
index 0000000..5440533
--- /dev/null
+++ b/walletIsTheBest.txt
@@ -0,0 +1,24 @@
+diff
+diff
+diff
+diff
+diff
+diff
+diff
+diff
+diff
+diff
+diff
+diff
+diff
+diff
+diff
+diff
+diff
+diff
+diff
+diff
+diff
+diff
+diff
+diff