diff --git a/src/unitgrade_devel.egg-info/PKG-INFO b/src/unitgrade_devel.egg-info/PKG-INFO
index fddaac79657d83de0037569edfd48426df81fd1b..33c1164e1b9d1de8155d7fa799f2fabbb7ccc03a 100644
--- a/src/unitgrade_devel.egg-info/PKG-INFO
+++ b/src/unitgrade_devel.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: unitgrade-devel
-Version: 0.1.60
+Version: 0.1.61
 Summary: A set of tools to develop unitgrade tests and reports and later evaluate them
 Home-page: https://lab.compute.dtu.dk/tuhe/unitgrade_private
 Author: Tue Herlau
diff --git a/src/unitgrade_private/utils.py b/src/unitgrade_private/utils.py
index b335a4b863ad44d2a7d6f800e16b2e617b957e68..9cc2630b6eaf26116ae65d22e5db7389f3f28814 100644
--- a/src/unitgrade_private/utils.py
+++ b/src/unitgrade_private/utils.py
@@ -38,4 +38,3 @@ def exit_after(s):
             return result
         return inner
     return outer
-
diff --git a/src/unitgrade_private/version.py b/src/unitgrade_private/version.py
index 5c2098c4689bbe95e6e068ea2f6a6ac579a3416e..3d3c3e1a42015ff0c4aa61a233543461962de909 100644
--- a/src/unitgrade_private/version.py
+++ b/src/unitgrade_private/version.py
@@ -1 +1,5 @@
+<<<<<<< HEAD
 __version__ = "0.1.62"
+=======
+__version__ = "0.1.61"
+>>>>>>> 05f66ebff680f2f18cf59f9adf46bc6c8ecea3c0