diff --git a/dan.txt b/dan.txt
index 33d8047..075c326 100644
--- a/dan.txt
+++ b/dan.txt
@@ -1 +1,3 @@
 this is a new file only in my branch
+
+changing something that won't conflict in master
diff --git a/e.txt b/e.txt
index d9083b7..e3ef1bf 100644
--- a/e.txt
+++ b/e.txt
@@ -1,3 +1,3 @@
 e
 
-Minor Change
+MiNor Change