adding a different thing on line 27 and merge it first to create merge conflict
Change-Id: I6f4fe962ef1469e34626966018b58f9820303217

rebase_testing_v4.model.lkml

diff --git a/rebase_testing_v4.model.lkml b/rebase_testing_v4.model.lkml
index 5501cfd..d84aa59 100644
--- a/rebase_testing_v4.model.lkml
+++ b/rebase_testing_v4.model.lkml
@@ -23,3 +23,5 @@
 
 
 ## Adding something on model file via non-conflicted-commit-v1
+
+## adding a different thing on line 27 and merge it first to create merge conflict