resolving merge conlict Change-ID:4eaf4e5f3ae8
diff --git a/test.view.lkml b/test.view.lkml
index ed69d55..afb8ecb 100644
--- a/test.view.lkml
+++ b/test.view.lkml
@@ -2,6 +2,8 @@
   #Paola Gerrit Test 100000
   #Paola Gerrit Test 200000
   #Paola Gerrit Test 300000
+  #Paola Gerrit Test 400000
+  # Testing
   #Mohamed Gerrit Test 400000
   #Mohamed Gerrit Test 50000
   #Mohamed Gerrit Test 60