Fix merge issues after rebase

Author: andrevdm

postgresql-simple-migration.cabal

@@ -57,7 +57,7 @@ Executable migrate
                             cryptohash                  >= 0.11     && < 0.12,
                             directory                   >= 1.2      && < 1.4,
                             postgresql-simple           >= 0.4      && < 0.7,
-                            time                        >= 1.4      && < 1.9,
+                            time                        >= 1.4      && < 1.10,
                             text                        >= 1.2      && < 1.3
 
 test-suite tests