adding something on line 37
Change-Id: I2f08fe293019dbeec0d5ec81375b318f1f7c4fef

Change-Id: I9751596fdaa89d1b95b0b5c0df00ca36182e60a0
diff --git a/rebase_testing_v4.model.lkml b/rebase_testing_v4.model.lkml
index 183293e..361a6ba 100644
--- a/rebase_testing_v4.model.lkml
+++ b/rebase_testing_v4.model.lkml
@@ -34,4 +34,4 @@
 
 ## adding something different on line 35 to create merge conflict
 
-## [Line37]
+## [Line37] ## adding something on line 37