committing 1st changes
Change-Id: I67b95747e244bdbb74de5f12304e728a1bc5338e

Change-Id: I683b998b9b13dc620ed9fc2c7c2af4eb2e75e24f

rebase_testing_v4.model.lkml

diff --git a/rebase_testing_v4.model.lkml b/rebase_testing_v4.model.lkml
index d84aa59..816521c 100644
--- a/rebase_testing_v4.model.lkml
+++ b/rebase_testing_v4.model.lkml
@@ -25,3 +25,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
+
+## adding something on line 29