diff --git a/build-constraints.yaml b/build-constraints.yaml
index 35fee2d2..e6d587cc 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -1231,10 +1231,6 @@ packages:
         - clash-ghc
 
     "Athan Clark <athan.clark@gmail.com> @athanclark":
-<<<<<<< HEAD
-        # https://github.com/athanclark/nested-routes/issues/9
-=======
->>>>>>> b233f7bbf4edd1aa69a4e818795b3541126cc540
         - commutative
         - digestive-functors-lucid
         - ltext
@@ -1244,15 +1240,15 @@ packages:
         - poly-arity
         - urlpath
         - wai-transformers
-        # Temporary block due to #1074
-        # - wai-middleware-content-type
-        # - wai-middleware-verbs
-        # - nested-routes
+        - wai-middleware-content-type
+        - wai-middleware-verbs
         - webpage
         - composition-extra
         - rose-trees
         - sets
+        - timemap
         - tries
+        - path-extra
         - pred-trie
 
     "Fumiaki Kinoshita <fumiexcel@gmail.com> @fumieval":