adding something on line 1
diff --git a/model.model.lkml b/model.model.lkml
index 65bc469..4dd261d 100644
--- a/model.model.lkml
+++ b/model.model.lkml
@@ -1,3 +1,5 @@
+## adding something to the first line to move everything 1 line down to see if it triggers a conflict
+
 connection: "l4c_testing"
 
 ## Adding a new line