creating merge conflict
Change-Id: Ie946babc70e1715a8aaae82dc90871af03a2795f

rebase_testing_v5.model.lkml

diff --git a/rebase_testing_v5.model.lkml b/rebase_testing_v5.model.lkml
index e5db227..1c6177f 100644
--- a/rebase_testing_v5.model.lkml
+++ b/rebase_testing_v5.model.lkml
@@ -5,3 +5,5 @@
 ## adding something on line 5
 
 ## adding something on line 7
+
+## creating merge conflict