adding something line 4 via testing_branch_for_non_conflict_commit ==> Should be no merge
Change-Id: If110d796d930e676cb53c6e91a1e8dd6e785329b

new_view.view.lkml

diff --git a/new_view.view.lkml b/new_view.view.lkml
index 6d90434..45c55cc 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 testing_branch_for_non_conflict_commit ==> Should be no merge
 
 }