diff --git a/rebase_testing_v4.model.lkml b/rebase_testing_v4.model.lkml
index 87ad905..ca62554 100644
--- a/rebase_testing_v4.model.lkml
+++ b/rebase_testing_v4.model.lkml
@@ -31,3 +31,5 @@
 ## adding a new codes
 
 ## adding something on line33
+
+## adding something different on line 35 to create merge conflict