diff --git a/metobs/data/solar_position.py b/metobs/data/solar_position.py
index 5954e470c61e726aa97adc6ba4d7e6d27d055666..a2405ab8cb1705b3b7863f997b0790a5195eb649 100644
--- a/metobs/data/solar_position.py
+++ b/metobs/data/solar_position.py
@@ -69,7 +69,12 @@ https://cvs.ssec.wisc.edu/cgi-bin/cvsweb.cgi/java/tower/SolarPosition.java
 
 __docformat__ = 'restructuredtext en'
 
+<<<<<<< Updated upstream
 from metobs.data import NaN, util
+=======
+from metobs import mytime
+from metobs.data import NaN
+>>>>>>> Stashed changes
 import math
 
 _days = ["Sunday","Monday","Tuesday","Wednesday","Thursday","Friday","Saturday"]