diff --git a/glymur/version.py b/glymur/version.py
index 1e6e8fe..2092d4b 100644
--- a/glymur/version.py
+++ b/glymur/version.py
@@ -19,11 +19,7 @@ from .lib import openjp2 as opj2
 
 # Do not change the format of this next line!  Doing so risks breaking
 # setup.py
-<<<<<<< HEAD
-version = "0.6.1"
-=======
 version = "0.7.0"
->>>>>>> release-0.7.0rc1
 _sv = LooseVersion(version)
 version_tuple = _sv.version