adding account_id to trigger merge conflict on merge_conflict _branch
Change-Id: I0cf70106ede5d994551e55b2021b75430f4d97cf

rebase_testing_v2.view.lkml

diff --git a/rebase_testing_v2.view.lkml b/rebase_testing_v2.view.lkml
index 641f405..cbbf3ff 100644
--- a/rebase_testing_v2.view.lkml
+++ b/rebase_testing_v2.view.lkml
@@ -2,4 +2,8 @@
 
 ## adding something on line 3 -shared branch
 
+##. dimension: account_id {
+##    sql: ${TABLE}.account_id ;;
+##. }
+
 }