new_view.view.lkml

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

}