diff --git a/test.view.lkml b/test.view.lkml
index 826bcb5..b71de3d 100644
--- a/test.view.lkml
+++ b/test.view.lkml
@@ -3,4 +3,6 @@
      ## Hello team, you are awesome!!
      ## Paola is awesome since she is reviewing my CL
 
+     # adding a merge conflict
+
 }