diff --git a/GPX.cabal b/GPX.cabal
--- a/GPX.cabal
+++ b/GPX.cabal
@@ -1,5 +1,5 @@
 Name:                GPX
-Version:             0.7.0
+Version:             0.8.0
 License:             BSD3
 License-File:        LICENSE
 Synopsis:            Parse GPX files
@@ -24,8 +24,9 @@
                      , hxt >= 9
                      , containers
                      , comonad-transformers
+                     , comonad >= 4.0
                      , data-lens
-                     , xsd
+                     , xsd >= 0.3 && < 0.4
                      , newtype
 
   GHC-Options:      -Wall
diff --git a/LICENSE b/LICENSE
--- a/LICENSE
+++ b/LICENSE
@@ -1,4 +1,4 @@
-Copyright 2009-2012 Tony Morris
+Copyright 2009-2013 Tony Morris
 
 All rights reserved.
 
@@ -24,8 +24,4 @@
 HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
 LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-<<<<<<< HEAD
 SUCH DAMAGE.
-=======
-SUCH DAMAGE.
->>>>>>> 0522b176aea72e24e49511488be59280c9dc4527