diff --git a/pkg/arvo/sys/hoon.hoon b/pkg/arvo/sys/hoon.hoon
index b4ef91597..44ee27616 100644
--- a/pkg/arvo/sys/hoon.hoon
+++ b/pkg/arvo/sys/hoon.hoon
@@ -8218,17 +8218,11 @@
       ?+    gen  gen
         ::
           [%brcn *]
-<<<<<<< HEAD
         [%brcn lab.wit q.gen]  :: populate (unit term) with lab.wit
         ::
           [%brpt *]
         [%brpt lab.wit q.gen]  :: populate (unit term) with lab.wit
         ::
-          [%brdt *]
-        [%brdt lab.wit q.gen]
-=======
-        [%brcn lab.wit q.gen]
->>>>>>> parent of 0dc3498a6f (hoon: change %brdt AST to support doccords label)
       ==
     --
   ::