overwritting something on other branch to create merge conflict

rebase_testing_v6.model.lkml

diff --git a/rebase_testing_v6.model.lkml b/rebase_testing_v6.model.lkml
index 94706c4..29af7d9 100644
--- a/rebase_testing_v6.model.lkml
+++ b/rebase_testing_v6.model.lkml
@@ -1 +1,3 @@
 connection: "l4c_testing"
+
+## overwritting something on other branch to create merge conflict