diff --git a/inequality/theil.py b/inequality/theil.py
index 500e64d..0b29869 100644
--- a/inequality/theil.py
+++ b/inequality/theil.py
@@ -1,6 +1,9 @@
 """Theil Inequality metrics"""
 
+<<<<<<< HEAD
 
+=======
+>>>>>>> 5ae825e (author)
 __author__ = "Sergio J. Rey <srey@sdsu.edu>"
 
 import numpy