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