adding something on line35
Change-Id: Ic74097be6fd352100bda4c4fdb32d17868b8cc85

Change-Id: If5d3511291f5f5f4e236dc1e0fca104be508b0e7

rebase_testing_v4.model.lkml

diff --git a/rebase_testing_v4.model.lkml b/rebase_testing_v4.model.lkml
index ca62554..20274f1 100644
--- a/rebase_testing_v4.model.lkml
+++ b/rebase_testing_v4.model.lkml
@@ -32,4 +32,7 @@
 
 ## adding something on line33
 
+
 ## adding something different on line 35 to create merge conflict
+
+## adding something on line35