diff --git a/bin/brass.pill b/bin/brass.pill
index 2a4689f24..c38a074d4 100644
--- a/bin/brass.pill
+++ b/bin/brass.pill
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e0af91e5c51359719aaa943f37a1e953989c786412616b18fbaa0addb2cf0740
-size 10272514
+oid sha256:bca842e60a26a712bd1ea6217b13794a6ce0cffa46ec52f00d9bfe808cea6f38
+size 13196527
diff --git a/bin/solid.pill b/bin/solid.pill
index 671dccc97..25e2367d0 100644
--- a/bin/solid.pill
+++ b/bin/solid.pill
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e0c05655f47ff81c8d4985a061d3ff57526a436adf25f667432a48c5cd10d438
-size 12190347
+oid sha256:5f62579d654a145904ffb0bc9bbda17dda091a2e28e2f1eecf6a7b29cef9189c
+size 14866258
diff --git a/pkg/arvo/app/hood.hoon b/pkg/arvo/app/hood.hoon
index 5807afa52..f4fbdf935 100644
--- a/pkg/arvo/app/hood.hoon
+++ b/pkg/arvo/app/hood.hoon
@@ -2,7 +2,7 @@
 /+  drum=hood-drum, helm=hood-helm, kiln=hood-kiln
 |%
 +$  state
-  $:  %13
+  $:  %14
       drum=state:drum
       helm=state:helm
       kiln=state:kiln
@@ -10,16 +10,13 @@
 +$  any-state
   $%  state
       [ver=?(%1 %2 %3 %4 %5 %6) lac=(map @tas fin-any-state)]
-      [%7 drum=state:drum helm=state:helm kiln=state:kiln]
-      [%8 drum=state:drum helm=state:helm kiln=state:kiln]
-      [%9 drum=state:drum helm=state:helm kiln=state:kiln]
-      [%10 drum=state:drum helm=state:helm kiln=state:kiln]
-      [%11 drum=state:drum helm=state:helm kiln=state:kiln]
-<<<<<<< HEAD
+      [%7 drum=any-state:drum helm=state:helm kiln=state:kiln]
+      [%8 drum=any-state:drum helm=state:helm kiln=state:kiln]
+      [%9 drum=any-state:drum helm=state:helm kiln=state:kiln]
+      [%10 drum=any-state:drum helm=state:helm kiln=state:kiln]
+      [%11 drum=any-state:drum helm=state:helm kiln=state:kiln]
       [%12 drum=any-state:drum helm=state:helm kiln=state:kiln]
-=======
-      [%12 drum=state:drum helm=state:helm kiln=state:kiln]
->>>>>>> cd400dfa69059e211dc88f4ce5d53479b9da7542
+      [%13 drum=any-state:drum helm=state:helm kiln=state:kiln]
   ==
 +$  any-state-tuple
   $:  drum=any-state:drum
diff --git a/pkg/arvo/lib/hood/drum.hoon b/pkg/arvo/lib/hood/drum.hoon
index 4dcf4c1a4..1dde21d49 100644
--- a/pkg/arvo/lib/hood/drum.hoon
+++ b/pkg/arvo/lib/hood/drum.hoon
@@ -262,7 +262,6 @@
   ==
 ::
 ++  on-load
-<<<<<<< HEAD
   |^  |=  [hood-version=@ud old=any-state]
       =<  se-abet  =<  se-view
       =.  sat  (load-state old)
@@ -340,55 +339,10 @@
       =>  (se-born | %home %contact-pull-hook)
       =>  (se-born | %home %settings-store)
       (se-born | %home %group-view)
+    =?  ..on-load  (lte hood-version %13)
+      (se-born | %home %dm-hook)
     ..on-load
   --
-=======
-  |=  [hood-version=@ud old=any-state]
-  =<  se-abet  =<  se-view
-  =.  sat  old
-  =.  dev  (~(gut by bin) ost *source)
-  =?  ..on-load  (lte hood-version %4)
-    ~>  %slog.0^leaf+"drum: starting os1 agents"
-    =>  (se-born | %home %s3-store)
-    =>  (se-born | %home %contact-view)
-    =>  (se-born | %home %contact-hook)
-    =>  (se-born | %home %contact-store)
-    =>  (se-born | %home %metadata-hook)
-    =>  (se-born | %home %metadata-store)
-    =>  (se-born | %home %goad)
-    ~>  %slog.0^leaf+"drum: resubscribing to %dojo and %chat-cli"
-    =>  (se-drop:(se-pull our.hid %dojo) | our.hid %dojo)
-    (se-drop:(se-pull our.hid %chat-cli) | our.hid %chat-cli)
-  =?  ..on-load  (lte hood-version %5)
-    (se-born | %home %file-server)
-  =?  ..on-load  (lte hood-version %7)
-    (se-born | %home %glob)
-  =?  ..on-load  (lte hood-version %8)
-    =>  (se-born | %home %group-push-hook)
-    (se-born | %home %group-pull-hook)
-  =?  ..on-load  (lte hood-version %9)
-    (se-born | %home %graph-store)
-  =?  ..on-load  (lte hood-version %10)
-    =>  (se-born | %home %graph-push-hook)
-    (se-born | %home %graph-pull-hook)
-  =?  ..on-load  (lte hood-version %11)
-    =>  (se-born | %home %hark-graph-hook)
-    =>  (se-born | %home %hark-group-hook)
-    =>  (se-born | %home %hark-chat-hook)
-    =>  (se-born | %home %hark-store)
-    =>  (se-born | %home %observe-hook)
-    =>  (se-born | %home %metadata-pull-hook)
-    =>  (se-born | %home %metadata-push-hook)
-    (se-born | %home %herm)
-  =?  ..on-load  (lte hood-version %12)
-    =>  (se-born | %home %contact-push-hook)
-    =>  (se-born | %home %contact-pull-hook)
-    =>  (se-born | %home %settings-store)
-    (se-born | %home %group-view)
-  =?  ..on-load  (lte hood-version %13)
-    (se-born | %home %dm-hook)
-  ..on-load
->>>>>>> cd400dfa69059e211dc88f4ce5d53479b9da7542
 ::
 ++  reap-phat                                         ::  ack connect
   |=  [way=wire saw=(unit tang)]