adding something line 4 via new-branch_123 ==> Should be no merge conflict
Change-Id: I6b3bfb3181a3991d336bcea9c674aad114c5e54a

new_view.view.lkml

diff --git a/new_view.view.lkml b/new_view.view.lkml
index 6d90434..570df13 100644
--- a/new_view.view.lkml
+++ b/new_view.view.lkml
@@ -1,5 +1,6 @@
 view: new_view {
 
 ## Adding something on line 3 - This is a new view
+## adding something line 4 via new-branch_123 ==> Should be no merge conflict
 
 }