mc Change-Id: I6c92797084891904aa5af80ced445336b4047e98
diff --git a/rebase_testing_v5.model.lkml b/rebase_testing_v5.model.lkml index 81e0649..f316b28 100644 --- a/rebase_testing_v5.model.lkml +++ b/rebase_testing_v5.model.lkml
@@ -11,3 +11,5 @@ ## creating merge conflict ## please add anything below this line + +## adding something different to line 15 to crete merge conflict on branch-4