non_merge_conflict_view
diff --git a/non-merge-conflict-view.view.lkml b/non-merge-conflict-view.view.lkml
new file mode 100644
index 0000000..71e902a
--- /dev/null
+++ b/non-merge-conflict-view.view.lkml
@@ -0,0 +1,5 @@
+view: non_merge_conflict_view {
+
+# non_merge_conflict_view
+
+}