please add anything below this line
Change-Id: I287ba9da44168a657bab34b7b7670e40ac541e21

rebase_testing_v5.model.lkml

diff --git a/rebase_testing_v5.model.lkml b/rebase_testing_v5.model.lkml
index 1c6177f..648433b 100644
--- a/rebase_testing_v5.model.lkml
+++ b/rebase_testing_v5.model.lkml
@@ -6,4 +6,6 @@
 
 ## adding something on line 7
 
+## please add anything below this line
+
 ## creating merge conflict