diff --git a/diff.txt b/diff.txt
new file mode 100644
index 0000000..45b983b
--- /dev/null
+++ b/diff.txt
@@ -0,0 +1 @@
+hi
diff --git a/feature-b.ts b/feature-b.ts
new file mode 100644
index 0000000..66a3eb9
--- /dev/null
+++ b/feature-b.ts
@@ -0,0 +1 @@
+feature B code
diff --git a/test.txt b/test.txt
index b348989..ed9edf5 100644
--- a/test.txt
+++ b/test.txt
@@ -6,3 +6,4 @@ wowie
 hi
 test
 conflicting change
+another line