diff --git a/reg_expr_2_operators.py b/reg_expr_2_operators.py
index fe929ec..96fe408 100644
--- a/reg_expr_2_operators.py
+++ b/reg_expr_2_operators.py
@@ -8,10 +8,14 @@ import re
      '+' matches all characters that follow (1 or more)
      '?' makes the previous character optional
      '{4}' previous character must match exactly 4 times
+<<<<<<< HEAD
      '{2-4}' previous character must match exactly 2-4 times
      '[0-9]' matches all characters in the set of numbers 0 to 9
      '[A-Z]' matches all characters in the set of A to Z
  
+=======
+     '{2-4}' previous character must match exactly 2-4 times  
+>>>>>>> 27283e2422d4773456419bf7cb8ee6845a54aff6
 '''
 
 data = '''2013-01-01