diff --git a/docs/api/chia.dotnet.AmountFilter.html b/docs/api/chia.dotnet.AmountFilter.html
index 2f948c48..51d0f3f1 100644
--- a/docs/api/chia.dotnet.AmountFilter.html
+++ b/docs/api/chia.dotnet.AmountFilter.html
@@ -90,21 +90,7 @@ <h5>Inherited Members</h5>
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object)">Object.Equals(Object)</a>
     </div>
     <div>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object-system-object)">Object.Equals(Object, Object)</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-      <span class="xref">System.Object.Equals(System.Object, System.Object)</span>
-=======
-      <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object-system-object)">Object.Equals(Object, Object)</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
     </div>
     <div>
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.gethashcode#system-object-gethashcode">Object.GetHashCode()</a>
@@ -132,24 +118,10 @@ <h3 id="properties">Properties
   </h3>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_AmountFilter_Mode.md&amp;value=---%0Auid%3A%20chia.dotnet.AmountFilter.Mode%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_AmountFilter_Mode.md&amp;value=---%0Auid%3A%20chia.dotnet.AmountFilter.Mode%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_AmountFilter_Mode.md&amp;value=---%0Auid%3A%20chia.dotnet.AmountFilter.Mode%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/AmountFilter.cs/#L9">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/AmountFilter.cs/#L9">View Source</a>
   </span>
   <a id="chia_dotnet_AmountFilter_Mode_" data-uid="chia.dotnet.AmountFilter.Mode*"></a>
   <h4 id="chia_dotnet_AmountFilter_Mode" data-uid="chia.dotnet.AmountFilter.Mode">Mode</h4>
@@ -176,24 +148,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_AmountFilter_Values.md&amp;value=---%0Auid%3A%20chia.dotnet.AmountFilter.Values%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_AmountFilter_Values.md&amp;value=---%0Auid%3A%20chia.dotnet.AmountFilter.Values%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_AmountFilter_Values.md&amp;value=---%0Auid%3A%20chia.dotnet.AmountFilter.Values%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/AmountFilter.cs/#L7">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/AmountFilter.cs/#L7">View Source</a>
   </span>
   <a id="chia_dotnet_AmountFilter_Values_" data-uid="chia.dotnet.AmountFilter.Values*"></a>
   <h4 id="chia_dotnet_AmountFilter_Values" data-uid="chia.dotnet.AmountFilter.Values">Values</h4>
@@ -230,24 +188,10 @@ <h3 id="implements">Implements</h3>
               <div class="contribution">
                 <ul class="nav">
                   <li>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-                    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_AmountFilter.md&amp;value=---%0Auid%3A%20chia.dotnet.AmountFilter%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-                    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_AmountFilter.md&amp;value=---%0Auid%3A%20chia.dotnet.AmountFilter%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-=======
                     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_AmountFilter.md&amp;value=---%0Auid%3A%20chia.dotnet.AmountFilter%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
                   </li>
                   <li>
-                    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/AmountFilter.cs/#L5" class="contribution-link">View Source</a>
+                    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/AmountFilter.cs/#L5" class="contribution-link">View Source</a>
                   </li>
                 </ul>
               </div>
diff --git a/docs/api/chia.dotnet.AmountWithPuzzlehash.html b/docs/api/chia.dotnet.AmountWithPuzzlehash.html
index 173a142d..aebd7f2c 100644
--- a/docs/api/chia.dotnet.AmountWithPuzzlehash.html
+++ b/docs/api/chia.dotnet.AmountWithPuzzlehash.html
@@ -90,21 +90,7 @@ <h5>Inherited Members</h5>
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object)">Object.Equals(Object)</a>
     </div>
     <div>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object-system-object)">Object.Equals(Object, Object)</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-      <span class="xref">System.Object.Equals(System.Object, System.Object)</span>
-=======
-      <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object-system-object)">Object.Equals(Object, Object)</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
     </div>
     <div>
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.gethashcode#system-object-gethashcode">Object.GetHashCode()</a>
@@ -132,24 +118,10 @@ <h3 id="properties">Properties
   </h3>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_AmountWithPuzzlehash_Mode.md&amp;value=---%0Auid%3A%20chia.dotnet.AmountWithPuzzlehash.Mode%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_AmountWithPuzzlehash_Mode.md&amp;value=---%0Auid%3A%20chia.dotnet.AmountWithPuzzlehash.Mode%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_AmountWithPuzzlehash_Mode.md&amp;value=---%0Auid%3A%20chia.dotnet.AmountWithPuzzlehash.Mode%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/AmountWithPuzzlehash.cs/#L9">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/AmountWithPuzzlehash.cs/#L9">View Source</a>
   </span>
   <a id="chia_dotnet_AmountWithPuzzlehash_Mode_" data-uid="chia.dotnet.AmountWithPuzzlehash.Mode*"></a>
   <h4 id="chia_dotnet_AmountWithPuzzlehash_Mode" data-uid="chia.dotnet.AmountWithPuzzlehash.Mode">Mode</h4>
@@ -176,24 +148,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_AmountWithPuzzlehash_Values.md&amp;value=---%0Auid%3A%20chia.dotnet.AmountWithPuzzlehash.Values%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_AmountWithPuzzlehash_Values.md&amp;value=---%0Auid%3A%20chia.dotnet.AmountWithPuzzlehash.Values%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_AmountWithPuzzlehash_Values.md&amp;value=---%0Auid%3A%20chia.dotnet.AmountWithPuzzlehash.Values%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/AmountWithPuzzlehash.cs/#L7">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/AmountWithPuzzlehash.cs/#L7">View Source</a>
   </span>
   <a id="chia_dotnet_AmountWithPuzzlehash_Values_" data-uid="chia.dotnet.AmountWithPuzzlehash.Values*"></a>
   <h4 id="chia_dotnet_AmountWithPuzzlehash_Values" data-uid="chia.dotnet.AmountWithPuzzlehash.Values">Values</h4>
@@ -230,24 +188,10 @@ <h3 id="implements">Implements</h3>
               <div class="contribution">
                 <ul class="nav">
                   <li>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-                    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_AmountWithPuzzlehash.md&amp;value=---%0Auid%3A%20chia.dotnet.AmountWithPuzzlehash%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-                    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_AmountWithPuzzlehash.md&amp;value=---%0Auid%3A%20chia.dotnet.AmountWithPuzzlehash%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-=======
                     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_AmountWithPuzzlehash.md&amp;value=---%0Auid%3A%20chia.dotnet.AmountWithPuzzlehash%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
                   </li>
                   <li>
-                    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/AmountWithPuzzlehash.cs/#L5" class="contribution-link">View Source</a>
+                    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/AmountWithPuzzlehash.cs/#L5" class="contribution-link">View Source</a>
                   </li>
                 </ul>
               </div>
diff --git a/docs/api/chia.dotnet.Announcement.html b/docs/api/chia.dotnet.Announcement.html
index 05bc3977..6f7cd5ef 100644
--- a/docs/api/chia.dotnet.Announcement.html
+++ b/docs/api/chia.dotnet.Announcement.html
@@ -90,21 +90,7 @@ <h5>Inherited Members</h5>
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object)">Object.Equals(Object)</a>
     </div>
     <div>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object-system-object)">Object.Equals(Object, Object)</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-      <span class="xref">System.Object.Equals(System.Object, System.Object)</span>
-=======
-      <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object-system-object)">Object.Equals(Object, Object)</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
     </div>
     <div>
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.gethashcode#system-object-gethashcode">Object.GetHashCode()</a>
@@ -132,24 +118,10 @@ <h3 id="properties">Properties
   </h3>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_Announcement_Message.md&amp;value=---%0Auid%3A%20chia.dotnet.Announcement.Message%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_Announcement_Message.md&amp;value=---%0Auid%3A%20chia.dotnet.Announcement.Message%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_Announcement_Message.md&amp;value=---%0Auid%3A%20chia.dotnet.Announcement.Message%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/Announcement.cs/#L6">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/Announcement.cs/#L6">View Source</a>
   </span>
   <a id="chia_dotnet_Announcement_Message_" data-uid="chia.dotnet.Announcement.Message*"></a>
   <h4 id="chia_dotnet_Announcement_Message" data-uid="chia.dotnet.Announcement.Message">Message</h4>
@@ -176,24 +148,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_Announcement_MorphBytes.md&amp;value=---%0Auid%3A%20chia.dotnet.Announcement.MorphBytes%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_Announcement_MorphBytes.md&amp;value=---%0Auid%3A%20chia.dotnet.Announcement.MorphBytes%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_Announcement_MorphBytes.md&amp;value=---%0Auid%3A%20chia.dotnet.Announcement.MorphBytes%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/Announcement.cs/#L7">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/Announcement.cs/#L7">View Source</a>
   </span>
   <a id="chia_dotnet_Announcement_MorphBytes_" data-uid="chia.dotnet.Announcement.MorphBytes*"></a>
   <h4 id="chia_dotnet_Announcement_MorphBytes" data-uid="chia.dotnet.Announcement.MorphBytes">MorphBytes</h4>
@@ -220,24 +178,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_Announcement_OriginInfo.md&amp;value=---%0Auid%3A%20chia.dotnet.Announcement.OriginInfo%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_Announcement_OriginInfo.md&amp;value=---%0Auid%3A%20chia.dotnet.Announcement.OriginInfo%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_Announcement_OriginInfo.md&amp;value=---%0Auid%3A%20chia.dotnet.Announcement.OriginInfo%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/Announcement.cs/#L5">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/Announcement.cs/#L5">View Source</a>
   </span>
   <a id="chia_dotnet_Announcement_OriginInfo_" data-uid="chia.dotnet.Announcement.OriginInfo*"></a>
   <h4 id="chia_dotnet_Announcement_OriginInfo" data-uid="chia.dotnet.Announcement.OriginInfo">OriginInfo</h4>
@@ -274,24 +218,10 @@ <h3 id="implements">Implements</h3>
               <div class="contribution">
                 <ul class="nav">
                   <li>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-                    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_Announcement.md&amp;value=---%0Auid%3A%20chia.dotnet.Announcement%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-                    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_Announcement.md&amp;value=---%0Auid%3A%20chia.dotnet.Announcement%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-=======
                     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_Announcement.md&amp;value=---%0Auid%3A%20chia.dotnet.Announcement%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
                   </li>
                   <li>
-                    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/Announcement.cs/#L3" class="contribution-link">View Source</a>
+                    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/Announcement.cs/#L3" class="contribution-link">View Source</a>
                   </li>
                 </ul>
               </div>
diff --git a/docs/api/chia.dotnet.AssetInfo.html b/docs/api/chia.dotnet.AssetInfo.html
index e01f8504..12d32eb8 100644
--- a/docs/api/chia.dotnet.AssetInfo.html
+++ b/docs/api/chia.dotnet.AssetInfo.html
@@ -90,21 +90,7 @@ <h5>Inherited Members</h5>
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object)">Object.Equals(Object)</a>
     </div>
     <div>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object-system-object)">Object.Equals(Object, Object)</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-      <span class="xref">System.Object.Equals(System.Object, System.Object)</span>
-=======
-      <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object-system-object)">Object.Equals(Object, Object)</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
     </div>
     <div>
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.gethashcode#system-object-gethashcode">Object.GetHashCode()</a>
@@ -132,24 +118,10 @@ <h3 id="properties">Properties
   </h3>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_AssetInfo_Address.md&amp;value=---%0Auid%3A%20chia.dotnet.AssetInfo.Address%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_AssetInfo_Address.md&amp;value=---%0Auid%3A%20chia.dotnet.AssetInfo.Address%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_AssetInfo_Address.md&amp;value=---%0Auid%3A%20chia.dotnet.AssetInfo.Address%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/Asset.cs/#L6">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/Asset.cs/#L6">View Source</a>
   </span>
   <a id="chia_dotnet_AssetInfo_Address_" data-uid="chia.dotnet.AssetInfo.Address*"></a>
   <h4 id="chia_dotnet_AssetInfo_Address" data-uid="chia.dotnet.AssetInfo.Address">Address</h4>
@@ -176,24 +148,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_AssetInfo_Amount.md&amp;value=---%0Auid%3A%20chia.dotnet.AssetInfo.Amount%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_AssetInfo_Amount.md&amp;value=---%0Auid%3A%20chia.dotnet.AssetInfo.Amount%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_AssetInfo_Amount.md&amp;value=---%0Auid%3A%20chia.dotnet.AssetInfo.Amount%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/Asset.cs/#L7">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/Asset.cs/#L7">View Source</a>
   </span>
   <a id="chia_dotnet_AssetInfo_Amount_" data-uid="chia.dotnet.AssetInfo.Amount*"></a>
   <h4 id="chia_dotnet_AssetInfo_Amount" data-uid="chia.dotnet.AssetInfo.Amount">Amount</h4>
@@ -220,24 +178,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_AssetInfo_Asset.md&amp;value=---%0Auid%3A%20chia.dotnet.AssetInfo.Asset%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_AssetInfo_Asset.md&amp;value=---%0Auid%3A%20chia.dotnet.AssetInfo.Asset%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_AssetInfo_Asset.md&amp;value=---%0Auid%3A%20chia.dotnet.AssetInfo.Asset%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/Asset.cs/#L5">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/Asset.cs/#L5">View Source</a>
   </span>
   <a id="chia_dotnet_AssetInfo_Asset_" data-uid="chia.dotnet.AssetInfo.Asset*"></a>
   <h4 id="chia_dotnet_AssetInfo_Asset" data-uid="chia.dotnet.AssetInfo.Asset">Asset</h4>
@@ -274,24 +218,10 @@ <h3 id="implements">Implements</h3>
               <div class="contribution">
                 <ul class="nav">
                   <li>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-                    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_AssetInfo.md&amp;value=---%0Auid%3A%20chia.dotnet.AssetInfo%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-                    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_AssetInfo.md&amp;value=---%0Auid%3A%20chia.dotnet.AssetInfo%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-=======
                     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_AssetInfo.md&amp;value=---%0Auid%3A%20chia.dotnet.AssetInfo%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
                   </li>
                   <li>
-                    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/Asset.cs/#L3" class="contribution-link">View Source</a>
+                    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/Asset.cs/#L3" class="contribution-link">View Source</a>
                   </li>
                 </ul>
               </div>
diff --git a/docs/api/chia.dotnet.AutoClaimSettings.html b/docs/api/chia.dotnet.AutoClaimSettings.html
index 3589e4d2..0425c0f5 100644
--- a/docs/api/chia.dotnet.AutoClaimSettings.html
+++ b/docs/api/chia.dotnet.AutoClaimSettings.html
@@ -90,21 +90,7 @@ <h5>Inherited Members</h5>
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object)">Object.Equals(Object)</a>
     </div>
     <div>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object-system-object)">Object.Equals(Object, Object)</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-      <span class="xref">System.Object.Equals(System.Object, System.Object)</span>
-=======
-      <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object-system-object)">Object.Equals(Object, Object)</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
     </div>
     <div>
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.gethashcode#system-object-gethashcode">Object.GetHashCode()</a>
@@ -132,24 +118,10 @@ <h3 id="properties">Properties
   </h3>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_AutoClaimSettings_BatchSize.md&amp;value=---%0Auid%3A%20chia.dotnet.AutoClaimSettings.BatchSize%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_AutoClaimSettings_BatchSize.md&amp;value=---%0Auid%3A%20chia.dotnet.AutoClaimSettings.BatchSize%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_AutoClaimSettings_BatchSize.md&amp;value=---%0Auid%3A%20chia.dotnet.AutoClaimSettings.BatchSize%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/AutoClaimSettings.cs/#L8">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/AutoClaimSettings.cs/#L8">View Source</a>
   </span>
   <a id="chia_dotnet_AutoClaimSettings_BatchSize_" data-uid="chia.dotnet.AutoClaimSettings.BatchSize*"></a>
   <h4 id="chia_dotnet_AutoClaimSettings_BatchSize" data-uid="chia.dotnet.AutoClaimSettings.BatchSize">BatchSize</h4>
@@ -176,24 +148,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_AutoClaimSettings_Enabled.md&amp;value=---%0Auid%3A%20chia.dotnet.AutoClaimSettings.Enabled%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_AutoClaimSettings_Enabled.md&amp;value=---%0Auid%3A%20chia.dotnet.AutoClaimSettings.Enabled%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_AutoClaimSettings_Enabled.md&amp;value=---%0Auid%3A%20chia.dotnet.AutoClaimSettings.Enabled%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/AutoClaimSettings.cs/#L5">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/AutoClaimSettings.cs/#L5">View Source</a>
   </span>
   <a id="chia_dotnet_AutoClaimSettings_Enabled_" data-uid="chia.dotnet.AutoClaimSettings.Enabled*"></a>
   <h4 id="chia_dotnet_AutoClaimSettings_Enabled" data-uid="chia.dotnet.AutoClaimSettings.Enabled">Enabled</h4>
@@ -220,24 +178,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_AutoClaimSettings_MinAmount.md&amp;value=---%0Auid%3A%20chia.dotnet.AutoClaimSettings.MinAmount%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_AutoClaimSettings_MinAmount.md&amp;value=---%0Auid%3A%20chia.dotnet.AutoClaimSettings.MinAmount%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_AutoClaimSettings_MinAmount.md&amp;value=---%0Auid%3A%20chia.dotnet.AutoClaimSettings.MinAmount%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/AutoClaimSettings.cs/#L7">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/AutoClaimSettings.cs/#L7">View Source</a>
   </span>
   <a id="chia_dotnet_AutoClaimSettings_MinAmount_" data-uid="chia.dotnet.AutoClaimSettings.MinAmount*"></a>
   <h4 id="chia_dotnet_AutoClaimSettings_MinAmount" data-uid="chia.dotnet.AutoClaimSettings.MinAmount">MinAmount</h4>
@@ -264,24 +208,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_AutoClaimSettings_TxFee.md&amp;value=---%0Auid%3A%20chia.dotnet.AutoClaimSettings.TxFee%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_AutoClaimSettings_TxFee.md&amp;value=---%0Auid%3A%20chia.dotnet.AutoClaimSettings.TxFee%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_AutoClaimSettings_TxFee.md&amp;value=---%0Auid%3A%20chia.dotnet.AutoClaimSettings.TxFee%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/AutoClaimSettings.cs/#L6">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/AutoClaimSettings.cs/#L6">View Source</a>
   </span>
   <a id="chia_dotnet_AutoClaimSettings_TxFee_" data-uid="chia.dotnet.AutoClaimSettings.TxFee*"></a>
   <h4 id="chia_dotnet_AutoClaimSettings_TxFee" data-uid="chia.dotnet.AutoClaimSettings.TxFee">TxFee</h4>
@@ -318,24 +248,10 @@ <h3 id="implements">Implements</h3>
               <div class="contribution">
                 <ul class="nav">
                   <li>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-                    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_AutoClaimSettings.md&amp;value=---%0Auid%3A%20chia.dotnet.AutoClaimSettings%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-                    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_AutoClaimSettings.md&amp;value=---%0Auid%3A%20chia.dotnet.AutoClaimSettings%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-=======
                     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_AutoClaimSettings.md&amp;value=---%0Auid%3A%20chia.dotnet.AutoClaimSettings%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
                   </li>
                   <li>
-                    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/AutoClaimSettings.cs/#L3" class="contribution-link">View Source</a>
+                    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/AutoClaimSettings.cs/#L3" class="contribution-link">View Source</a>
                   </li>
                 </ul>
               </div>
diff --git a/docs/api/chia.dotnet.BlockCountMetrics.html b/docs/api/chia.dotnet.BlockCountMetrics.html
index 67a90ca0..d26702ee 100644
--- a/docs/api/chia.dotnet.BlockCountMetrics.html
+++ b/docs/api/chia.dotnet.BlockCountMetrics.html
@@ -90,21 +90,7 @@ <h5>Inherited Members</h5>
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object)">Object.Equals(Object)</a>
     </div>
     <div>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object-system-object)">Object.Equals(Object, Object)</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-      <span class="xref">System.Object.Equals(System.Object, System.Object)</span>
-=======
-      <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object-system-object)">Object.Equals(Object, Object)</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
     </div>
     <div>
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.gethashcode#system-object-gethashcode">Object.GetHashCode()</a>
@@ -132,24 +118,10 @@ <h3 id="properties">Properties
   </h3>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_BlockCountMetrics_CompactBlock.md&amp;value=---%0Auid%3A%20chia.dotnet.BlockCountMetrics.CompactBlock%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_BlockCountMetrics_CompactBlock.md&amp;value=---%0Auid%3A%20chia.dotnet.BlockCountMetrics.CompactBlock%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_BlockCountMetrics_CompactBlock.md&amp;value=---%0Auid%3A%20chia.dotnet.BlockCountMetrics.CompactBlock%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/BlockCountMetrics.cs/#L5">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/BlockCountMetrics.cs/#L5">View Source</a>
   </span>
   <a id="chia_dotnet_BlockCountMetrics_CompactBlock_" data-uid="chia.dotnet.BlockCountMetrics.CompactBlock*"></a>
   <h4 id="chia_dotnet_BlockCountMetrics_CompactBlock" data-uid="chia.dotnet.BlockCountMetrics.CompactBlock">CompactBlock</h4>
@@ -176,24 +148,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_BlockCountMetrics_HintCount.md&amp;value=---%0Auid%3A%20chia.dotnet.BlockCountMetrics.HintCount%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_BlockCountMetrics_HintCount.md&amp;value=---%0Auid%3A%20chia.dotnet.BlockCountMetrics.HintCount%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_BlockCountMetrics_HintCount.md&amp;value=---%0Auid%3A%20chia.dotnet.BlockCountMetrics.HintCount%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/BlockCountMetrics.cs/#L7">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/BlockCountMetrics.cs/#L7">View Source</a>
   </span>
   <a id="chia_dotnet_BlockCountMetrics_HintCount_" data-uid="chia.dotnet.BlockCountMetrics.HintCount*"></a>
   <h4 id="chia_dotnet_BlockCountMetrics_HintCount" data-uid="chia.dotnet.BlockCountMetrics.HintCount">HintCount</h4>
@@ -220,24 +178,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_BlockCountMetrics_UncompactBlocks.md&amp;value=---%0Auid%3A%20chia.dotnet.BlockCountMetrics.UncompactBlocks%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_BlockCountMetrics_UncompactBlocks.md&amp;value=---%0Auid%3A%20chia.dotnet.BlockCountMetrics.UncompactBlocks%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_BlockCountMetrics_UncompactBlocks.md&amp;value=---%0Auid%3A%20chia.dotnet.BlockCountMetrics.UncompactBlocks%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/BlockCountMetrics.cs/#L6">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/BlockCountMetrics.cs/#L6">View Source</a>
   </span>
   <a id="chia_dotnet_BlockCountMetrics_UncompactBlocks_" data-uid="chia.dotnet.BlockCountMetrics.UncompactBlocks*"></a>
   <h4 id="chia_dotnet_BlockCountMetrics_UncompactBlocks" data-uid="chia.dotnet.BlockCountMetrics.UncompactBlocks">UncompactBlocks</h4>
@@ -274,24 +218,10 @@ <h3 id="implements">Implements</h3>
               <div class="contribution">
                 <ul class="nav">
                   <li>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-                    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_BlockCountMetrics.md&amp;value=---%0Auid%3A%20chia.dotnet.BlockCountMetrics%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-                    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_BlockCountMetrics.md&amp;value=---%0Auid%3A%20chia.dotnet.BlockCountMetrics%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-=======
                     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_BlockCountMetrics.md&amp;value=---%0Auid%3A%20chia.dotnet.BlockCountMetrics%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
                   </li>
                   <li>
-                    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/BlockCountMetrics.cs/#L3" class="contribution-link">View Source</a>
+                    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/BlockCountMetrics.cs/#L3" class="contribution-link">View Source</a>
                   </li>
                 </ul>
               </div>
diff --git a/docs/api/chia.dotnet.BlockRecord.html b/docs/api/chia.dotnet.BlockRecord.html
index 3a691761..360b0262 100644
--- a/docs/api/chia.dotnet.BlockRecord.html
+++ b/docs/api/chia.dotnet.BlockRecord.html
@@ -93,21 +93,7 @@ <h5>Inherited Members</h5>
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object)">Object.Equals(Object)</a>
     </div>
     <div>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object-system-object)">Object.Equals(Object, Object)</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-      <span class="xref">System.Object.Equals(System.Object, System.Object)</span>
-=======
-      <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object-system-object)">Object.Equals(Object, Object)</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
     </div>
     <div>
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.gethashcode#system-object-gethashcode">Object.GetHashCode()</a>
@@ -135,24 +121,10 @@ <h3 id="properties">Properties
   </h3>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_BlockRecord_ChallengeBlockInfoHash.md&amp;value=---%0Auid%3A%20chia.dotnet.BlockRecord.ChallengeBlockInfoHash%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_BlockRecord_ChallengeBlockInfoHash.md&amp;value=---%0Auid%3A%20chia.dotnet.BlockRecord.ChallengeBlockInfoHash%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_BlockRecord_ChallengeBlockInfoHash.md&amp;value=---%0Auid%3A%20chia.dotnet.BlockRecord.ChallengeBlockInfoHash%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/BlockRecord.cs/#L19">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/BlockRecord.cs/#L19">View Source</a>
   </span>
   <a id="chia_dotnet_BlockRecord_ChallengeBlockInfoHash_" data-uid="chia.dotnet.BlockRecord.ChallengeBlockInfoHash*"></a>
   <h4 id="chia_dotnet_BlockRecord_ChallengeBlockInfoHash" data-uid="chia.dotnet.BlockRecord.ChallengeBlockInfoHash">ChallengeBlockInfoHash</h4>
@@ -180,24 +152,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_BlockRecord_ChallengeVdfOutput.md&amp;value=---%0Auid%3A%20chia.dotnet.BlockRecord.ChallengeVdfOutput%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_BlockRecord_ChallengeVdfOutput.md&amp;value=---%0Auid%3A%20chia.dotnet.BlockRecord.ChallengeVdfOutput%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_BlockRecord_ChallengeVdfOutput.md&amp;value=---%0Auid%3A%20chia.dotnet.BlockRecord.ChallengeVdfOutput%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/BlockRecord.cs/#L23">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/BlockRecord.cs/#L23">View Source</a>
   </span>
   <a id="chia_dotnet_BlockRecord_ChallengeVdfOutput_" data-uid="chia.dotnet.BlockRecord.ChallengeVdfOutput*"></a>
   <h4 id="chia_dotnet_BlockRecord_ChallengeVdfOutput" data-uid="chia.dotnet.BlockRecord.ChallengeVdfOutput">ChallengeVdfOutput</h4>
@@ -225,24 +183,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_BlockRecord_DateTimestamp.md&amp;value=---%0Auid%3A%20chia.dotnet.BlockRecord.DateTimestamp%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_BlockRecord_DateTimestamp.md&amp;value=---%0Auid%3A%20chia.dotnet.BlockRecord.DateTimestamp%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_BlockRecord_DateTimestamp.md&amp;value=---%0Auid%3A%20chia.dotnet.BlockRecord.DateTimestamp%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/BlockRecord.cs/#L99">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/BlockRecord.cs/#L99">View Source</a>
   </span>
   <a id="chia_dotnet_BlockRecord_DateTimestamp_" data-uid="chia.dotnet.BlockRecord.DateTimestamp*"></a>
   <h4 id="chia_dotnet_BlockRecord_DateTimestamp" data-uid="chia.dotnet.BlockRecord.DateTimestamp">DateTimestamp</h4>
@@ -270,24 +214,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_BlockRecord_Deficit.md&amp;value=---%0Auid%3A%20chia.dotnet.BlockRecord.Deficit%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_BlockRecord_Deficit.md&amp;value=---%0Auid%3A%20chia.dotnet.BlockRecord.Deficit%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_BlockRecord_Deficit.md&amp;value=---%0Auid%3A%20chia.dotnet.BlockRecord.Deficit%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/BlockRecord.cs/#L27">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/BlockRecord.cs/#L27">View Source</a>
   </span>
   <a id="chia_dotnet_BlockRecord_Deficit_" data-uid="chia.dotnet.BlockRecord.Deficit*"></a>
   <h4 id="chia_dotnet_BlockRecord_Deficit" data-uid="chia.dotnet.BlockRecord.Deficit">Deficit</h4>
@@ -315,24 +245,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_BlockRecord_FarmerPuzzleHash.md&amp;value=---%0Auid%3A%20chia.dotnet.BlockRecord.FarmerPuzzleHash%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_BlockRecord_FarmerPuzzleHash.md&amp;value=---%0Auid%3A%20chia.dotnet.BlockRecord.FarmerPuzzleHash%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_BlockRecord_FarmerPuzzleHash.md&amp;value=---%0Auid%3A%20chia.dotnet.BlockRecord.FarmerPuzzleHash%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/BlockRecord.cs/#L28">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/BlockRecord.cs/#L28">View Source</a>
   </span>
   <a id="chia_dotnet_BlockRecord_FarmerPuzzleHash_" data-uid="chia.dotnet.BlockRecord.FarmerPuzzleHash*"></a>
   <h4 id="chia_dotnet_BlockRecord_FarmerPuzzleHash" data-uid="chia.dotnet.BlockRecord.FarmerPuzzleHash">FarmerPuzzleHash</h4>
@@ -359,24 +275,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_BlockRecord_Fees.md&amp;value=---%0Auid%3A%20chia.dotnet.BlockRecord.Fees%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_BlockRecord_Fees.md&amp;value=---%0Auid%3A%20chia.dotnet.BlockRecord.Fees%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_BlockRecord_Fees.md&amp;value=---%0Auid%3A%20chia.dotnet.BlockRecord.Fees%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/BlockRecord.cs/#L32">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/BlockRecord.cs/#L32">View Source</a>
   </span>
   <a id="chia_dotnet_BlockRecord_Fees_" data-uid="chia.dotnet.BlockRecord.Fees*"></a>
   <h4 id="chia_dotnet_BlockRecord_Fees" data-uid="chia.dotnet.BlockRecord.Fees">Fees</h4>
@@ -404,24 +306,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_BlockRecord_FinishedChallengeSlotHashes.md&amp;value=---%0Auid%3A%20chia.dotnet.BlockRecord.FinishedChallengeSlotHashes%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_BlockRecord_FinishedChallengeSlotHashes.md&amp;value=---%0Auid%3A%20chia.dotnet.BlockRecord.FinishedChallengeSlotHashes%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_BlockRecord_FinishedChallengeSlotHashes.md&amp;value=---%0Auid%3A%20chia.dotnet.BlockRecord.FinishedChallengeSlotHashes%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/BlockRecord.cs/#L36">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/BlockRecord.cs/#L36">View Source</a>
   </span>
   <a id="chia_dotnet_BlockRecord_FinishedChallengeSlotHashes_" data-uid="chia.dotnet.BlockRecord.FinishedChallengeSlotHashes*"></a>
   <h4 id="chia_dotnet_BlockRecord_FinishedChallengeSlotHashes" data-uid="chia.dotnet.BlockRecord.FinishedChallengeSlotHashes">FinishedChallengeSlotHashes</h4>
@@ -430,21 +318,7 @@ <h4 id="chia_dotnet_BlockRecord_FinishedChallengeSlotHashes" data-uid="chia.dotn
   <div class="markdown level1 conceptual"></div>
   <h5 class="decalaration">Declaration</h5>
   <div class="codewrapper">
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <pre><code class="lang-csharp hljs">public IEnumerable&lt;string&gt; FinishedChallengeSlotHashes { get; set; }</code></pre>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <pre><code class="lang-csharp hljs">public ICollection&lt;string&gt; FinishedChallengeSlotHashes { get; set; }</code></pre>
-=======
     <pre><code class="lang-csharp hljs">public IEnumerable&lt;string&gt; FinishedChallengeSlotHashes { get; set; }</code></pre>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </div>
   <h5 class="propertyValue">Property Value</h5>
   <table class="table table-bordered table-striped table-condensed">
@@ -456,45 +330,17 @@ <h5 class="propertyValue">Property Value</h5>
     </thead>
     <tbody>
       <tr>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
         <td><a class="xref" href="https://learn.microsoft.com/dotnet/api/system.collections.generic.ienumerable-1">IEnumerable</a>&lt;<a class="xref" href="https://learn.microsoft.com/dotnet/api/system.string">String</a>&gt;</td>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-        <td><a class="xref" href="https://learn.microsoft.com/dotnet/api/system.collections.generic.icollection-1">ICollection</a>&lt;<a class="xref" href="https://learn.microsoft.com/dotnet/api/system.string">String</a>&gt;</td>
-=======
-        <td><a class="xref" href="https://learn.microsoft.com/dotnet/api/system.collections.generic.ienumerable-1">IEnumerable</a>&lt;<a class="xref" href="https://learn.microsoft.com/dotnet/api/system.string">String</a>&gt;</td>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
         <td></td>
       </tr>
     </tbody>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_BlockRecord_FinishedInfusedChallengeSlotHashes.md&amp;value=---%0Auid%3A%20chia.dotnet.BlockRecord.FinishedInfusedChallengeSlotHashes%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_BlockRecord_FinishedInfusedChallengeSlotHashes.md&amp;value=---%0Auid%3A%20chia.dotnet.BlockRecord.FinishedInfusedChallengeSlotHashes%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_BlockRecord_FinishedInfusedChallengeSlotHashes.md&amp;value=---%0Auid%3A%20chia.dotnet.BlockRecord.FinishedInfusedChallengeSlotHashes%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/BlockRecord.cs/#L40">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/BlockRecord.cs/#L40">View Source</a>
   </span>
   <a id="chia_dotnet_BlockRecord_FinishedInfusedChallengeSlotHashes_" data-uid="chia.dotnet.BlockRecord.FinishedInfusedChallengeSlotHashes*"></a>
   <h4 id="chia_dotnet_BlockRecord_FinishedInfusedChallengeSlotHashes" data-uid="chia.dotnet.BlockRecord.FinishedInfusedChallengeSlotHashes">FinishedInfusedChallengeSlotHashes</h4>
@@ -503,21 +349,7 @@ <h4 id="chia_dotnet_BlockRecord_FinishedInfusedChallengeSlotHashes" data-uid="ch
   <div class="markdown level1 conceptual"></div>
   <h5 class="decalaration">Declaration</h5>
   <div class="codewrapper">
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <pre><code class="lang-csharp hljs">public IEnumerable&lt;string&gt; FinishedInfusedChallengeSlotHashes { get; set; }</code></pre>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <pre><code class="lang-csharp hljs">public ICollection&lt;string&gt; FinishedInfusedChallengeSlotHashes { get; set; }</code></pre>
-=======
     <pre><code class="lang-csharp hljs">public IEnumerable&lt;string&gt; FinishedInfusedChallengeSlotHashes { get; set; }</code></pre>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </div>
   <h5 class="propertyValue">Property Value</h5>
   <table class="table table-bordered table-striped table-condensed">
@@ -529,45 +361,17 @@ <h5 class="propertyValue">Property Value</h5>
     </thead>
     <tbody>
       <tr>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
         <td><a class="xref" href="https://learn.microsoft.com/dotnet/api/system.collections.generic.ienumerable-1">IEnumerable</a>&lt;<a class="xref" href="https://learn.microsoft.com/dotnet/api/system.string">String</a>&gt;</td>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-        <td><a class="xref" href="https://learn.microsoft.com/dotnet/api/system.collections.generic.icollection-1">ICollection</a>&lt;<a class="xref" href="https://learn.microsoft.com/dotnet/api/system.string">String</a>&gt;</td>
-=======
-        <td><a class="xref" href="https://learn.microsoft.com/dotnet/api/system.collections.generic.ienumerable-1">IEnumerable</a>&lt;<a class="xref" href="https://learn.microsoft.com/dotnet/api/system.string">String</a>&gt;</td>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
         <td></td>
       </tr>
     </tbody>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_BlockRecord_FinishedRewardSlotHashes.md&amp;value=---%0Auid%3A%20chia.dotnet.BlockRecord.FinishedRewardSlotHashes%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_BlockRecord_FinishedRewardSlotHashes.md&amp;value=---%0Auid%3A%20chia.dotnet.BlockRecord.FinishedRewardSlotHashes%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_BlockRecord_FinishedRewardSlotHashes.md&amp;value=---%0Auid%3A%20chia.dotnet.BlockRecord.FinishedRewardSlotHashes%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/BlockRecord.cs/#L44">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/BlockRecord.cs/#L44">View Source</a>
   </span>
   <a id="chia_dotnet_BlockRecord_FinishedRewardSlotHashes_" data-uid="chia.dotnet.BlockRecord.FinishedRewardSlotHashes*"></a>
   <h4 id="chia_dotnet_BlockRecord_FinishedRewardSlotHashes" data-uid="chia.dotnet.BlockRecord.FinishedRewardSlotHashes">FinishedRewardSlotHashes</h4>
@@ -576,21 +380,7 @@ <h4 id="chia_dotnet_BlockRecord_FinishedRewardSlotHashes" data-uid="chia.dotnet.
   <div class="markdown level1 conceptual"></div>
   <h5 class="decalaration">Declaration</h5>
   <div class="codewrapper">
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <pre><code class="lang-csharp hljs">public IEnumerable&lt;string&gt; FinishedRewardSlotHashes { get; set; }</code></pre>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <pre><code class="lang-csharp hljs">public ICollection&lt;string&gt; FinishedRewardSlotHashes { get; set; }</code></pre>
-=======
-    <pre><code class="lang-csharp hljs">public IEnumerable&lt;string&gt; FinishedRewardSlotHashes { get; set; }</code></pre>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </div>
   <h5 class="propertyValue">Property Value</h5>
   <table class="table table-bordered table-striped table-condensed">
@@ -602,45 +392,17 @@ <h5 class="propertyValue">Property Value</h5>
     </thead>
     <tbody>
       <tr>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-        <td><a class="xref" href="https://learn.microsoft.com/dotnet/api/system.collections.generic.ienumerable-1">IEnumerable</a>&lt;<a class="xref" href="https://learn.microsoft.com/dotnet/api/system.string">String</a>&gt;</td>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-        <td><a class="xref" href="https://learn.microsoft.com/dotnet/api/system.collections.generic.icollection-1">ICollection</a>&lt;<a class="xref" href="https://learn.microsoft.com/dotnet/api/system.string">String</a>&gt;</td>
-=======
         <td><a class="xref" href="https://learn.microsoft.com/dotnet/api/system.collections.generic.ienumerable-1">IEnumerable</a>&lt;<a class="xref" href="https://learn.microsoft.com/dotnet/api/system.string">String</a>&gt;</td>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
         <td></td>
       </tr>
     </tbody>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_BlockRecord_HeaderHash.md&amp;value=---%0Auid%3A%20chia.dotnet.BlockRecord.HeaderHash%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_BlockRecord_HeaderHash.md&amp;value=---%0Auid%3A%20chia.dotnet.BlockRecord.HeaderHash%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_BlockRecord_HeaderHash.md&amp;value=---%0Auid%3A%20chia.dotnet.BlockRecord.HeaderHash%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/BlockRecord.cs/#L45">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/BlockRecord.cs/#L45">View Source</a>
   </span>
   <a id="chia_dotnet_BlockRecord_HeaderHash_" data-uid="chia.dotnet.BlockRecord.HeaderHash*"></a>
   <h4 id="chia_dotnet_BlockRecord_HeaderHash" data-uid="chia.dotnet.BlockRecord.HeaderHash">HeaderHash</h4>
@@ -667,24 +429,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_BlockRecord_Height.md&amp;value=---%0Auid%3A%20chia.dotnet.BlockRecord.Height%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_BlockRecord_Height.md&amp;value=---%0Auid%3A%20chia.dotnet.BlockRecord.Height%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_BlockRecord_Height.md&amp;value=---%0Auid%3A%20chia.dotnet.BlockRecord.Height%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/BlockRecord.cs/#L46">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/BlockRecord.cs/#L46">View Source</a>
   </span>
   <a id="chia_dotnet_BlockRecord_Height_" data-uid="chia.dotnet.BlockRecord.Height*"></a>
   <h4 id="chia_dotnet_BlockRecord_Height" data-uid="chia.dotnet.BlockRecord.Height">Height</h4>
@@ -711,24 +459,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_BlockRecord_InfusedChallengeVdfOutput.md&amp;value=---%0Auid%3A%20chia.dotnet.BlockRecord.InfusedChallengeVdfOutput%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_BlockRecord_InfusedChallengeVdfOutput.md&amp;value=---%0Auid%3A%20chia.dotnet.BlockRecord.InfusedChallengeVdfOutput%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_BlockRecord_InfusedChallengeVdfOutput.md&amp;value=---%0Auid%3A%20chia.dotnet.BlockRecord.InfusedChallengeVdfOutput%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/BlockRecord.cs/#L50">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/BlockRecord.cs/#L50">View Source</a>
   </span>
   <a id="chia_dotnet_BlockRecord_InfusedChallengeVdfOutput_" data-uid="chia.dotnet.BlockRecord.InfusedChallengeVdfOutput*"></a>
   <h4 id="chia_dotnet_BlockRecord_InfusedChallengeVdfOutput" data-uid="chia.dotnet.BlockRecord.InfusedChallengeVdfOutput">InfusedChallengeVdfOutput</h4>
@@ -756,24 +490,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_BlockRecord_IsTransactionBlock.md&amp;value=---%0Auid%3A%20chia.dotnet.BlockRecord.IsTransactionBlock%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_BlockRecord_IsTransactionBlock.md&amp;value=---%0Auid%3A%20chia.dotnet.BlockRecord.IsTransactionBlock%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_BlockRecord_IsTransactionBlock.md&amp;value=---%0Auid%3A%20chia.dotnet.BlockRecord.IsTransactionBlock%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/BlockRecord.cs/#L101">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/BlockRecord.cs/#L101">View Source</a>
   </span>
   <a id="chia_dotnet_BlockRecord_IsTransactionBlock_" data-uid="chia.dotnet.BlockRecord.IsTransactionBlock*"></a>
   <h4 id="chia_dotnet_BlockRecord_IsTransactionBlock" data-uid="chia.dotnet.BlockRecord.IsTransactionBlock">IsTransactionBlock</h4>
@@ -801,24 +521,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_BlockRecord_Overflow.md&amp;value=---%0Auid%3A%20chia.dotnet.BlockRecord.Overflow%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_BlockRecord_Overflow.md&amp;value=---%0Auid%3A%20chia.dotnet.BlockRecord.Overflow%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_BlockRecord_Overflow.md&amp;value=---%0Auid%3A%20chia.dotnet.BlockRecord.Overflow%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/BlockRecord.cs/#L51">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/BlockRecord.cs/#L51">View Source</a>
   </span>
   <a id="chia_dotnet_BlockRecord_Overflow_" data-uid="chia.dotnet.BlockRecord.Overflow*"></a>
   <h4 id="chia_dotnet_BlockRecord_Overflow" data-uid="chia.dotnet.BlockRecord.Overflow">Overflow</h4>
@@ -845,24 +551,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_BlockRecord_PoolPuzzleHash.md&amp;value=---%0Auid%3A%20chia.dotnet.BlockRecord.PoolPuzzleHash%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_BlockRecord_PoolPuzzleHash.md&amp;value=---%0Auid%3A%20chia.dotnet.BlockRecord.PoolPuzzleHash%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_BlockRecord_PoolPuzzleHash.md&amp;value=---%0Auid%3A%20chia.dotnet.BlockRecord.PoolPuzzleHash%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/BlockRecord.cs/#L55">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/BlockRecord.cs/#L55">View Source</a>
   </span>
   <a id="chia_dotnet_BlockRecord_PoolPuzzleHash_" data-uid="chia.dotnet.BlockRecord.PoolPuzzleHash*"></a>
   <h4 id="chia_dotnet_BlockRecord_PoolPuzzleHash" data-uid="chia.dotnet.BlockRecord.PoolPuzzleHash">PoolPuzzleHash</h4>
@@ -890,24 +582,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_BlockRecord_PrevHash.md&amp;value=---%0Auid%3A%20chia.dotnet.BlockRecord.PrevHash%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_BlockRecord_PrevHash.md&amp;value=---%0Auid%3A%20chia.dotnet.BlockRecord.PrevHash%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_BlockRecord_PrevHash.md&amp;value=---%0Auid%3A%20chia.dotnet.BlockRecord.PrevHash%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/BlockRecord.cs/#L60">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/BlockRecord.cs/#L60">View Source</a>
   </span>
   <a id="chia_dotnet_BlockRecord_PrevHash_" data-uid="chia.dotnet.BlockRecord.PrevHash*"></a>
   <h4 id="chia_dotnet_BlockRecord_PrevHash" data-uid="chia.dotnet.BlockRecord.PrevHash">PrevHash</h4>
@@ -936,24 +614,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_BlockRecord_PrevTransactionBlockHash.md&amp;value=---%0Auid%3A%20chia.dotnet.BlockRecord.PrevTransactionBlockHash%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_BlockRecord_PrevTransactionBlockHash.md&amp;value=---%0Auid%3A%20chia.dotnet.BlockRecord.PrevTransactionBlockHash%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_BlockRecord_PrevTransactionBlockHash.md&amp;value=---%0Auid%3A%20chia.dotnet.BlockRecord.PrevTransactionBlockHash%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/BlockRecord.cs/#L64">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/BlockRecord.cs/#L64">View Source</a>
   </span>
   <a id="chia_dotnet_BlockRecord_PrevTransactionBlockHash_" data-uid="chia.dotnet.BlockRecord.PrevTransactionBlockHash*"></a>
   <h4 id="chia_dotnet_BlockRecord_PrevTransactionBlockHash" data-uid="chia.dotnet.BlockRecord.PrevTransactionBlockHash">PrevTransactionBlockHash</h4>
@@ -981,24 +645,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_BlockRecord_PrevTransactionBlockHeight.md&amp;value=---%0Auid%3A%20chia.dotnet.BlockRecord.PrevTransactionBlockHeight%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_BlockRecord_PrevTransactionBlockHeight.md&amp;value=---%0Auid%3A%20chia.dotnet.BlockRecord.PrevTransactionBlockHeight%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_BlockRecord_PrevTransactionBlockHeight.md&amp;value=---%0Auid%3A%20chia.dotnet.BlockRecord.PrevTransactionBlockHeight%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/BlockRecord.cs/#L65">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/BlockRecord.cs/#L65">View Source</a>
   </span>
   <a id="chia_dotnet_BlockRecord_PrevTransactionBlockHeight_" data-uid="chia.dotnet.BlockRecord.PrevTransactionBlockHeight*"></a>
   <h4 id="chia_dotnet_BlockRecord_PrevTransactionBlockHeight" data-uid="chia.dotnet.BlockRecord.PrevTransactionBlockHeight">PrevTransactionBlockHeight</h4>
@@ -1025,24 +675,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_BlockRecord_RequiredIters.md&amp;value=---%0Auid%3A%20chia.dotnet.BlockRecord.RequiredIters%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_BlockRecord_RequiredIters.md&amp;value=---%0Auid%3A%20chia.dotnet.BlockRecord.RequiredIters%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_BlockRecord_RequiredIters.md&amp;value=---%0Auid%3A%20chia.dotnet.BlockRecord.RequiredIters%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/BlockRecord.cs/#L69">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/BlockRecord.cs/#L69">View Source</a>
   </span>
   <a id="chia_dotnet_BlockRecord_RequiredIters_" data-uid="chia.dotnet.BlockRecord.RequiredIters*"></a>
   <h4 id="chia_dotnet_BlockRecord_RequiredIters" data-uid="chia.dotnet.BlockRecord.RequiredIters">RequiredIters</h4>
@@ -1070,24 +706,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_BlockRecord_RewardClaimsIncorporated.md&amp;value=---%0Auid%3A%20chia.dotnet.BlockRecord.RewardClaimsIncorporated%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_BlockRecord_RewardClaimsIncorporated.md&amp;value=---%0Auid%3A%20chia.dotnet.BlockRecord.RewardClaimsIncorporated%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_BlockRecord_RewardClaimsIncorporated.md&amp;value=---%0Auid%3A%20chia.dotnet.BlockRecord.RewardClaimsIncorporated%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/BlockRecord.cs/#L73">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/BlockRecord.cs/#L73">View Source</a>
   </span>
   <a id="chia_dotnet_BlockRecord_RewardClaimsIncorporated_" data-uid="chia.dotnet.BlockRecord.RewardClaimsIncorporated*"></a>
   <h4 id="chia_dotnet_BlockRecord_RewardClaimsIncorporated" data-uid="chia.dotnet.BlockRecord.RewardClaimsIncorporated">RewardClaimsIncorporated</h4>
@@ -1096,21 +718,7 @@ <h4 id="chia_dotnet_BlockRecord_RewardClaimsIncorporated" data-uid="chia.dotnet.
   <div class="markdown level1 conceptual"></div>
   <h5 class="decalaration">Declaration</h5>
   <div class="codewrapper">
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <pre><code class="lang-csharp hljs">public IEnumerable&lt;Coin&gt; RewardClaimsIncorporated { get; set; }</code></pre>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <pre><code class="lang-csharp hljs">public ICollection&lt;Coin&gt; RewardClaimsIncorporated { get; set; }</code></pre>
-=======
-    <pre><code class="lang-csharp hljs">public IEnumerable&lt;Coin&gt; RewardClaimsIncorporated { get; set; }</code></pre>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </div>
   <h5 class="propertyValue">Property Value</h5>
   <table class="table table-bordered table-striped table-condensed">
@@ -1129,24 +737,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_BlockRecord_RewardInfusionNewChallenge.md&amp;value=---%0Auid%3A%20chia.dotnet.BlockRecord.RewardInfusionNewChallenge%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_BlockRecord_RewardInfusionNewChallenge.md&amp;value=---%0Auid%3A%20chia.dotnet.BlockRecord.RewardInfusionNewChallenge%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_BlockRecord_RewardInfusionNewChallenge.md&amp;value=---%0Auid%3A%20chia.dotnet.BlockRecord.RewardInfusionNewChallenge%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/BlockRecord.cs/#L77">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/BlockRecord.cs/#L77">View Source</a>
   </span>
   <a id="chia_dotnet_BlockRecord_RewardInfusionNewChallenge_" data-uid="chia.dotnet.BlockRecord.RewardInfusionNewChallenge*"></a>
   <h4 id="chia_dotnet_BlockRecord_RewardInfusionNewChallenge" data-uid="chia.dotnet.BlockRecord.RewardInfusionNewChallenge">RewardInfusionNewChallenge</h4>
@@ -1174,24 +768,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_BlockRecord_SignagePointIndex.md&amp;value=---%0Auid%3A%20chia.dotnet.BlockRecord.SignagePointIndex%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_BlockRecord_SignagePointIndex.md&amp;value=---%0Auid%3A%20chia.dotnet.BlockRecord.SignagePointIndex%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_BlockRecord_SignagePointIndex.md&amp;value=---%0Auid%3A%20chia.dotnet.BlockRecord.SignagePointIndex%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/BlockRecord.cs/#L78">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/BlockRecord.cs/#L78">View Source</a>
   </span>
   <a id="chia_dotnet_BlockRecord_SignagePointIndex_" data-uid="chia.dotnet.BlockRecord.SignagePointIndex*"></a>
   <h4 id="chia_dotnet_BlockRecord_SignagePointIndex" data-uid="chia.dotnet.BlockRecord.SignagePointIndex">SignagePointIndex</h4>
@@ -1218,24 +798,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_BlockRecord_SubEpochSummaryIncluded.md&amp;value=---%0Auid%3A%20chia.dotnet.BlockRecord.SubEpochSummaryIncluded%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_BlockRecord_SubEpochSummaryIncluded.md&amp;value=---%0Auid%3A%20chia.dotnet.BlockRecord.SubEpochSummaryIncluded%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_BlockRecord_SubEpochSummaryIncluded.md&amp;value=---%0Auid%3A%20chia.dotnet.BlockRecord.SubEpochSummaryIncluded%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/BlockRecord.cs/#L82">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/BlockRecord.cs/#L82">View Source</a>
   </span>
   <a id="chia_dotnet_BlockRecord_SubEpochSummaryIncluded_" data-uid="chia.dotnet.BlockRecord.SubEpochSummaryIncluded*"></a>
   <h4 id="chia_dotnet_BlockRecord_SubEpochSummaryIncluded" data-uid="chia.dotnet.BlockRecord.SubEpochSummaryIncluded">SubEpochSummaryIncluded</h4>
@@ -1263,24 +829,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_BlockRecord_SubSlotIters.md&amp;value=---%0Auid%3A%20chia.dotnet.BlockRecord.SubSlotIters%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_BlockRecord_SubSlotIters.md&amp;value=---%0Auid%3A%20chia.dotnet.BlockRecord.SubSlotIters%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_BlockRecord_SubSlotIters.md&amp;value=---%0Auid%3A%20chia.dotnet.BlockRecord.SubSlotIters%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/BlockRecord.cs/#L86">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/BlockRecord.cs/#L86">View Source</a>
   </span>
   <a id="chia_dotnet_BlockRecord_SubSlotIters_" data-uid="chia.dotnet.BlockRecord.SubSlotIters*"></a>
   <h4 id="chia_dotnet_BlockRecord_SubSlotIters" data-uid="chia.dotnet.BlockRecord.SubSlotIters">SubSlotIters</h4>
@@ -1308,24 +860,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_BlockRecord_Timestamp.md&amp;value=---%0Auid%3A%20chia.dotnet.BlockRecord.Timestamp%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_BlockRecord_Timestamp.md&amp;value=---%0Auid%3A%20chia.dotnet.BlockRecord.Timestamp%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_BlockRecord_Timestamp.md&amp;value=---%0Auid%3A%20chia.dotnet.BlockRecord.Timestamp%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/BlockRecord.cs/#L90">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/BlockRecord.cs/#L90">View Source</a>
   </span>
   <a id="chia_dotnet_BlockRecord_Timestamp_" data-uid="chia.dotnet.BlockRecord.Timestamp*"></a>
   <h4 id="chia_dotnet_BlockRecord_Timestamp" data-uid="chia.dotnet.BlockRecord.Timestamp">Timestamp</h4>
@@ -1353,24 +891,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_BlockRecord_TotalIters.md&amp;value=---%0Auid%3A%20chia.dotnet.BlockRecord.TotalIters%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_BlockRecord_TotalIters.md&amp;value=---%0Auid%3A%20chia.dotnet.BlockRecord.TotalIters%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_BlockRecord_TotalIters.md&amp;value=---%0Auid%3A%20chia.dotnet.BlockRecord.TotalIters%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/BlockRecord.cs/#L94">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/BlockRecord.cs/#L94">View Source</a>
   </span>
   <a id="chia_dotnet_BlockRecord_TotalIters_" data-uid="chia.dotnet.BlockRecord.TotalIters*"></a>
   <h4 id="chia_dotnet_BlockRecord_TotalIters" data-uid="chia.dotnet.BlockRecord.TotalIters">TotalIters</h4>
@@ -1398,24 +922,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_BlockRecord_Weight.md&amp;value=---%0Auid%3A%20chia.dotnet.BlockRecord.Weight%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_BlockRecord_Weight.md&amp;value=---%0Auid%3A%20chia.dotnet.BlockRecord.Weight%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_BlockRecord_Weight.md&amp;value=---%0Auid%3A%20chia.dotnet.BlockRecord.Weight%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/BlockRecord.cs/#L98">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/BlockRecord.cs/#L98">View Source</a>
   </span>
   <a id="chia_dotnet_BlockRecord_Weight_" data-uid="chia.dotnet.BlockRecord.Weight*"></a>
   <h4 id="chia_dotnet_BlockRecord_Weight" data-uid="chia.dotnet.BlockRecord.Weight">Weight</h4>
@@ -1453,24 +963,10 @@ <h3 id="implements">Implements</h3>
               <div class="contribution">
                 <ul class="nav">
                   <li>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-                    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_BlockRecord.md&amp;value=---%0Auid%3A%20chia.dotnet.BlockRecord%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-                    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_BlockRecord.md&amp;value=---%0Auid%3A%20chia.dotnet.BlockRecord%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-=======
                     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_BlockRecord.md&amp;value=---%0Auid%3A%20chia.dotnet.BlockRecord%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
                   </li>
                   <li>
-                    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/BlockRecord.cs/#L14" class="contribution-link">View Source</a>
+                    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/BlockRecord.cs/#L14" class="contribution-link">View Source</a>
                   </li>
                 </ul>
               </div>
diff --git a/docs/api/chia.dotnet.BlockchainState.html b/docs/api/chia.dotnet.BlockchainState.html
index 19f62834..9d7b8e4a 100644
--- a/docs/api/chia.dotnet.BlockchainState.html
+++ b/docs/api/chia.dotnet.BlockchainState.html
@@ -91,21 +91,7 @@ <h5>Inherited Members</h5>
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object)">Object.Equals(Object)</a>
     </div>
     <div>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object-system-object)">Object.Equals(Object, Object)</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-      <span class="xref">System.Object.Equals(System.Object, System.Object)</span>
-=======
-      <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object-system-object)">Object.Equals(Object, Object)</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
     </div>
     <div>
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.gethashcode#system-object-gethashcode">Object.GetHashCode()</a>
@@ -133,30 +119,10 @@ <h3 id="properties">Properties
   </h3>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_BlockchainState_BlockMaxCost.md&amp;value=---%0Auid%3A%20chia.dotnet.BlockchainState.BlockMaxCost%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
   </span>
   <span class="small pull-right mobile-hide">
     <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/BlockchainState.cs/#L19">View Source</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_BlockchainState_BlockMaxCost.md&amp;value=---%0Auid%3A%20chia.dotnet.BlockchainState.BlockMaxCost%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/BlockchainState.cs/#L19">View Source</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_BlockchainState_BlockMaxCost.md&amp;value=---%0Auid%3A%20chia.dotnet.BlockchainState.BlockMaxCost%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/BlockchainState.cs/#L19">View Source</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <a id="chia_dotnet_BlockchainState_BlockMaxCost_" data-uid="chia.dotnet.BlockchainState.BlockMaxCost*"></a>
   <h4 id="chia_dotnet_BlockchainState_BlockMaxCost" data-uid="chia.dotnet.BlockchainState.BlockMaxCost">BlockMaxCost</h4>
@@ -183,30 +149,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_BlockchainState_Difficulty.md&amp;value=---%0Auid%3A%20chia.dotnet.BlockchainState.Difficulty%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/BlockchainState.cs/#L12">View Source</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_BlockchainState_Difficulty.md&amp;value=---%0Auid%3A%20chia.dotnet.BlockchainState.Difficulty%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/BlockchainState.cs/#L12">View Source</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_BlockchainState_Difficulty.md&amp;value=---%0Auid%3A%20chia.dotnet.BlockchainState.Difficulty%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
   </span>
   <span class="small pull-right mobile-hide">
     <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/BlockchainState.cs/#L12">View Source</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <a id="chia_dotnet_BlockchainState_Difficulty_" data-uid="chia.dotnet.BlockchainState.Difficulty*"></a>
   <h4 id="chia_dotnet_BlockchainState_Difficulty" data-uid="chia.dotnet.BlockchainState.Difficulty">Difficulty</h4>
@@ -233,30 +179,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_BlockchainState_GenesisChallengeInitiated.md&amp;value=---%0Auid%3A%20chia.dotnet.BlockchainState.GenesisChallengeInitiated%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
   </span>
   <span class="small pull-right mobile-hide">
     <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/BlockchainState.cs/#L13">View Source</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_BlockchainState_GenesisChallengeInitiated.md&amp;value=---%0Auid%3A%20chia.dotnet.BlockchainState.GenesisChallengeInitiated%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/BlockchainState.cs/#L13">View Source</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_BlockchainState_GenesisChallengeInitiated.md&amp;value=---%0Auid%3A%20chia.dotnet.BlockchainState.GenesisChallengeInitiated%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/BlockchainState.cs/#L13">View Source</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <a id="chia_dotnet_BlockchainState_GenesisChallengeInitiated_" data-uid="chia.dotnet.BlockchainState.GenesisChallengeInitiated*"></a>
   <h4 id="chia_dotnet_BlockchainState_GenesisChallengeInitiated" data-uid="chia.dotnet.BlockchainState.GenesisChallengeInitiated">GenesisChallengeInitiated</h4>
@@ -283,30 +209,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_BlockchainState_MempoolCost.md&amp;value=---%0Auid%3A%20chia.dotnet.BlockchainState.MempoolCost%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
   </span>
   <span class="small pull-right mobile-hide">
     <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/BlockchainState.cs/#L15">View Source</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_BlockchainState_MempoolCost.md&amp;value=---%0Auid%3A%20chia.dotnet.BlockchainState.MempoolCost%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/BlockchainState.cs/#L15">View Source</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_BlockchainState_MempoolCost.md&amp;value=---%0Auid%3A%20chia.dotnet.BlockchainState.MempoolCost%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/BlockchainState.cs/#L15">View Source</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <a id="chia_dotnet_BlockchainState_MempoolCost_" data-uid="chia.dotnet.BlockchainState.MempoolCost*"></a>
   <h4 id="chia_dotnet_BlockchainState_MempoolCost" data-uid="chia.dotnet.BlockchainState.MempoolCost">MempoolCost</h4>
@@ -333,30 +239,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_BlockchainState_MempoolFees.md&amp;value=---%0Auid%3A%20chia.dotnet.BlockchainState.MempoolFees%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
   </span>
   <span class="small pull-right mobile-hide">
     <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/BlockchainState.cs/#L16">View Source</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_BlockchainState_MempoolFees.md&amp;value=---%0Auid%3A%20chia.dotnet.BlockchainState.MempoolFees%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/BlockchainState.cs/#L16">View Source</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_BlockchainState_MempoolFees.md&amp;value=---%0Auid%3A%20chia.dotnet.BlockchainState.MempoolFees%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/BlockchainState.cs/#L16">View Source</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <a id="chia_dotnet_BlockchainState_MempoolFees_" data-uid="chia.dotnet.BlockchainState.MempoolFees*"></a>
   <h4 id="chia_dotnet_BlockchainState_MempoolFees" data-uid="chia.dotnet.BlockchainState.MempoolFees">MempoolFees</h4>
@@ -383,30 +269,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_BlockchainState_MempoolMaxTotalCost.md&amp;value=---%0Auid%3A%20chia.dotnet.BlockchainState.MempoolMaxTotalCost%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
   </span>
   <span class="small pull-right mobile-hide">
     <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/BlockchainState.cs/#L18">View Source</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_BlockchainState_MempoolMaxTotalCost.md&amp;value=---%0Auid%3A%20chia.dotnet.BlockchainState.MempoolMaxTotalCost%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/BlockchainState.cs/#L18">View Source</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_BlockchainState_MempoolMaxTotalCost.md&amp;value=---%0Auid%3A%20chia.dotnet.BlockchainState.MempoolMaxTotalCost%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/BlockchainState.cs/#L18">View Source</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <a id="chia_dotnet_BlockchainState_MempoolMaxTotalCost_" data-uid="chia.dotnet.BlockchainState.MempoolMaxTotalCost*"></a>
   <h4 id="chia_dotnet_BlockchainState_MempoolMaxTotalCost" data-uid="chia.dotnet.BlockchainState.MempoolMaxTotalCost">MempoolMaxTotalCost</h4>
@@ -433,30 +299,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_BlockchainState_MempoolMinFees.md&amp;value=---%0Auid%3A%20chia.dotnet.BlockchainState.MempoolMinFees%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/BlockchainState.cs/#L17">View Source</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_BlockchainState_MempoolMinFees.md&amp;value=---%0Auid%3A%20chia.dotnet.BlockchainState.MempoolMinFees%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/BlockchainState.cs/#L17">View Source</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_BlockchainState_MempoolMinFees.md&amp;value=---%0Auid%3A%20chia.dotnet.BlockchainState.MempoolMinFees%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
   </span>
   <span class="small pull-right mobile-hide">
     <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/BlockchainState.cs/#L17">View Source</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <a id="chia_dotnet_BlockchainState_MempoolMinFees_" data-uid="chia.dotnet.BlockchainState.MempoolMinFees*"></a>
   <h4 id="chia_dotnet_BlockchainState_MempoolMinFees" data-uid="chia.dotnet.BlockchainState.MempoolMinFees">MempoolMinFees</h4>
@@ -483,30 +329,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_BlockchainState_MempoolSize.md&amp;value=---%0Auid%3A%20chia.dotnet.BlockchainState.MempoolSize%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
   </span>
   <span class="small pull-right mobile-hide">
     <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/BlockchainState.cs/#L14">View Source</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_BlockchainState_MempoolSize.md&amp;value=---%0Auid%3A%20chia.dotnet.BlockchainState.MempoolSize%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/BlockchainState.cs/#L14">View Source</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_BlockchainState_MempoolSize.md&amp;value=---%0Auid%3A%20chia.dotnet.BlockchainState.MempoolSize%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/BlockchainState.cs/#L14">View Source</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <a id="chia_dotnet_BlockchainState_MempoolSize_" data-uid="chia.dotnet.BlockchainState.MempoolSize*"></a>
   <h4 id="chia_dotnet_BlockchainState_MempoolSize" data-uid="chia.dotnet.BlockchainState.MempoolSize">MempoolSize</h4>
@@ -533,30 +359,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_BlockchainState_NodeId.md&amp;value=---%0Auid%3A%20chia.dotnet.BlockchainState.NodeId%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
   </span>
   <span class="small pull-right mobile-hide">
     <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/BlockchainState.cs/#L11">View Source</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_BlockchainState_NodeId.md&amp;value=---%0Auid%3A%20chia.dotnet.BlockchainState.NodeId%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/BlockchainState.cs/#L11">View Source</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_BlockchainState_NodeId.md&amp;value=---%0Auid%3A%20chia.dotnet.BlockchainState.NodeId%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/BlockchainState.cs/#L11">View Source</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <a id="chia_dotnet_BlockchainState_NodeId_" data-uid="chia.dotnet.BlockchainState.NodeId*"></a>
   <h4 id="chia_dotnet_BlockchainState_NodeId" data-uid="chia.dotnet.BlockchainState.NodeId">NodeId</h4>
@@ -583,30 +389,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_BlockchainState_Peak.md&amp;value=---%0Auid%3A%20chia.dotnet.BlockchainState.Peak%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/BlockchainState.cs/#L20">View Source</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_BlockchainState_Peak.md&amp;value=---%0Auid%3A%20chia.dotnet.BlockchainState.Peak%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/BlockchainState.cs/#L20">View Source</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_BlockchainState_Peak.md&amp;value=---%0Auid%3A%20chia.dotnet.BlockchainState.Peak%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
   </span>
   <span class="small pull-right mobile-hide">
     <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/BlockchainState.cs/#L20">View Source</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <a id="chia_dotnet_BlockchainState_Peak_" data-uid="chia.dotnet.BlockchainState.Peak*"></a>
   <h4 id="chia_dotnet_BlockchainState_Peak" data-uid="chia.dotnet.BlockchainState.Peak">Peak</h4>
@@ -633,30 +419,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_BlockchainState_Space.md&amp;value=---%0Auid%3A%20chia.dotnet.BlockchainState.Space%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/BlockchainState.cs/#L21">View Source</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_BlockchainState_Space.md&amp;value=---%0Auid%3A%20chia.dotnet.BlockchainState.Space%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/BlockchainState.cs/#L21">View Source</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_BlockchainState_Space.md&amp;value=---%0Auid%3A%20chia.dotnet.BlockchainState.Space%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
   </span>
   <span class="small pull-right mobile-hide">
     <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/BlockchainState.cs/#L21">View Source</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <a id="chia_dotnet_BlockchainState_Space_" data-uid="chia.dotnet.BlockchainState.Space*"></a>
   <h4 id="chia_dotnet_BlockchainState_Space" data-uid="chia.dotnet.BlockchainState.Space">Space</h4>
@@ -683,30 +449,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_BlockchainState_SubSlotIters.md&amp;value=---%0Auid%3A%20chia.dotnet.BlockchainState.SubSlotIters%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
   </span>
   <span class="small pull-right mobile-hide">
     <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/BlockchainState.cs/#L22">View Source</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_BlockchainState_SubSlotIters.md&amp;value=---%0Auid%3A%20chia.dotnet.BlockchainState.SubSlotIters%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/BlockchainState.cs/#L22">View Source</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_BlockchainState_SubSlotIters.md&amp;value=---%0Auid%3A%20chia.dotnet.BlockchainState.SubSlotIters%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/BlockchainState.cs/#L22">View Source</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <a id="chia_dotnet_BlockchainState_SubSlotIters_" data-uid="chia.dotnet.BlockchainState.SubSlotIters*"></a>
   <h4 id="chia_dotnet_BlockchainState_SubSlotIters" data-uid="chia.dotnet.BlockchainState.SubSlotIters">SubSlotIters</h4>
@@ -733,30 +479,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_BlockchainState_Sync.md&amp;value=---%0Auid%3A%20chia.dotnet.BlockchainState.Sync%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
   </span>
   <span class="small pull-right mobile-hide">
     <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/BlockchainState.cs/#L23">View Source</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_BlockchainState_Sync.md&amp;value=---%0Auid%3A%20chia.dotnet.BlockchainState.Sync%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/BlockchainState.cs/#L23">View Source</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_BlockchainState_Sync.md&amp;value=---%0Auid%3A%20chia.dotnet.BlockchainState.Sync%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/BlockchainState.cs/#L23">View Source</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <a id="chia_dotnet_BlockchainState_Sync_" data-uid="chia.dotnet.BlockchainState.Sync*"></a>
   <h4 id="chia_dotnet_BlockchainState_Sync" data-uid="chia.dotnet.BlockchainState.Sync">Sync</h4>
@@ -793,30 +519,10 @@ <h3 id="implements">Implements</h3>
               <div class="contribution">
                 <ul class="nav">
                   <li>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-                    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_BlockchainState.md&amp;value=---%0Auid%3A%20chia.dotnet.BlockchainState%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-                  </li>
-                  <li>
-                    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/BlockchainState.cs/#L9" class="contribution-link">View Source</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-                    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_BlockchainState.md&amp;value=---%0Auid%3A%20chia.dotnet.BlockchainState%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-                  </li>
-                  <li>
-                    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/BlockchainState.cs/#L9" class="contribution-link">View Source</a>
-=======
                     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_BlockchainState.md&amp;value=---%0Auid%3A%20chia.dotnet.BlockchainState%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
                   </li>
                   <li>
                     <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/BlockchainState.cs/#L9" class="contribution-link">View Source</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
                   </li>
                 </ul>
               </div>
diff --git a/docs/api/chia.dotnet.CATInfo.html b/docs/api/chia.dotnet.CATInfo.html
index 2403661e..9d156286 100644
--- a/docs/api/chia.dotnet.CATInfo.html
+++ b/docs/api/chia.dotnet.CATInfo.html
@@ -90,21 +90,7 @@ <h5>Inherited Members</h5>
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object)">Object.Equals(Object)</a>
     </div>
     <div>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object-system-object)">Object.Equals(Object, Object)</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-      <span class="xref">System.Object.Equals(System.Object, System.Object)</span>
-=======
-      <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object-system-object)">Object.Equals(Object, Object)</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
     </div>
     <div>
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.gethashcode#system-object-gethashcode">Object.GetHashCode()</a>
@@ -132,24 +118,10 @@ <h3 id="properties">Properties
   </h3>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_CATInfo_AssetId.md&amp;value=---%0Auid%3A%20chia.dotnet.CATInfo.AssetId%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_CATInfo_AssetId.md&amp;value=---%0Auid%3A%20chia.dotnet.CATInfo.AssetId%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_CATInfo_AssetId.md&amp;value=---%0Auid%3A%20chia.dotnet.CATInfo.AssetId%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/CATInfo.cs/#L5">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/CATInfo.cs/#L5">View Source</a>
   </span>
   <a id="chia_dotnet_CATInfo_AssetId_" data-uid="chia.dotnet.CATInfo.AssetId*"></a>
   <h4 id="chia_dotnet_CATInfo_AssetId" data-uid="chia.dotnet.CATInfo.AssetId">AssetId</h4>
@@ -176,24 +148,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_CATInfo_Name.md&amp;value=---%0Auid%3A%20chia.dotnet.CATInfo.Name%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_CATInfo_Name.md&amp;value=---%0Auid%3A%20chia.dotnet.CATInfo.Name%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_CATInfo_Name.md&amp;value=---%0Auid%3A%20chia.dotnet.CATInfo.Name%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/CATInfo.cs/#L6">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/CATInfo.cs/#L6">View Source</a>
   </span>
   <a id="chia_dotnet_CATInfo_Name_" data-uid="chia.dotnet.CATInfo.Name*"></a>
   <h4 id="chia_dotnet_CATInfo_Name" data-uid="chia.dotnet.CATInfo.Name">Name</h4>
@@ -220,24 +178,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_CATInfo_Symbol.md&amp;value=---%0Auid%3A%20chia.dotnet.CATInfo.Symbol%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_CATInfo_Symbol.md&amp;value=---%0Auid%3A%20chia.dotnet.CATInfo.Symbol%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_CATInfo_Symbol.md&amp;value=---%0Auid%3A%20chia.dotnet.CATInfo.Symbol%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/CATInfo.cs/#L7">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/CATInfo.cs/#L7">View Source</a>
   </span>
   <a id="chia_dotnet_CATInfo_Symbol_" data-uid="chia.dotnet.CATInfo.Symbol*"></a>
   <h4 id="chia_dotnet_CATInfo_Symbol" data-uid="chia.dotnet.CATInfo.Symbol">Symbol</h4>
@@ -274,24 +218,10 @@ <h3 id="implements">Implements</h3>
               <div class="contribution">
                 <ul class="nav">
                   <li>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-                    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_CATInfo.md&amp;value=---%0Auid%3A%20chia.dotnet.CATInfo%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-                    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_CATInfo.md&amp;value=---%0Auid%3A%20chia.dotnet.CATInfo%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-=======
                     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_CATInfo.md&amp;value=---%0Auid%3A%20chia.dotnet.CATInfo%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
                   </li>
                   <li>
-                    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/CATInfo.cs/#L3" class="contribution-link">View Source</a>
+                    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/CATInfo.cs/#L3" class="contribution-link">View Source</a>
                   </li>
                 </ul>
               </div>
diff --git a/docs/api/chia.dotnet.CATWallet.html b/docs/api/chia.dotnet.CATWallet.html
index 117a41c2..733b73e6 100644
--- a/docs/api/chia.dotnet.CATWallet.html
+++ b/docs/api/chia.dotnet.CATWallet.html
@@ -158,24 +158,10 @@ <h3 id="constructors">Constructors
   </h3>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_CATWallet__ctor_System_UInt32_chia_dotnet_WalletProxy_.md&amp;value=---%0Auid%3A%20chia.dotnet.CATWallet.%23ctor(System.UInt32%2Cchia.dotnet.WalletProxy)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_CATWallet__ctor_System_UInt32_chia_dotnet_WalletProxy_.md&amp;value=---%0Auid%3A%20chia.dotnet.CATWallet.%23ctor(System.UInt32%2Cchia.dotnet.WalletProxy)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_CATWallet__ctor_System_UInt32_chia_dotnet_WalletProxy_.md&amp;value=---%0Auid%3A%20chia.dotnet.CATWallet.%23ctor(System.UInt32%2Cchia.dotnet.WalletProxy)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/CATWallet.cs/#L19">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/CATWallet.cs/#L19">View Source</a>
   </span>
   <a id="chia_dotnet_CATWallet__ctor_" data-uid="chia.dotnet.CATWallet.#ctor*"></a>
   <h4 id="chia_dotnet_CATWallet__ctor_System_UInt32_chia_dotnet_WalletProxy_" data-uid="chia.dotnet.CATWallet.#ctor(System.UInt32,chia.dotnet.WalletProxy)">CATWallet(UInt32, WalletProxy)</h4>
@@ -214,24 +200,10 @@ <h3 id="methods">Methods
   </h3>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_CATWallet_GetAssetId_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.CATWallet.GetAssetId(System.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_CATWallet_GetAssetId_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.CATWallet.GetAssetId(System.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_CATWallet_GetAssetId_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.CATWallet.GetAssetId(System.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/CATWallet.cs/#L50">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/CATWallet.cs/#L50">View Source</a>
   </span>
   <a id="chia_dotnet_CATWallet_GetAssetId_" data-uid="chia.dotnet.CATWallet.GetAssetId*"></a>
   <h4 id="chia_dotnet_CATWallet_GetAssetId_System_Threading_CancellationToken_" data-uid="chia.dotnet.CATWallet.GetAssetId(System.Threading.CancellationToken)">GetAssetId(CancellationToken)</h4>
@@ -278,24 +250,10 @@ <h5 class="returns">Returns</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_CATWallet_GetName_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.CATWallet.GetName(System.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_CATWallet_GetName_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.CATWallet.GetName(System.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_CATWallet_GetName_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.CATWallet.GetName(System.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/CATWallet.cs/#L38">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/CATWallet.cs/#L38">View Source</a>
   </span>
   <a id="chia_dotnet_CATWallet_GetName_" data-uid="chia.dotnet.CATWallet.GetName*"></a>
   <h4 id="chia_dotnet_CATWallet_GetName_System_Threading_CancellationToken_" data-uid="chia.dotnet.CATWallet.GetName(System.Threading.CancellationToken)">GetName(CancellationToken)</h4>
@@ -342,24 +300,10 @@ <h5 class="returns">Returns</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_CATWallet_SetName_System_String_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.CATWallet.SetName(System.String%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_CATWallet_SetName_System_String_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.CATWallet.SetName(System.String%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_CATWallet_SetName_System_String_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.CATWallet.SetName(System.String%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/CATWallet.cs/#L63">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/CATWallet.cs/#L63">View Source</a>
   </span>
   <a id="chia_dotnet_CATWallet_SetName_" data-uid="chia.dotnet.CATWallet.SetName*"></a>
   <h4 id="chia_dotnet_CATWallet_SetName_System_String_System_Threading_CancellationToken_" data-uid="chia.dotnet.CATWallet.SetName(System.String,System.Threading.CancellationToken)">SetName(String, CancellationToken)</h4>
@@ -412,24 +356,10 @@ <h5 class="returns">Returns</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_CATWallet_Spend_System_String_System_UInt64_System_Collections_Generic_IEnumerable_System_String__System_UInt64_System_UInt64_System_Collections_Generic_IEnumerable_System_UInt64__System_Nullable_System_Boolean__System_UInt64_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.CATWallet.Spend(System.String%2CSystem.UInt64%2CSystem.Collections.Generic.IEnumerable%7BSystem.String%7D%2CSystem.UInt64%2CSystem.UInt64%2CSystem.Collections.Generic.IEnumerable%7BSystem.UInt64%7D%2CSystem.Nullable%7BSystem.Boolean%7D%2CSystem.UInt64%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_CATWallet_Spend_System_String_System_UInt64_System_Collections_Generic_IEnumerable_System_String__System_UInt64_System_UInt64_System_Collections_Generic_IEnumerable_System_UInt64__System_Nullable_System_Boolean__System_UInt64_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.CATWallet.Spend(System.String%2CSystem.UInt64%2CSystem.Collections.Generic.IEnumerable%7BSystem.String%7D%2CSystem.UInt64%2CSystem.UInt64%2CSystem.Collections.Generic.IEnumerable%7BSystem.UInt64%7D%2CSystem.Nullable%7BSystem.Boolean%7D%2CSystem.UInt64%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_CATWallet_Spend_System_String_System_UInt64_System_Collections_Generic_IEnumerable_System_String__System_UInt64_System_UInt64_System_Collections_Generic_IEnumerable_System_UInt64__System_Nullable_System_Boolean__System_UInt64_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.CATWallet.Spend(System.String%2CSystem.UInt64%2CSystem.Collections.Generic.IEnumerable%7BSystem.String%7D%2CSystem.UInt64%2CSystem.UInt64%2CSystem.Collections.Generic.IEnumerable%7BSystem.UInt64%7D%2CSystem.Nullable%7BSystem.Boolean%7D%2CSystem.UInt64%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/CATWallet.cs/#L89">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/CATWallet.cs/#L89">View Source</a>
   </span>
   <a id="chia_dotnet_CATWallet_Spend_" data-uid="chia.dotnet.CATWallet.Spend*"></a>
   <h4 id="chia_dotnet_CATWallet_Spend_System_String_System_UInt64_System_Collections_Generic_IEnumerable_System_String__System_UInt64_System_UInt64_System_Collections_Generic_IEnumerable_System_UInt64__System_Nullable_System_Boolean__System_UInt64_System_Threading_CancellationToken_" data-uid="chia.dotnet.CATWallet.Spend(System.String,System.UInt64,System.Collections.Generic.IEnumerable{System.String},System.UInt64,System.UInt64,System.Collections.Generic.IEnumerable{System.UInt64},System.Nullable{System.Boolean},System.UInt64,System.Threading.CancellationToken)">Spend(String, UInt64, IEnumerable&lt;String&gt;, UInt64, UInt64, IEnumerable&lt;UInt64&gt;, Nullable&lt;Boolean&gt;, UInt64, CancellationToken)</h4>
@@ -520,24 +450,10 @@ <h5 class="returns">Returns</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_CATWallet_Validate_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.CATWallet.Validate(System.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_CATWallet_Validate_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.CATWallet.Validate(System.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_CATWallet_Validate_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.CATWallet.Validate(System.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/CATWallet.cs/#L28">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/CATWallet.cs/#L28">View Source</a>
   </span>
   <a id="chia_dotnet_CATWallet_Validate_" data-uid="chia.dotnet.CATWallet.Validate*"></a>
   <h4 id="chia_dotnet_CATWallet_Validate_System_Threading_CancellationToken_" data-uid="chia.dotnet.CATWallet.Validate(System.Threading.CancellationToken)">Validate(CancellationToken)</h4>
@@ -591,24 +507,10 @@ <h5 class="overrides">Overrides</h5>
               <div class="contribution">
                 <ul class="nav">
                   <li>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-                    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_CATWallet.md&amp;value=---%0Auid%3A%20chia.dotnet.CATWallet%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-                    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_CATWallet.md&amp;value=---%0Auid%3A%20chia.dotnet.CATWallet%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-=======
                     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_CATWallet.md&amp;value=---%0Auid%3A%20chia.dotnet.CATWallet%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
                   </li>
                   <li>
-                    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/CATWallet.cs/#L12" class="contribution-link">View Source</a>
+                    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/CATWallet.cs/#L12" class="contribution-link">View Source</a>
                   </li>
                 </ul>
               </div>
diff --git a/docs/api/chia.dotnet.ChallengeChainSubSlot.html b/docs/api/chia.dotnet.ChallengeChainSubSlot.html
index 6c6a0bb5..496349b5 100644
--- a/docs/api/chia.dotnet.ChallengeChainSubSlot.html
+++ b/docs/api/chia.dotnet.ChallengeChainSubSlot.html
@@ -90,21 +90,7 @@ <h5>Inherited Members</h5>
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object)">Object.Equals(Object)</a>
     </div>
     <div>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object-system-object)">Object.Equals(Object, Object)</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-      <span class="xref">System.Object.Equals(System.Object, System.Object)</span>
-=======
-      <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object-system-object)">Object.Equals(Object, Object)</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
     </div>
     <div>
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.gethashcode#system-object-gethashcode">Object.GetHashCode()</a>
@@ -132,24 +118,10 @@ <h3 id="properties">Properties
   </h3>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_ChallengeChainSubSlot_ChallengeChainEndOfSlotVdf.md&amp;value=---%0Auid%3A%20chia.dotnet.ChallengeChainSubSlot.ChallengeChainEndOfSlotVdf%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_ChallengeChainSubSlot_ChallengeChainEndOfSlotVdf.md&amp;value=---%0Auid%3A%20chia.dotnet.ChallengeChainSubSlot.ChallengeChainEndOfSlotVdf%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_ChallengeChainSubSlot_ChallengeChainEndOfSlotVdf.md&amp;value=---%0Auid%3A%20chia.dotnet.ChallengeChainSubSlot.ChallengeChainEndOfSlotVdf%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/ChallengeChainSubSlot.cs/#L5">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/ChallengeChainSubSlot.cs/#L5">View Source</a>
   </span>
   <a id="chia_dotnet_ChallengeChainSubSlot_ChallengeChainEndOfSlotVdf_" data-uid="chia.dotnet.ChallengeChainSubSlot.ChallengeChainEndOfSlotVdf*"></a>
   <h4 id="chia_dotnet_ChallengeChainSubSlot_ChallengeChainEndOfSlotVdf" data-uid="chia.dotnet.ChallengeChainSubSlot.ChallengeChainEndOfSlotVdf">ChallengeChainEndOfSlotVdf</h4>
@@ -176,24 +148,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_ChallengeChainSubSlot_InfusedChallengeChainSubSlotHash.md&amp;value=---%0Auid%3A%20chia.dotnet.ChallengeChainSubSlot.InfusedChallengeChainSubSlotHash%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_ChallengeChainSubSlot_InfusedChallengeChainSubSlotHash.md&amp;value=---%0Auid%3A%20chia.dotnet.ChallengeChainSubSlot.InfusedChallengeChainSubSlotHash%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_ChallengeChainSubSlot_InfusedChallengeChainSubSlotHash.md&amp;value=---%0Auid%3A%20chia.dotnet.ChallengeChainSubSlot.InfusedChallengeChainSubSlotHash%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/ChallengeChainSubSlot.cs/#L9">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/ChallengeChainSubSlot.cs/#L9">View Source</a>
   </span>
   <a id="chia_dotnet_ChallengeChainSubSlot_InfusedChallengeChainSubSlotHash_" data-uid="chia.dotnet.ChallengeChainSubSlot.InfusedChallengeChainSubSlotHash*"></a>
   <h4 id="chia_dotnet_ChallengeChainSubSlot_InfusedChallengeChainSubSlotHash" data-uid="chia.dotnet.ChallengeChainSubSlot.InfusedChallengeChainSubSlotHash">InfusedChallengeChainSubSlotHash</h4>
@@ -221,24 +179,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_ChallengeChainSubSlot_NewDifficulty.md&amp;value=---%0Auid%3A%20chia.dotnet.ChallengeChainSubSlot.NewDifficulty%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_ChallengeChainSubSlot_NewDifficulty.md&amp;value=---%0Auid%3A%20chia.dotnet.ChallengeChainSubSlot.NewDifficulty%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_ChallengeChainSubSlot_NewDifficulty.md&amp;value=---%0Auid%3A%20chia.dotnet.ChallengeChainSubSlot.NewDifficulty%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/ChallengeChainSubSlot.cs/#L21">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/ChallengeChainSubSlot.cs/#L21">View Source</a>
   </span>
   <a id="chia_dotnet_ChallengeChainSubSlot_NewDifficulty_" data-uid="chia.dotnet.ChallengeChainSubSlot.NewDifficulty*"></a>
   <h4 id="chia_dotnet_ChallengeChainSubSlot_NewDifficulty" data-uid="chia.dotnet.ChallengeChainSubSlot.NewDifficulty">NewDifficulty</h4>
@@ -266,24 +210,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_ChallengeChainSubSlot_NewSubSlotIters.md&amp;value=---%0Auid%3A%20chia.dotnet.ChallengeChainSubSlot.NewSubSlotIters%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_ChallengeChainSubSlot_NewSubSlotIters.md&amp;value=---%0Auid%3A%20chia.dotnet.ChallengeChainSubSlot.NewSubSlotIters%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_ChallengeChainSubSlot_NewSubSlotIters.md&amp;value=---%0Auid%3A%20chia.dotnet.ChallengeChainSubSlot.NewSubSlotIters%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/ChallengeChainSubSlot.cs/#L17">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/ChallengeChainSubSlot.cs/#L17">View Source</a>
   </span>
   <a id="chia_dotnet_ChallengeChainSubSlot_NewSubSlotIters_" data-uid="chia.dotnet.ChallengeChainSubSlot.NewSubSlotIters*"></a>
   <h4 id="chia_dotnet_ChallengeChainSubSlot_NewSubSlotIters" data-uid="chia.dotnet.ChallengeChainSubSlot.NewSubSlotIters">NewSubSlotIters</h4>
@@ -311,24 +241,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_ChallengeChainSubSlot_SubepochSummaryHash.md&amp;value=---%0Auid%3A%20chia.dotnet.ChallengeChainSubSlot.SubepochSummaryHash%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_ChallengeChainSubSlot_SubepochSummaryHash.md&amp;value=---%0Auid%3A%20chia.dotnet.ChallengeChainSubSlot.SubepochSummaryHash%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_ChallengeChainSubSlot_SubepochSummaryHash.md&amp;value=---%0Auid%3A%20chia.dotnet.ChallengeChainSubSlot.SubepochSummaryHash%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/ChallengeChainSubSlot.cs/#L13">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/ChallengeChainSubSlot.cs/#L13">View Source</a>
   </span>
   <a id="chia_dotnet_ChallengeChainSubSlot_SubepochSummaryHash_" data-uid="chia.dotnet.ChallengeChainSubSlot.SubepochSummaryHash*"></a>
   <h4 id="chia_dotnet_ChallengeChainSubSlot_SubepochSummaryHash" data-uid="chia.dotnet.ChallengeChainSubSlot.SubepochSummaryHash">SubepochSummaryHash</h4>
@@ -366,24 +282,10 @@ <h3 id="implements">Implements</h3>
               <div class="contribution">
                 <ul class="nav">
                   <li>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-                    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_ChallengeChainSubSlot.md&amp;value=---%0Auid%3A%20chia.dotnet.ChallengeChainSubSlot%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-                    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_ChallengeChainSubSlot.md&amp;value=---%0Auid%3A%20chia.dotnet.ChallengeChainSubSlot%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-=======
                     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_ChallengeChainSubSlot.md&amp;value=---%0Auid%3A%20chia.dotnet.ChallengeChainSubSlot%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
                   </li>
                   <li>
-                    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/ChallengeChainSubSlot.cs/#L3" class="contribution-link">View Source</a>
+                    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/ChallengeChainSubSlot.cs/#L3" class="contribution-link">View Source</a>
                   </li>
                 </ul>
               </div>
diff --git a/docs/api/chia.dotnet.ClassgroupElement.html b/docs/api/chia.dotnet.ClassgroupElement.html
index 8f852811..4fdf665f 100644
--- a/docs/api/chia.dotnet.ClassgroupElement.html
+++ b/docs/api/chia.dotnet.ClassgroupElement.html
@@ -93,21 +93,7 @@ <h5>Inherited Members</h5>
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object)">Object.Equals(Object)</a>
     </div>
     <div>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object-system-object)">Object.Equals(Object, Object)</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-      <span class="xref">System.Object.Equals(System.Object, System.Object)</span>
-=======
-      <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object-system-object)">Object.Equals(Object, Object)</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
     </div>
     <div>
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.gethashcode#system-object-gethashcode">Object.GetHashCode()</a>
@@ -135,24 +121,10 @@ <h3 id="properties">Properties
   </h3>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_ClassgroupElement_Data.md&amp;value=---%0Auid%3A%20chia.dotnet.ClassgroupElement.Data%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_ClassgroupElement_Data.md&amp;value=---%0Auid%3A%20chia.dotnet.ClassgroupElement.Data%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_ClassgroupElement_Data.md&amp;value=---%0Auid%3A%20chia.dotnet.ClassgroupElement.Data%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/ClassgroupElement.cs/#L10">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/ClassgroupElement.cs/#L10">View Source</a>
   </span>
   <a id="chia_dotnet_ClassgroupElement_Data_" data-uid="chia.dotnet.ClassgroupElement.Data*"></a>
   <h4 id="chia_dotnet_ClassgroupElement_Data" data-uid="chia.dotnet.ClassgroupElement.Data">Data</h4>
@@ -189,24 +161,10 @@ <h3 id="implements">Implements</h3>
               <div class="contribution">
                 <ul class="nav">
                   <li>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-                    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_ClassgroupElement.md&amp;value=---%0Auid%3A%20chia.dotnet.ClassgroupElement%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-                    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_ClassgroupElement.md&amp;value=---%0Auid%3A%20chia.dotnet.ClassgroupElement%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-=======
                     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_ClassgroupElement.md&amp;value=---%0Auid%3A%20chia.dotnet.ClassgroupElement%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
                   </li>
                   <li>
-                    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/ClassgroupElement.cs/#L8" class="contribution-link">View Source</a>
+                    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/ClassgroupElement.cs/#L8" class="contribution-link">View Source</a>
                   </li>
                 </ul>
               </div>
diff --git a/docs/api/chia.dotnet.Coin.html b/docs/api/chia.dotnet.Coin.html
index 68230f9f..77201e0b 100644
--- a/docs/api/chia.dotnet.Coin.html
+++ b/docs/api/chia.dotnet.Coin.html
@@ -91,21 +91,7 @@ <h5>Inherited Members</h5>
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object)">Object.Equals(Object)</a>
     </div>
     <div>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object-system-object)">Object.Equals(Object, Object)</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-      <span class="xref">System.Object.Equals(System.Object, System.Object)</span>
-=======
-      <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object-system-object)">Object.Equals(Object, Object)</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
     </div>
     <div>
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.gethashcode#system-object-gethashcode">Object.GetHashCode()</a>
@@ -133,30 +119,10 @@ <h3 id="properties">Properties
   </h3>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_Coin_Amount.md&amp;value=---%0Auid%3A%20chia.dotnet.Coin.Amount%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/Coin.cs/#L15">View Source</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_Coin_Amount.md&amp;value=---%0Auid%3A%20chia.dotnet.Coin.Amount%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/Coin.cs/#L15">View Source</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_Coin_Amount.md&amp;value=---%0Auid%3A%20chia.dotnet.Coin.Amount%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
   </span>
   <span class="small pull-right mobile-hide">
     <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/Coin.cs/#L15">View Source</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <a id="chia_dotnet_Coin_Amount_" data-uid="chia.dotnet.Coin.Amount*"></a>
   <h4 id="chia_dotnet_Coin_Amount" data-uid="chia.dotnet.Coin.Amount">Amount</h4>
@@ -183,30 +149,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_Coin_Name.md&amp;value=---%0Auid%3A%20chia.dotnet.Coin.Name%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
   </span>
   <span class="small pull-right mobile-hide">
     <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/Coin.cs/#L16">View Source</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_Coin_Name.md&amp;value=---%0Auid%3A%20chia.dotnet.Coin.Name%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/Coin.cs/#L16">View Source</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_Coin_Name.md&amp;value=---%0Auid%3A%20chia.dotnet.Coin.Name%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/Coin.cs/#L16">View Source</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <a id="chia_dotnet_Coin_Name_" data-uid="chia.dotnet.Coin.Name*"></a>
   <h4 id="chia_dotnet_Coin_Name" data-uid="chia.dotnet.Coin.Name">Name</h4>
@@ -234,33 +180,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_Coin_ParentCoinInfo.md&amp;value=---%0Auid%3A%20chia.dotnet.Coin.ParentCoinInfo%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/Coin.cs/#L13">View Source</a>
-=======
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_Coin_ParentCoinInfo.md&amp;value=---%0Auid%3A%20chia.dotnet.Coin.ParentCoinInfo%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
   </span>
   <span class="small pull-right mobile-hide">
     <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/Coin.cs/#L13">View Source</a>
-<<<<<<< HEAD
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-=======
-<<<<<<< HEAD
-=======
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <a id="chia_dotnet_Coin_ParentCoinInfo_" data-uid="chia.dotnet.Coin.ParentCoinInfo*"></a>
   <h4 id="chia_dotnet_Coin_ParentCoinInfo" data-uid="chia.dotnet.Coin.ParentCoinInfo">ParentCoinInfo</h4>
@@ -287,30 +210,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_Coin_PuzzleHash.md&amp;value=---%0Auid%3A%20chia.dotnet.Coin.PuzzleHash%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/Coin.cs/#L14">View Source</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_Coin_PuzzleHash.md&amp;value=---%0Auid%3A%20chia.dotnet.Coin.PuzzleHash%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/Coin.cs/#L14">View Source</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_Coin_PuzzleHash.md&amp;value=---%0Auid%3A%20chia.dotnet.Coin.PuzzleHash%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
   </span>
   <span class="small pull-right mobile-hide">
     <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/Coin.cs/#L14">View Source</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <a id="chia_dotnet_Coin_PuzzleHash_" data-uid="chia.dotnet.Coin.PuzzleHash*"></a>
   <h4 id="chia_dotnet_Coin_PuzzleHash" data-uid="chia.dotnet.Coin.PuzzleHash">PuzzleHash</h4>
@@ -347,30 +250,10 @@ <h3 id="implements">Implements</h3>
               <div class="contribution">
                 <ul class="nav">
                   <li>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-                    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_Coin.md&amp;value=---%0Auid%3A%20chia.dotnet.Coin%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-                  </li>
-                  <li>
-                    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/Coin.cs/#L11" class="contribution-link">View Source</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-                    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_Coin.md&amp;value=---%0Auid%3A%20chia.dotnet.Coin%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-                  </li>
-                  <li>
-                    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/Coin.cs/#L11" class="contribution-link">View Source</a>
-=======
                     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_Coin.md&amp;value=---%0Auid%3A%20chia.dotnet.Coin%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
                   </li>
                   <li>
                     <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/Coin.cs/#L11" class="contribution-link">View Source</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
                   </li>
                 </ul>
               </div>
diff --git a/docs/api/chia.dotnet.CoinAnnouncement.html b/docs/api/chia.dotnet.CoinAnnouncement.html
index 13c65c93..945a92b2 100644
--- a/docs/api/chia.dotnet.CoinAnnouncement.html
+++ b/docs/api/chia.dotnet.CoinAnnouncement.html
@@ -90,21 +90,7 @@ <h5>Inherited Members</h5>
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object)">Object.Equals(Object)</a>
     </div>
     <div>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object-system-object)">Object.Equals(Object, Object)</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-      <span class="xref">System.Object.Equals(System.Object, System.Object)</span>
-=======
-      <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object-system-object)">Object.Equals(Object, Object)</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
     </div>
     <div>
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.gethashcode#system-object-gethashcode">Object.GetHashCode()</a>
@@ -132,24 +118,10 @@ <h3 id="properties">Properties
   </h3>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_CoinAnnouncement_CoinId.md&amp;value=---%0Auid%3A%20chia.dotnet.CoinAnnouncement.CoinId%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_CoinAnnouncement_CoinId.md&amp;value=---%0Auid%3A%20chia.dotnet.CoinAnnouncement.CoinId%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_CoinAnnouncement_CoinId.md&amp;value=---%0Auid%3A%20chia.dotnet.CoinAnnouncement.CoinId%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/CoinAnnouncement.cs/#L5">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/CoinAnnouncement.cs/#L5">View Source</a>
   </span>
   <a id="chia_dotnet_CoinAnnouncement_CoinId_" data-uid="chia.dotnet.CoinAnnouncement.CoinId*"></a>
   <h4 id="chia_dotnet_CoinAnnouncement_CoinId" data-uid="chia.dotnet.CoinAnnouncement.CoinId">CoinId</h4>
@@ -176,24 +148,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_CoinAnnouncement_Message.md&amp;value=---%0Auid%3A%20chia.dotnet.CoinAnnouncement.Message%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_CoinAnnouncement_Message.md&amp;value=---%0Auid%3A%20chia.dotnet.CoinAnnouncement.Message%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_CoinAnnouncement_Message.md&amp;value=---%0Auid%3A%20chia.dotnet.CoinAnnouncement.Message%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/CoinAnnouncement.cs/#L6">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/CoinAnnouncement.cs/#L6">View Source</a>
   </span>
   <a id="chia_dotnet_CoinAnnouncement_Message_" data-uid="chia.dotnet.CoinAnnouncement.Message*"></a>
   <h4 id="chia_dotnet_CoinAnnouncement_Message" data-uid="chia.dotnet.CoinAnnouncement.Message">Message</h4>
@@ -220,24 +178,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_CoinAnnouncement_MorphBytes.md&amp;value=---%0Auid%3A%20chia.dotnet.CoinAnnouncement.MorphBytes%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_CoinAnnouncement_MorphBytes.md&amp;value=---%0Auid%3A%20chia.dotnet.CoinAnnouncement.MorphBytes%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_CoinAnnouncement_MorphBytes.md&amp;value=---%0Auid%3A%20chia.dotnet.CoinAnnouncement.MorphBytes%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/CoinAnnouncement.cs/#L7">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/CoinAnnouncement.cs/#L7">View Source</a>
   </span>
   <a id="chia_dotnet_CoinAnnouncement_MorphBytes_" data-uid="chia.dotnet.CoinAnnouncement.MorphBytes*"></a>
   <h4 id="chia_dotnet_CoinAnnouncement_MorphBytes" data-uid="chia.dotnet.CoinAnnouncement.MorphBytes">MorphBytes</h4>
@@ -274,24 +218,10 @@ <h3 id="implements">Implements</h3>
               <div class="contribution">
                 <ul class="nav">
                   <li>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-                    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_CoinAnnouncement.md&amp;value=---%0Auid%3A%20chia.dotnet.CoinAnnouncement%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-                    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_CoinAnnouncement.md&amp;value=---%0Auid%3A%20chia.dotnet.CoinAnnouncement%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-=======
                     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_CoinAnnouncement.md&amp;value=---%0Auid%3A%20chia.dotnet.CoinAnnouncement%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
                   </li>
                   <li>
-                    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/CoinAnnouncement.cs/#L3" class="contribution-link">View Source</a>
+                    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/CoinAnnouncement.cs/#L3" class="contribution-link">View Source</a>
                   </li>
                 </ul>
               </div>
diff --git a/docs/api/chia.dotnet.CoinRecord.html b/docs/api/chia.dotnet.CoinRecord.html
index 7bebd55c..4ebf56f3 100644
--- a/docs/api/chia.dotnet.CoinRecord.html
+++ b/docs/api/chia.dotnet.CoinRecord.html
@@ -92,21 +92,7 @@ <h5>Inherited Members</h5>
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object)">Object.Equals(Object)</a>
     </div>
     <div>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object-system-object)">Object.Equals(Object, Object)</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-      <span class="xref">System.Object.Equals(System.Object, System.Object)</span>
-=======
-      <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object-system-object)">Object.Equals(Object, Object)</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
     </div>
     <div>
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.gethashcode#system-object-gethashcode">Object.GetHashCode()</a>
@@ -134,24 +120,10 @@ <h3 id="properties">Properties
   </h3>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_CoinRecord_Coin.md&amp;value=---%0Auid%3A%20chia.dotnet.CoinRecord.Coin%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_CoinRecord_Coin.md&amp;value=---%0Auid%3A%20chia.dotnet.CoinRecord.Coin%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_CoinRecord_Coin.md&amp;value=---%0Auid%3A%20chia.dotnet.CoinRecord.Coin%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/CoinRecord.cs/#L13">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/CoinRecord.cs/#L13">View Source</a>
   </span>
   <a id="chia_dotnet_CoinRecord_Coin_" data-uid="chia.dotnet.CoinRecord.Coin*"></a>
   <h4 id="chia_dotnet_CoinRecord_Coin" data-uid="chia.dotnet.CoinRecord.Coin">Coin</h4>
@@ -178,24 +150,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_CoinRecord_Coinbase.md&amp;value=---%0Auid%3A%20chia.dotnet.CoinRecord.Coinbase%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_CoinRecord_Coinbase.md&amp;value=---%0Auid%3A%20chia.dotnet.CoinRecord.Coinbase%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_CoinRecord_Coinbase.md&amp;value=---%0Auid%3A%20chia.dotnet.CoinRecord.Coinbase%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/CoinRecord.cs/#L17">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/CoinRecord.cs/#L17">View Source</a>
   </span>
   <a id="chia_dotnet_CoinRecord_Coinbase_" data-uid="chia.dotnet.CoinRecord.Coinbase*"></a>
   <h4 id="chia_dotnet_CoinRecord_Coinbase" data-uid="chia.dotnet.CoinRecord.Coinbase">Coinbase</h4>
@@ -222,24 +180,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_CoinRecord_ConfirmedBlockIndex.md&amp;value=---%0Auid%3A%20chia.dotnet.CoinRecord.ConfirmedBlockIndex%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_CoinRecord_ConfirmedBlockIndex.md&amp;value=---%0Auid%3A%20chia.dotnet.CoinRecord.ConfirmedBlockIndex%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_CoinRecord_ConfirmedBlockIndex.md&amp;value=---%0Auid%3A%20chia.dotnet.CoinRecord.ConfirmedBlockIndex%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/CoinRecord.cs/#L14">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/CoinRecord.cs/#L14">View Source</a>
   </span>
   <a id="chia_dotnet_CoinRecord_ConfirmedBlockIndex_" data-uid="chia.dotnet.CoinRecord.ConfirmedBlockIndex*"></a>
   <h4 id="chia_dotnet_CoinRecord_ConfirmedBlockIndex" data-uid="chia.dotnet.CoinRecord.ConfirmedBlockIndex">ConfirmedBlockIndex</h4>
@@ -266,24 +210,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_CoinRecord_DateTimestamp.md&amp;value=---%0Auid%3A%20chia.dotnet.CoinRecord.DateTimestamp%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_CoinRecord_DateTimestamp.md&amp;value=---%0Auid%3A%20chia.dotnet.CoinRecord.DateTimestamp%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_CoinRecord_DateTimestamp.md&amp;value=---%0Auid%3A%20chia.dotnet.CoinRecord.DateTimestamp%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/CoinRecord.cs/#L25">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/CoinRecord.cs/#L25">View Source</a>
   </span>
   <a id="chia_dotnet_CoinRecord_DateTimestamp_" data-uid="chia.dotnet.CoinRecord.DateTimestamp*"></a>
   <h4 id="chia_dotnet_CoinRecord_DateTimestamp" data-uid="chia.dotnet.CoinRecord.DateTimestamp">DateTimestamp</h4>
@@ -312,24 +242,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_CoinRecord_Spent.md&amp;value=---%0Auid%3A%20chia.dotnet.CoinRecord.Spent%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_CoinRecord_Spent.md&amp;value=---%0Auid%3A%20chia.dotnet.CoinRecord.Spent%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_CoinRecord_Spent.md&amp;value=---%0Auid%3A%20chia.dotnet.CoinRecord.Spent%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/CoinRecord.cs/#L16">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/CoinRecord.cs/#L16">View Source</a>
   </span>
   <a id="chia_dotnet_CoinRecord_Spent_" data-uid="chia.dotnet.CoinRecord.Spent*"></a>
   <h4 id="chia_dotnet_CoinRecord_Spent" data-uid="chia.dotnet.CoinRecord.Spent">Spent</h4>
@@ -356,24 +272,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_CoinRecord_SpentBlockIndex.md&amp;value=---%0Auid%3A%20chia.dotnet.CoinRecord.SpentBlockIndex%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_CoinRecord_SpentBlockIndex.md&amp;value=---%0Auid%3A%20chia.dotnet.CoinRecord.SpentBlockIndex%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_CoinRecord_SpentBlockIndex.md&amp;value=---%0Auid%3A%20chia.dotnet.CoinRecord.SpentBlockIndex%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/CoinRecord.cs/#L15">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/CoinRecord.cs/#L15">View Source</a>
   </span>
   <a id="chia_dotnet_CoinRecord_SpentBlockIndex_" data-uid="chia.dotnet.CoinRecord.SpentBlockIndex*"></a>
   <h4 id="chia_dotnet_CoinRecord_SpentBlockIndex" data-uid="chia.dotnet.CoinRecord.SpentBlockIndex">SpentBlockIndex</h4>
@@ -400,24 +302,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_CoinRecord_Timestamp.md&amp;value=---%0Auid%3A%20chia.dotnet.CoinRecord.Timestamp%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_CoinRecord_Timestamp.md&amp;value=---%0Auid%3A%20chia.dotnet.CoinRecord.Timestamp%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_CoinRecord_Timestamp.md&amp;value=---%0Auid%3A%20chia.dotnet.CoinRecord.Timestamp%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/CoinRecord.cs/#L21">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/CoinRecord.cs/#L21">View Source</a>
   </span>
   <a id="chia_dotnet_CoinRecord_Timestamp_" data-uid="chia.dotnet.CoinRecord.Timestamp*"></a>
   <h4 id="chia_dotnet_CoinRecord_Timestamp" data-uid="chia.dotnet.CoinRecord.Timestamp">Timestamp</h4>
@@ -455,24 +343,10 @@ <h3 id="implements">Implements</h3>
               <div class="contribution">
                 <ul class="nav">
                   <li>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-                    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_CoinRecord.md&amp;value=---%0Auid%3A%20chia.dotnet.CoinRecord%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-                    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_CoinRecord.md&amp;value=---%0Auid%3A%20chia.dotnet.CoinRecord%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-=======
                     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_CoinRecord.md&amp;value=---%0Auid%3A%20chia.dotnet.CoinRecord%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
                   </li>
                   <li>
-                    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/CoinRecord.cs/#L11" class="contribution-link">View Source</a>
+                    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/CoinRecord.cs/#L11" class="contribution-link">View Source</a>
                   </li>
                 </ul>
               </div>
diff --git a/docs/api/chia.dotnet.CoinRecordOrder.html b/docs/api/chia.dotnet.CoinRecordOrder.html
index 83872fe9..5399cd83 100644
--- a/docs/api/chia.dotnet.CoinRecordOrder.html
+++ b/docs/api/chia.dotnet.CoinRecordOrder.html
@@ -109,24 +109,10 @@ <h3 id="fields">Fields
               <div class="contribution">
                 <ul class="nav">
                   <li>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
                     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_CoinRecordOrder.md&amp;value=---%0Auid%3A%20chia.dotnet.CoinRecordOrder%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-                    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_CoinRecordOrder.md&amp;value=---%0Auid%3A%20chia.dotnet.CoinRecordOrder%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-=======
-                    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_CoinRecordOrder.md&amp;value=---%0Auid%3A%20chia.dotnet.CoinRecordOrder%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
                   </li>
                   <li>
-                    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/CoinRecordOrder.cs/#L3" class="contribution-link">View Source</a>
+                    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/CoinRecordOrder.cs/#L3" class="contribution-link">View Source</a>
                   </li>
                 </ul>
               </div>
diff --git a/docs/api/chia.dotnet.CoinSpend.html b/docs/api/chia.dotnet.CoinSpend.html
index 77aa0876..017d549a 100644
--- a/docs/api/chia.dotnet.CoinSpend.html
+++ b/docs/api/chia.dotnet.CoinSpend.html
@@ -93,21 +93,7 @@ <h5>Inherited Members</h5>
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object)">Object.Equals(Object)</a>
     </div>
     <div>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object-system-object)">Object.Equals(Object, Object)</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-      <span class="xref">System.Object.Equals(System.Object, System.Object)</span>
-=======
-      <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object-system-object)">Object.Equals(Object, Object)</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
     </div>
     <div>
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.gethashcode#system-object-gethashcode">Object.GetHashCode()</a>
@@ -135,24 +121,10 @@ <h3 id="properties">Properties
   </h3>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_CoinSpend_Coin.md&amp;value=---%0Auid%3A%20chia.dotnet.CoinSpend.Coin%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_CoinSpend_Coin.md&amp;value=---%0Auid%3A%20chia.dotnet.CoinSpend.Coin%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_CoinSpend_Coin.md&amp;value=---%0Auid%3A%20chia.dotnet.CoinSpend.Coin%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/CoinSpend.cs/#L10">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/CoinSpend.cs/#L10">View Source</a>
   </span>
   <a id="chia_dotnet_CoinSpend_Coin_" data-uid="chia.dotnet.CoinSpend.Coin*"></a>
   <h4 id="chia_dotnet_CoinSpend_Coin" data-uid="chia.dotnet.CoinSpend.Coin">Coin</h4>
@@ -179,24 +151,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_CoinSpend_PuzzleReveal.md&amp;value=---%0Auid%3A%20chia.dotnet.CoinSpend.PuzzleReveal%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_CoinSpend_PuzzleReveal.md&amp;value=---%0Auid%3A%20chia.dotnet.CoinSpend.PuzzleReveal%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_CoinSpend_PuzzleReveal.md&amp;value=---%0Auid%3A%20chia.dotnet.CoinSpend.PuzzleReveal%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/CoinSpend.cs/#L11">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/CoinSpend.cs/#L11">View Source</a>
   </span>
   <a id="chia_dotnet_CoinSpend_PuzzleReveal_" data-uid="chia.dotnet.CoinSpend.PuzzleReveal*"></a>
   <h4 id="chia_dotnet_CoinSpend_PuzzleReveal" data-uid="chia.dotnet.CoinSpend.PuzzleReveal">PuzzleReveal</h4>
@@ -223,24 +181,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_CoinSpend_Solution.md&amp;value=---%0Auid%3A%20chia.dotnet.CoinSpend.Solution%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_CoinSpend_Solution.md&amp;value=---%0Auid%3A%20chia.dotnet.CoinSpend.Solution%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_CoinSpend_Solution.md&amp;value=---%0Auid%3A%20chia.dotnet.CoinSpend.Solution%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/CoinSpend.cs/#L12">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/CoinSpend.cs/#L12">View Source</a>
   </span>
   <a id="chia_dotnet_CoinSpend_Solution_" data-uid="chia.dotnet.CoinSpend.Solution*"></a>
   <h4 id="chia_dotnet_CoinSpend_Solution" data-uid="chia.dotnet.CoinSpend.Solution">Solution</h4>
@@ -277,24 +221,10 @@ <h3 id="implements">Implements</h3>
               <div class="contribution">
                 <ul class="nav">
                   <li>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-                    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_CoinSpend.md&amp;value=---%0Auid%3A%20chia.dotnet.CoinSpend%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-                    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_CoinSpend.md&amp;value=---%0Auid%3A%20chia.dotnet.CoinSpend%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-=======
                     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_CoinSpend.md&amp;value=---%0Auid%3A%20chia.dotnet.CoinSpend%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
                   </li>
                   <li>
-                    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/CoinSpend.cs/#L8" class="contribution-link">View Source</a>
+                    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/CoinSpend.cs/#L8" class="contribution-link">View Source</a>
                   </li>
                 </ul>
               </div>
diff --git a/docs/api/chia.dotnet.CoinType.html b/docs/api/chia.dotnet.CoinType.html
index 120477bd..6600dc11 100644
--- a/docs/api/chia.dotnet.CoinType.html
+++ b/docs/api/chia.dotnet.CoinType.html
@@ -109,24 +109,10 @@ <h3 id="fields">Fields
               <div class="contribution">
                 <ul class="nav">
                   <li>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
                     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_CoinType.md&amp;value=---%0Auid%3A%20chia.dotnet.CoinType%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-                    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_CoinType.md&amp;value=---%0Auid%3A%20chia.dotnet.CoinType%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-=======
-                    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_CoinType.md&amp;value=---%0Auid%3A%20chia.dotnet.CoinType%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
                   </li>
                   <li>
-                    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/CoinType.cs/#L3" class="contribution-link">View Source</a>
+                    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/CoinType.cs/#L3" class="contribution-link">View Source</a>
                   </li>
                 </ul>
               </div>
diff --git a/docs/api/chia.dotnet.Condition.html b/docs/api/chia.dotnet.Condition.html
index 2a437f04..ef265d6c 100644
--- a/docs/api/chia.dotnet.Condition.html
+++ b/docs/api/chia.dotnet.Condition.html
@@ -94,21 +94,7 @@ <h5>Inherited Members</h5>
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object)">Object.Equals(Object)</a>
     </div>
     <div>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object-system-object)">Object.Equals(Object, Object)</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-      <span class="xref">System.Object.Equals(System.Object, System.Object)</span>
-=======
-      <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object-system-object)">Object.Equals(Object, Object)</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
     </div>
     <div>
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.gethashcode#system-object-gethashcode">Object.GetHashCode()</a>
@@ -137,24 +123,10 @@ <h3 id="properties">Properties
   </h3>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_Condition_Args.md&amp;value=---%0Auid%3A%20chia.dotnet.Condition.Args%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_Condition_Args.md&amp;value=---%0Auid%3A%20chia.dotnet.Condition.Args%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_Condition_Args.md&amp;value=---%0Auid%3A%20chia.dotnet.Condition.Args%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/Condition.cs/#L17">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/Condition.cs/#L17">View Source</a>
   </span>
   <a id="chia_dotnet_Condition_Args_" data-uid="chia.dotnet.Condition.Args*"></a>
   <h4 id="chia_dotnet_Condition_Args" data-uid="chia.dotnet.Condition.Args">Args</h4>
@@ -162,21 +134,7 @@ <h4 id="chia_dotnet_Condition_Args" data-uid="chia.dotnet.Condition.Args">Args</
   <div class="markdown level1 conceptual"></div>
   <h5 class="decalaration">Declaration</h5>
   <div class="codewrapper">
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <pre><code class="lang-csharp hljs">public IEnumerable&lt;ConditionWithArgs&gt; Args { get; set; }</code></pre>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <pre><code class="lang-csharp hljs">public ICollection&lt;ConditionWithArgs&gt; Args { get; set; }</code></pre>
-=======
     <pre><code class="lang-csharp hljs">public IEnumerable&lt;ConditionWithArgs&gt; Args { get; set; }</code></pre>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </div>
   <h5 class="propertyValue">Property Value</h5>
   <table class="table table-bordered table-striped table-condensed">
@@ -195,24 +153,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_Condition_ConditionOpcode.md&amp;value=---%0Auid%3A%20chia.dotnet.Condition.ConditionOpcode%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_Condition_ConditionOpcode.md&amp;value=---%0Auid%3A%20chia.dotnet.Condition.ConditionOpcode%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_Condition_ConditionOpcode.md&amp;value=---%0Auid%3A%20chia.dotnet.Condition.ConditionOpcode%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/Condition.cs/#L16">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/Condition.cs/#L16">View Source</a>
   </span>
   <a id="chia_dotnet_Condition_ConditionOpcode_" data-uid="chia.dotnet.Condition.ConditionOpcode*"></a>
   <h4 id="chia_dotnet_Condition_ConditionOpcode" data-uid="chia.dotnet.Condition.ConditionOpcode">ConditionOpcode</h4>
@@ -249,24 +193,10 @@ <h3 id="implements">Implements</h3>
               <div class="contribution">
                 <ul class="nav">
                   <li>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-                    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_Condition.md&amp;value=---%0Auid%3A%20chia.dotnet.Condition%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-                    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_Condition.md&amp;value=---%0Auid%3A%20chia.dotnet.Condition%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-=======
                     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_Condition.md&amp;value=---%0Auid%3A%20chia.dotnet.Condition%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
                   </li>
                   <li>
-                    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/Condition.cs/#L13" class="contribution-link">View Source</a>
+                    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/Condition.cs/#L13" class="contribution-link">View Source</a>
                   </li>
                 </ul>
               </div>
diff --git a/docs/api/chia.dotnet.ConditionWithArgs.html b/docs/api/chia.dotnet.ConditionWithArgs.html
index 3fe20094..94937b20 100644
--- a/docs/api/chia.dotnet.ConditionWithArgs.html
+++ b/docs/api/chia.dotnet.ConditionWithArgs.html
@@ -92,21 +92,7 @@ <h5>Inherited Members</h5>
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object)">Object.Equals(Object)</a>
     </div>
     <div>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object-system-object)">Object.Equals(Object, Object)</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-      <span class="xref">System.Object.Equals(System.Object, System.Object)</span>
-=======
-      <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object-system-object)">Object.Equals(Object, Object)</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
     </div>
     <div>
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.gethashcode#system-object-gethashcode">Object.GetHashCode()</a>
@@ -134,24 +120,10 @@ <h3 id="properties">Properties
   </h3>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_ConditionWithArgs_Opcode.md&amp;value=---%0Auid%3A%20chia.dotnet.ConditionWithArgs.Opcode%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_ConditionWithArgs_Opcode.md&amp;value=---%0Auid%3A%20chia.dotnet.ConditionWithArgs.Opcode%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_ConditionWithArgs_Opcode.md&amp;value=---%0Auid%3A%20chia.dotnet.ConditionWithArgs.Opcode%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/ConditionWithArgs.cs/#L11">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/ConditionWithArgs.cs/#L11">View Source</a>
   </span>
   <a id="chia_dotnet_ConditionWithArgs_Opcode_" data-uid="chia.dotnet.ConditionWithArgs.Opcode*"></a>
   <h4 id="chia_dotnet_ConditionWithArgs_Opcode" data-uid="chia.dotnet.ConditionWithArgs.Opcode">Opcode</h4>
@@ -178,24 +150,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_ConditionWithArgs_Vars.md&amp;value=---%0Auid%3A%20chia.dotnet.ConditionWithArgs.Vars%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_ConditionWithArgs_Vars.md&amp;value=---%0Auid%3A%20chia.dotnet.ConditionWithArgs.Vars%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_ConditionWithArgs_Vars.md&amp;value=---%0Auid%3A%20chia.dotnet.ConditionWithArgs.Vars%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/ConditionWithArgs.cs/#L12">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/ConditionWithArgs.cs/#L12">View Source</a>
   </span>
   <a id="chia_dotnet_ConditionWithArgs_Vars_" data-uid="chia.dotnet.ConditionWithArgs.Vars*"></a>
   <h4 id="chia_dotnet_ConditionWithArgs_Vars" data-uid="chia.dotnet.ConditionWithArgs.Vars">Vars</h4>
@@ -203,21 +161,7 @@ <h4 id="chia_dotnet_ConditionWithArgs_Vars" data-uid="chia.dotnet.ConditionWithA
   <div class="markdown level1 conceptual"></div>
   <h5 class="decalaration">Declaration</h5>
   <div class="codewrapper">
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <pre><code class="lang-csharp hljs">public IEnumerable&lt;string&gt; Vars { get; set; }</code></pre>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <pre><code class="lang-csharp hljs">public ICollection&lt;string&gt; Vars { get; set; }</code></pre>
-=======
-    <pre><code class="lang-csharp hljs">public IEnumerable&lt;string&gt; Vars { get; set; }</code></pre>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </div>
   <h5 class="propertyValue">Property Value</h5>
   <table class="table table-bordered table-striped table-condensed">
@@ -229,21 +173,7 @@ <h5 class="propertyValue">Property Value</h5>
     </thead>
     <tbody>
       <tr>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-        <td><a class="xref" href="https://learn.microsoft.com/dotnet/api/system.collections.generic.ienumerable-1">IEnumerable</a>&lt;<a class="xref" href="https://learn.microsoft.com/dotnet/api/system.string">String</a>&gt;</td>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-        <td><a class="xref" href="https://learn.microsoft.com/dotnet/api/system.collections.generic.icollection-1">ICollection</a>&lt;<a class="xref" href="https://learn.microsoft.com/dotnet/api/system.string">String</a>&gt;</td>
-=======
         <td><a class="xref" href="https://learn.microsoft.com/dotnet/api/system.collections.generic.ienumerable-1">IEnumerable</a>&lt;<a class="xref" href="https://learn.microsoft.com/dotnet/api/system.string">String</a>&gt;</td>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
         <td></td>
       </tr>
     </tbody>
@@ -260,24 +190,10 @@ <h3 id="implements">Implements</h3>
               <div class="contribution">
                 <ul class="nav">
                   <li>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-                    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_ConditionWithArgs.md&amp;value=---%0Auid%3A%20chia.dotnet.ConditionWithArgs%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-                    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_ConditionWithArgs.md&amp;value=---%0Auid%3A%20chia.dotnet.ConditionWithArgs%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-=======
                     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_ConditionWithArgs.md&amp;value=---%0Auid%3A%20chia.dotnet.ConditionWithArgs%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
                   </li>
                   <li>
-                    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/ConditionWithArgs.cs/#L9" class="contribution-link">View Source</a>
+                    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/ConditionWithArgs.cs/#L9" class="contribution-link">View Source</a>
                   </li>
                 </ul>
               </div>
diff --git a/docs/api/chia.dotnet.Config.html b/docs/api/chia.dotnet.Config.html
index 711d5b06..c822597c 100644
--- a/docs/api/chia.dotnet.Config.html
+++ b/docs/api/chia.dotnet.Config.html
@@ -88,21 +88,7 @@ <h5>Inherited Members</h5>
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object)">Object.Equals(Object)</a>
     </div>
     <div>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object-system-object)">Object.Equals(Object, Object)</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-      <span class="xref">System.Object.Equals(System.Object, System.Object)</span>
-=======
-      <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object-system-object)">Object.Equals(Object, Object)</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
     </div>
     <div>
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.gethashcode#system-object-gethashcode">Object.GetHashCode()</a>
@@ -130,24 +116,10 @@ <h3 id="properties">Properties
   </h3>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_Config_Contents.md&amp;value=---%0Auid%3A%20chia.dotnet.Config.Contents%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_Config_Contents.md&amp;value=---%0Auid%3A%20chia.dotnet.Config.Contents%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_Config_Contents.md&amp;value=---%0Auid%3A%20chia.dotnet.Config.Contents%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/Config.cs/#L30">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/Config.cs/#L30">View Source</a>
   </span>
   <a id="chia_dotnet_Config_Contents_" data-uid="chia.dotnet.Config.Contents*"></a>
   <h4 id="chia_dotnet_Config_Contents" data-uid="chia.dotnet.Config.Contents">Contents</h4>
@@ -175,24 +147,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_Config_DefaultRootPath.md&amp;value=---%0Auid%3A%20chia.dotnet.Config.DefaultRootPath%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_Config_DefaultRootPath.md&amp;value=---%0Auid%3A%20chia.dotnet.Config.DefaultRootPath%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_Config_DefaultRootPath.md&amp;value=---%0Auid%3A%20chia.dotnet.Config.DefaultRootPath%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/Config.cs/#L93">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/Config.cs/#L93">View Source</a>
   </span>
   <a id="chia_dotnet_Config_DefaultRootPath_" data-uid="chia.dotnet.Config.DefaultRootPath*"></a>
   <h4 id="chia_dotnet_Config_DefaultRootPath" data-uid="chia.dotnet.Config.DefaultRootPath">DefaultRootPath</h4>
@@ -222,24 +180,10 @@ <h3 id="methods">Methods
   </h3>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_Config_GetEndpoint_System_String_.md&amp;value=---%0Auid%3A%20chia.dotnet.Config.GetEndpoint(System.String)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_Config_GetEndpoint_System_String_.md&amp;value=---%0Auid%3A%20chia.dotnet.Config.GetEndpoint(System.String)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_Config_GetEndpoint_System_String_.md&amp;value=---%0Auid%3A%20chia.dotnet.Config.GetEndpoint(System.String)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/Config.cs/#L37">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/Config.cs/#L37">View Source</a>
   </span>
   <a id="chia_dotnet_Config_GetEndpoint_" data-uid="chia.dotnet.Config.GetEndpoint*"></a>
   <h4 id="chia_dotnet_Config_GetEndpoint_System_String_" data-uid="chia.dotnet.Config.GetEndpoint(System.String)">GetEndpoint(String)</h4>
@@ -286,24 +230,10 @@ <h5 class="returns">Returns</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_Config_Open.md&amp;value=---%0Auid%3A%20chia.dotnet.Config.Open%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_Config_Open.md&amp;value=---%0Auid%3A%20chia.dotnet.Config.Open%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_Config_Open.md&amp;value=---%0Auid%3A%20chia.dotnet.Config.Open%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/Config.cs/#L137">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/Config.cs/#L137">View Source</a>
   </span>
   <a id="chia_dotnet_Config_Open_" data-uid="chia.dotnet.Config.Open*"></a>
   <h4 id="chia_dotnet_Config_Open" data-uid="chia.dotnet.Config.Open">Open()</h4>
@@ -332,24 +262,10 @@ <h5 class="returns">Returns</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_Config_Open_System_String_.md&amp;value=---%0Auid%3A%20chia.dotnet.Config.Open(System.String)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_Config_Open_System_String_.md&amp;value=---%0Auid%3A%20chia.dotnet.Config.Open(System.String)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_Config_Open_System_String_.md&amp;value=---%0Auid%3A%20chia.dotnet.Config.Open(System.String)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/Config.cs/#L100">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/Config.cs/#L100">View Source</a>
   </span>
   <a id="chia_dotnet_Config_Open_" data-uid="chia.dotnet.Config.Open*"></a>
   <h4 id="chia_dotnet_Config_Open_System_String_" data-uid="chia.dotnet.Config.Open(System.String)">Open(String)</h4>
@@ -402,24 +318,10 @@ <h5 class="returns">Returns</h5>
               <div class="contribution">
                 <ul class="nav">
                   <li>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-                    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_Config.md&amp;value=---%0Auid%3A%20chia.dotnet.Config%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-                    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_Config.md&amp;value=---%0Auid%3A%20chia.dotnet.Config%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-=======
                     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_Config.md&amp;value=---%0Auid%3A%20chia.dotnet.Config%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
                   </li>
                   <li>
-                    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/Config.cs/#L17" class="contribution-link">View Source</a>
+                    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/Config.cs/#L17" class="contribution-link">View Source</a>
                   </li>
                 </ul>
               </div>
diff --git a/docs/api/chia.dotnet.ConnectionInfo.html b/docs/api/chia.dotnet.ConnectionInfo.html
index 33987aed..2931d238 100644
--- a/docs/api/chia.dotnet.ConnectionInfo.html
+++ b/docs/api/chia.dotnet.ConnectionInfo.html
@@ -91,21 +91,7 @@ <h5>Inherited Members</h5>
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object)">Object.Equals(Object)</a>
     </div>
     <div>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object-system-object)">Object.Equals(Object, Object)</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-      <span class="xref">System.Object.Equals(System.Object, System.Object)</span>
-=======
-      <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object-system-object)">Object.Equals(Object, Object)</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
     </div>
     <div>
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.gethashcode#system-object-gethashcode">Object.GetHashCode()</a>
@@ -133,24 +119,10 @@ <h3 id="properties">Properties
   </h3>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_ConnectionInfo_BytesRead.md&amp;value=---%0Auid%3A%20chia.dotnet.ConnectionInfo.BytesRead%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_ConnectionInfo_BytesRead.md&amp;value=---%0Auid%3A%20chia.dotnet.ConnectionInfo.BytesRead%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_ConnectionInfo_BytesRead.md&amp;value=---%0Auid%3A%20chia.dotnet.ConnectionInfo.BytesRead%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/ConnectionInfo.cs/#L12">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/ConnectionInfo.cs/#L12">View Source</a>
   </span>
   <a id="chia_dotnet_ConnectionInfo_BytesRead_" data-uid="chia.dotnet.ConnectionInfo.BytesRead*"></a>
   <h4 id="chia_dotnet_ConnectionInfo_BytesRead" data-uid="chia.dotnet.ConnectionInfo.BytesRead">BytesRead</h4>
@@ -177,24 +149,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_ConnectionInfo_BytesWritten.md&amp;value=---%0Auid%3A%20chia.dotnet.ConnectionInfo.BytesWritten%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_ConnectionInfo_BytesWritten.md&amp;value=---%0Auid%3A%20chia.dotnet.ConnectionInfo.BytesWritten%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_ConnectionInfo_BytesWritten.md&amp;value=---%0Auid%3A%20chia.dotnet.ConnectionInfo.BytesWritten%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/ConnectionInfo.cs/#L13">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/ConnectionInfo.cs/#L13">View Source</a>
   </span>
   <a id="chia_dotnet_ConnectionInfo_BytesWritten_" data-uid="chia.dotnet.ConnectionInfo.BytesWritten*"></a>
   <h4 id="chia_dotnet_ConnectionInfo_BytesWritten" data-uid="chia.dotnet.ConnectionInfo.BytesWritten">BytesWritten</h4>
@@ -221,24 +179,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_ConnectionInfo_CreationDateTime.md&amp;value=---%0Auid%3A%20chia.dotnet.ConnectionInfo.CreationDateTime%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_ConnectionInfo_CreationDateTime.md&amp;value=---%0Auid%3A%20chia.dotnet.ConnectionInfo.CreationDateTime%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_ConnectionInfo_CreationDateTime.md&amp;value=---%0Auid%3A%20chia.dotnet.ConnectionInfo.CreationDateTime%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/ConnectionInfo.cs/#L30">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/ConnectionInfo.cs/#L30">View Source</a>
   </span>
   <a id="chia_dotnet_ConnectionInfo_CreationDateTime_" data-uid="chia.dotnet.ConnectionInfo.CreationDateTime*"></a>
   <h4 id="chia_dotnet_ConnectionInfo_CreationDateTime" data-uid="chia.dotnet.ConnectionInfo.CreationDateTime">CreationDateTime</h4>
@@ -266,24 +210,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_ConnectionInfo_CreationTime.md&amp;value=---%0Auid%3A%20chia.dotnet.ConnectionInfo.CreationTime%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_ConnectionInfo_CreationTime.md&amp;value=---%0Auid%3A%20chia.dotnet.ConnectionInfo.CreationTime%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_ConnectionInfo_CreationTime.md&amp;value=---%0Auid%3A%20chia.dotnet.ConnectionInfo.CreationTime%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/ConnectionInfo.cs/#L14">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/ConnectionInfo.cs/#L14">View Source</a>
   </span>
   <a id="chia_dotnet_ConnectionInfo_CreationTime_" data-uid="chia.dotnet.ConnectionInfo.CreationTime*"></a>
   <h4 id="chia_dotnet_ConnectionInfo_CreationTime" data-uid="chia.dotnet.ConnectionInfo.CreationTime">CreationTime</h4>
@@ -310,24 +240,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_ConnectionInfo_IsLocal.md&amp;value=---%0Auid%3A%20chia.dotnet.ConnectionInfo.IsLocal%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_ConnectionInfo_IsLocal.md&amp;value=---%0Auid%3A%20chia.dotnet.ConnectionInfo.IsLocal%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_ConnectionInfo_IsLocal.md&amp;value=---%0Auid%3A%20chia.dotnet.ConnectionInfo.IsLocal%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/ConnectionInfo.cs/#L27">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/ConnectionInfo.cs/#L27">View Source</a>
   </span>
   <a id="chia_dotnet_ConnectionInfo_IsLocal_" data-uid="chia.dotnet.ConnectionInfo.IsLocal*"></a>
   <h4 id="chia_dotnet_ConnectionInfo_IsLocal" data-uid="chia.dotnet.ConnectionInfo.IsLocal">IsLocal</h4>
@@ -356,24 +272,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_ConnectionInfo_LastMessageDateTime.md&amp;value=---%0Auid%3A%20chia.dotnet.ConnectionInfo.LastMessageDateTime%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_ConnectionInfo_LastMessageDateTime.md&amp;value=---%0Auid%3A%20chia.dotnet.ConnectionInfo.LastMessageDateTime%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_ConnectionInfo_LastMessageDateTime.md&amp;value=---%0Auid%3A%20chia.dotnet.ConnectionInfo.LastMessageDateTime%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/ConnectionInfo.cs/#L32">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/ConnectionInfo.cs/#L32">View Source</a>
   </span>
   <a id="chia_dotnet_ConnectionInfo_LastMessageDateTime_" data-uid="chia.dotnet.ConnectionInfo.LastMessageDateTime*"></a>
   <h4 id="chia_dotnet_ConnectionInfo_LastMessageDateTime" data-uid="chia.dotnet.ConnectionInfo.LastMessageDateTime">LastMessageDateTime</h4>
@@ -401,24 +303,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_ConnectionInfo_LastMessageTime.md&amp;value=---%0Auid%3A%20chia.dotnet.ConnectionInfo.LastMessageTime%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_ConnectionInfo_LastMessageTime.md&amp;value=---%0Auid%3A%20chia.dotnet.ConnectionInfo.LastMessageTime%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_ConnectionInfo_LastMessageTime.md&amp;value=---%0Auid%3A%20chia.dotnet.ConnectionInfo.LastMessageTime%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/ConnectionInfo.cs/#L15">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/ConnectionInfo.cs/#L15">View Source</a>
   </span>
   <a id="chia_dotnet_ConnectionInfo_LastMessageTime_" data-uid="chia.dotnet.ConnectionInfo.LastMessageTime*"></a>
   <h4 id="chia_dotnet_ConnectionInfo_LastMessageTime" data-uid="chia.dotnet.ConnectionInfo.LastMessageTime">LastMessageTime</h4>
@@ -445,24 +333,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_ConnectionInfo_LocalPort.md&amp;value=---%0Auid%3A%20chia.dotnet.ConnectionInfo.LocalPort%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_ConnectionInfo_LocalPort.md&amp;value=---%0Auid%3A%20chia.dotnet.ConnectionInfo.LocalPort%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_ConnectionInfo_LocalPort.md&amp;value=---%0Auid%3A%20chia.dotnet.ConnectionInfo.LocalPort%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/ConnectionInfo.cs/#L16">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/ConnectionInfo.cs/#L16">View Source</a>
   </span>
   <a id="chia_dotnet_ConnectionInfo_LocalPort_" data-uid="chia.dotnet.ConnectionInfo.LocalPort*"></a>
   <h4 id="chia_dotnet_ConnectionInfo_LocalPort" data-uid="chia.dotnet.ConnectionInfo.LocalPort">LocalPort</h4>
@@ -489,24 +363,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_ConnectionInfo_NodeId.md&amp;value=---%0Auid%3A%20chia.dotnet.ConnectionInfo.NodeId%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_ConnectionInfo_NodeId.md&amp;value=---%0Auid%3A%20chia.dotnet.ConnectionInfo.NodeId%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_ConnectionInfo_NodeId.md&amp;value=---%0Auid%3A%20chia.dotnet.ConnectionInfo.NodeId%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/ConnectionInfo.cs/#L17">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/ConnectionInfo.cs/#L17">View Source</a>
   </span>
   <a id="chia_dotnet_ConnectionInfo_NodeId_" data-uid="chia.dotnet.ConnectionInfo.NodeId*"></a>
   <h4 id="chia_dotnet_ConnectionInfo_NodeId" data-uid="chia.dotnet.ConnectionInfo.NodeId">NodeId</h4>
@@ -533,24 +393,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_ConnectionInfo_PeakHash.md&amp;value=---%0Auid%3A%20chia.dotnet.ConnectionInfo.PeakHash%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_ConnectionInfo_PeakHash.md&amp;value=---%0Auid%3A%20chia.dotnet.ConnectionInfo.PeakHash%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_ConnectionInfo_PeakHash.md&amp;value=---%0Auid%3A%20chia.dotnet.ConnectionInfo.PeakHash%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/ConnectionInfo.cs/#L18">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/ConnectionInfo.cs/#L18">View Source</a>
   </span>
   <a id="chia_dotnet_ConnectionInfo_PeakHash_" data-uid="chia.dotnet.ConnectionInfo.PeakHash*"></a>
   <h4 id="chia_dotnet_ConnectionInfo_PeakHash" data-uid="chia.dotnet.ConnectionInfo.PeakHash">PeakHash</h4>
@@ -577,24 +423,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_ConnectionInfo_PeakHeight.md&amp;value=---%0Auid%3A%20chia.dotnet.ConnectionInfo.PeakHeight%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_ConnectionInfo_PeakHeight.md&amp;value=---%0Auid%3A%20chia.dotnet.ConnectionInfo.PeakHeight%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_ConnectionInfo_PeakHeight.md&amp;value=---%0Auid%3A%20chia.dotnet.ConnectionInfo.PeakHeight%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/ConnectionInfo.cs/#L19">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/ConnectionInfo.cs/#L19">View Source</a>
   </span>
   <a id="chia_dotnet_ConnectionInfo_PeakHeight_" data-uid="chia.dotnet.ConnectionInfo.PeakHeight*"></a>
   <h4 id="chia_dotnet_ConnectionInfo_PeakHeight" data-uid="chia.dotnet.ConnectionInfo.PeakHeight">PeakHeight</h4>
@@ -621,24 +453,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_ConnectionInfo_PeakWeight.md&amp;value=---%0Auid%3A%20chia.dotnet.ConnectionInfo.PeakWeight%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_ConnectionInfo_PeakWeight.md&amp;value=---%0Auid%3A%20chia.dotnet.ConnectionInfo.PeakWeight%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_ConnectionInfo_PeakWeight.md&amp;value=---%0Auid%3A%20chia.dotnet.ConnectionInfo.PeakWeight%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/ConnectionInfo.cs/#L20">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/ConnectionInfo.cs/#L20">View Source</a>
   </span>
   <a id="chia_dotnet_ConnectionInfo_PeakWeight_" data-uid="chia.dotnet.ConnectionInfo.PeakWeight*"></a>
   <h4 id="chia_dotnet_ConnectionInfo_PeakWeight" data-uid="chia.dotnet.ConnectionInfo.PeakWeight">PeakWeight</h4>
@@ -665,24 +483,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_ConnectionInfo_PeerHost.md&amp;value=---%0Auid%3A%20chia.dotnet.ConnectionInfo.PeerHost%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_ConnectionInfo_PeerHost.md&amp;value=---%0Auid%3A%20chia.dotnet.ConnectionInfo.PeerHost%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_ConnectionInfo_PeerHost.md&amp;value=---%0Auid%3A%20chia.dotnet.ConnectionInfo.PeerHost%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/ConnectionInfo.cs/#L21">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/ConnectionInfo.cs/#L21">View Source</a>
   </span>
   <a id="chia_dotnet_ConnectionInfo_PeerHost_" data-uid="chia.dotnet.ConnectionInfo.PeerHost*"></a>
   <h4 id="chia_dotnet_ConnectionInfo_PeerHost" data-uid="chia.dotnet.ConnectionInfo.PeerHost">PeerHost</h4>
@@ -709,24 +513,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_ConnectionInfo_PeerPort.md&amp;value=---%0Auid%3A%20chia.dotnet.ConnectionInfo.PeerPort%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_ConnectionInfo_PeerPort.md&amp;value=---%0Auid%3A%20chia.dotnet.ConnectionInfo.PeerPort%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_ConnectionInfo_PeerPort.md&amp;value=---%0Auid%3A%20chia.dotnet.ConnectionInfo.PeerPort%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/ConnectionInfo.cs/#L22">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/ConnectionInfo.cs/#L22">View Source</a>
   </span>
   <a id="chia_dotnet_ConnectionInfo_PeerPort_" data-uid="chia.dotnet.ConnectionInfo.PeerPort*"></a>
   <h4 id="chia_dotnet_ConnectionInfo_PeerPort" data-uid="chia.dotnet.ConnectionInfo.PeerPort">PeerPort</h4>
@@ -753,24 +543,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_ConnectionInfo_PeerServerPort.md&amp;value=---%0Auid%3A%20chia.dotnet.ConnectionInfo.PeerServerPort%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_ConnectionInfo_PeerServerPort.md&amp;value=---%0Auid%3A%20chia.dotnet.ConnectionInfo.PeerServerPort%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_ConnectionInfo_PeerServerPort.md&amp;value=---%0Auid%3A%20chia.dotnet.ConnectionInfo.PeerServerPort%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/ConnectionInfo.cs/#L23">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/ConnectionInfo.cs/#L23">View Source</a>
   </span>
   <a id="chia_dotnet_ConnectionInfo_PeerServerPort_" data-uid="chia.dotnet.ConnectionInfo.PeerServerPort*"></a>
   <h4 id="chia_dotnet_ConnectionInfo_PeerServerPort" data-uid="chia.dotnet.ConnectionInfo.PeerServerPort">PeerServerPort</h4>
@@ -797,24 +573,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_ConnectionInfo_Type.md&amp;value=---%0Auid%3A%20chia.dotnet.ConnectionInfo.Type%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_ConnectionInfo_Type.md&amp;value=---%0Auid%3A%20chia.dotnet.ConnectionInfo.Type%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_ConnectionInfo_Type.md&amp;value=---%0Auid%3A%20chia.dotnet.ConnectionInfo.Type%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/ConnectionInfo.cs/#L29">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/ConnectionInfo.cs/#L29">View Source</a>
   </span>
   <a id="chia_dotnet_ConnectionInfo_Type_" data-uid="chia.dotnet.ConnectionInfo.Type*"></a>
   <h4 id="chia_dotnet_ConnectionInfo_Type" data-uid="chia.dotnet.ConnectionInfo.Type">Type</h4>
@@ -851,24 +613,10 @@ <h3 id="implements">Implements</h3>
               <div class="contribution">
                 <ul class="nav">
                   <li>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-                    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_ConnectionInfo.md&amp;value=---%0Auid%3A%20chia.dotnet.ConnectionInfo%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-                    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_ConnectionInfo.md&amp;value=---%0Auid%3A%20chia.dotnet.ConnectionInfo%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-=======
                     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_ConnectionInfo.md&amp;value=---%0Auid%3A%20chia.dotnet.ConnectionInfo%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
                   </li>
                   <li>
-                    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/ConnectionInfo.cs/#L10" class="contribution-link">View Source</a>
+                    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/ConnectionInfo.cs/#L10" class="contribution-link">View Source</a>
                   </li>
                 </ul>
               </div>
diff --git a/docs/api/chia.dotnet.CrawlerProxy.html b/docs/api/chia.dotnet.CrawlerProxy.html
index 8615b2ef..2d5f3b1d 100644
--- a/docs/api/chia.dotnet.CrawlerProxy.html
+++ b/docs/api/chia.dotnet.CrawlerProxy.html
@@ -143,24 +143,10 @@ <h3 id="constructors">Constructors
   </h3>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_CrawlerProxy__ctor_chia_dotnet_IRpcClient_System_String_.md&amp;value=---%0Auid%3A%20chia.dotnet.CrawlerProxy.%23ctor(chia.dotnet.IRpcClient%2CSystem.String)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_CrawlerProxy__ctor_chia_dotnet_IRpcClient_System_String_.md&amp;value=---%0Auid%3A%20chia.dotnet.CrawlerProxy.%23ctor(chia.dotnet.IRpcClient%2CSystem.String)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_CrawlerProxy__ctor_chia_dotnet_IRpcClient_System_String_.md&amp;value=---%0Auid%3A%20chia.dotnet.CrawlerProxy.%23ctor(chia.dotnet.IRpcClient%2CSystem.String)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/CrawlerProxy.cs/#L19">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/CrawlerProxy.cs/#L19">View Source</a>
   </span>
   <a id="chia_dotnet_CrawlerProxy__ctor_" data-uid="chia.dotnet.CrawlerProxy.#ctor*"></a>
   <h4 id="chia_dotnet_CrawlerProxy__ctor_chia_dotnet_IRpcClient_System_String_" data-uid="chia.dotnet.CrawlerProxy.#ctor(chia.dotnet.IRpcClient,System.String)">CrawlerProxy(IRpcClient, String)</h4>
@@ -199,24 +185,10 @@ <h3 id="methods">Methods
   </h3>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_CrawlerProxy_GetIPs_System_DateTime_System_Int32_System_Int32_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.CrawlerProxy.GetIPs(System.DateTime%2CSystem.Int32%2CSystem.Int32%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_CrawlerProxy_GetIPs_System_DateTime_System_Int32_System_Int32_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.CrawlerProxy.GetIPs(System.DateTime%2CSystem.Int32%2CSystem.Int32%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_CrawlerProxy_GetIPs_System_DateTime_System_Int32_System_Int32_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.CrawlerProxy.GetIPs(System.DateTime%2CSystem.Int32%2CSystem.Int32%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/CrawlerProxy.cs/#L40">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/CrawlerProxy.cs/#L40">View Source</a>
   </span>
   <a id="chia_dotnet_CrawlerProxy_GetIPs_" data-uid="chia.dotnet.CrawlerProxy.GetIPs*"></a>
   <h4 id="chia_dotnet_CrawlerProxy_GetIPs_System_DateTime_System_Int32_System_Int32_System_Threading_CancellationToken_" data-uid="chia.dotnet.CrawlerProxy.GetIPs(System.DateTime,System.Int32,System.Int32,System.Threading.CancellationToken)">GetIPs(DateTime, Int32, Int32, CancellationToken)</h4>
@@ -278,24 +250,10 @@ <h5 class="returns">Returns</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_CrawlerProxy_GetPeerCounts_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.CrawlerProxy.GetPeerCounts(System.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_CrawlerProxy_GetPeerCounts_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.CrawlerProxy.GetPeerCounts(System.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_CrawlerProxy_GetPeerCounts_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.CrawlerProxy.GetPeerCounts(System.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/CrawlerProxy.cs/#L29">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/CrawlerProxy.cs/#L29">View Source</a>
   </span>
   <a id="chia_dotnet_CrawlerProxy_GetPeerCounts_" data-uid="chia.dotnet.CrawlerProxy.GetPeerCounts*"></a>
   <h4 id="chia_dotnet_CrawlerProxy_GetPeerCounts_System_Threading_CancellationToken_" data-uid="chia.dotnet.CrawlerProxy.GetPeerCounts(System.Threading.CancellationToken)">GetPeerCounts(CancellationToken)</h4>
@@ -348,24 +306,10 @@ <h5 class="returns">Returns</h5>
               <div class="contribution">
                 <ul class="nav">
                   <li>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-                    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_CrawlerProxy.md&amp;value=---%0Auid%3A%20chia.dotnet.CrawlerProxy%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-                    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_CrawlerProxy.md&amp;value=---%0Auid%3A%20chia.dotnet.CrawlerProxy%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-=======
                     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_CrawlerProxy.md&amp;value=---%0Auid%3A%20chia.dotnet.CrawlerProxy%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
                   </li>
                   <li>
-                    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/CrawlerProxy.cs/#L12" class="contribution-link">View Source</a>
+                    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/CrawlerProxy.cs/#L12" class="contribution-link">View Source</a>
                   </li>
                 </ul>
               </div>
diff --git a/docs/api/chia.dotnet.DIDWallet.html b/docs/api/chia.dotnet.DIDWallet.html
index 0981ef2f..8108369e 100644
--- a/docs/api/chia.dotnet.DIDWallet.html
+++ b/docs/api/chia.dotnet.DIDWallet.html
@@ -158,24 +158,10 @@ <h3 id="constructors">Constructors
   </h3>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_DIDWallet__ctor_System_UInt32_chia_dotnet_WalletProxy_.md&amp;value=---%0Auid%3A%20chia.dotnet.DIDWallet.%23ctor(System.UInt32%2Cchia.dotnet.WalletProxy)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_DIDWallet__ctor_System_UInt32_chia_dotnet_WalletProxy_.md&amp;value=---%0Auid%3A%20chia.dotnet.DIDWallet.%23ctor(System.UInt32%2Cchia.dotnet.WalletProxy)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_DIDWallet__ctor_System_UInt32_chia_dotnet_WalletProxy_.md&amp;value=---%0Auid%3A%20chia.dotnet.DIDWallet.%23ctor(System.UInt32%2Cchia.dotnet.WalletProxy)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/DIDWallet.cs/#L19">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/DIDWallet.cs/#L19">View Source</a>
   </span>
   <a id="chia_dotnet_DIDWallet__ctor_" data-uid="chia.dotnet.DIDWallet.#ctor*"></a>
   <h4 id="chia_dotnet_DIDWallet__ctor_System_UInt32_chia_dotnet_WalletProxy_" data-uid="chia.dotnet.DIDWallet.#ctor(System.UInt32,chia.dotnet.WalletProxy)">DIDWallet(UInt32, WalletProxy)</h4>
@@ -214,34 +200,10 @@ <h3 id="methods">Methods
   </h3>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_DIDWallet_CreateAttest_System_String_System_String_System_String_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.DIDWallet.CreateAttest(System.String%2CSystem.String%2CSystem.String%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
   </span>
   <span class="small pull-right mobile-hide">
-<<<<<<< HEAD
-    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/DIDWallet.cs/#L258">View Source</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_DIDWallet_CreateAttest_System_String_System_String_System_String_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.DIDWallet.CreateAttest(System.String%2CSystem.String%2CSystem.String%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/DIDWallet.cs/#L258">View Source</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_DIDWallet_CreateAttest_System_String_System_String_System_String_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.DIDWallet.CreateAttest(System.String%2CSystem.String%2CSystem.String%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/DIDWallet.cs/#L258">View Source</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-=======
     <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/DIDWallet.cs/#L248">View Source</a>
->>>>>>> main
   </span>
   <a id="chia_dotnet_DIDWallet_CreateAttest_" data-uid="chia.dotnet.DIDWallet.CreateAttest*"></a>
   <h4 id="chia_dotnet_DIDWallet_CreateAttest_System_String_System_String_System_String_System_Threading_CancellationToken_" data-uid="chia.dotnet.DIDWallet.CreateAttest(System.String,System.String,System.String,System.Threading.CancellationToken)">CreateAttest(String, String, String, CancellationToken)</h4>
@@ -306,34 +268,10 @@ <h5 class="returns">Returns</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_DIDWallet_CreateBackupFile_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.DIDWallet.CreateBackupFile(System.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
   </span>
   <span class="small pull-right mobile-hide">
-<<<<<<< HEAD
-    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/DIDWallet.cs/#L315">View Source</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_DIDWallet_CreateBackupFile_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.DIDWallet.CreateBackupFile(System.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/DIDWallet.cs/#L315">View Source</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_DIDWallet_CreateBackupFile_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.DIDWallet.CreateBackupFile(System.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/DIDWallet.cs/#L315">View Source</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-=======
     <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/DIDWallet.cs/#L305">View Source</a>
->>>>>>> main
   </span>
   <a id="chia_dotnet_DIDWallet_CreateBackupFile_" data-uid="chia.dotnet.DIDWallet.CreateBackupFile*"></a>
   <h4 id="chia_dotnet_DIDWallet_CreateBackupFile_System_Threading_CancellationToken_" data-uid="chia.dotnet.DIDWallet.CreateBackupFile(System.Threading.CancellationToken)">CreateBackupFile(CancellationToken)</h4>
@@ -380,28 +318,10 @@ <h5 class="returns">Returns</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_DIDWallet_GetCurrentCoinInfo_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.DIDWallet.GetCurrentCoinInfo(System.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_DIDWallet_GetCurrentCoinInfo_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.DIDWallet.GetCurrentCoinInfo(System.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_DIDWallet_GetCurrentCoinInfo_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.DIDWallet.GetCurrentCoinInfo(System.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-<<<<<<< HEAD
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/DIDWallet.cs/#L117">View Source</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/DIDWallet.cs/#L114">View Source</a>
->>>>>>> main
   </span>
   <a id="chia_dotnet_DIDWallet_GetCurrentCoinInfo_" data-uid="chia.dotnet.DIDWallet.GetCurrentCoinInfo*"></a>
   <h4 id="chia_dotnet_DIDWallet_GetCurrentCoinInfo_System_Threading_CancellationToken_" data-uid="chia.dotnet.DIDWallet.GetCurrentCoinInfo(System.Threading.CancellationToken)">GetCurrentCoinInfo(CancellationToken)</h4>
@@ -448,28 +368,10 @@ <h5 class="returns">Returns</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_DIDWallet_GetDid_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.DIDWallet.GetDid(System.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_DIDWallet_GetDid_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.DIDWallet.GetDid(System.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_DIDWallet_GetDid_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.DIDWallet.GetDid(System.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-<<<<<<< HEAD
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/DIDWallet.cs/#L104">View Source</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/DIDWallet.cs/#L101">View Source</a>
->>>>>>> main
   </span>
   <a id="chia_dotnet_DIDWallet_GetDid_" data-uid="chia.dotnet.DIDWallet.GetDid*"></a>
   <h4 id="chia_dotnet_DIDWallet_GetDid_System_Threading_CancellationToken_" data-uid="chia.dotnet.DIDWallet.GetDid(System.Threading.CancellationToken)">GetDid(CancellationToken)</h4>
@@ -516,34 +418,10 @@ <h5 class="returns">Returns</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_DIDWallet_GetInformationNeededForRecovery_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.DIDWallet.GetInformationNeededForRecovery(System.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
   </span>
   <span class="small pull-right mobile-hide">
-<<<<<<< HEAD
-    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/DIDWallet.cs/#L297">View Source</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_DIDWallet_GetInformationNeededForRecovery_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.DIDWallet.GetInformationNeededForRecovery(System.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/DIDWallet.cs/#L297">View Source</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_DIDWallet_GetInformationNeededForRecovery_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.DIDWallet.GetInformationNeededForRecovery(System.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/DIDWallet.cs/#L297">View Source</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-=======
     <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/DIDWallet.cs/#L287">View Source</a>
->>>>>>> main
   </span>
   <a id="chia_dotnet_DIDWallet_GetInformationNeededForRecovery_" data-uid="chia.dotnet.DIDWallet.GetInformationNeededForRecovery*"></a>
   <h4 id="chia_dotnet_DIDWallet_GetInformationNeededForRecovery_System_Threading_CancellationToken_" data-uid="chia.dotnet.DIDWallet.GetInformationNeededForRecovery(System.Threading.CancellationToken)">GetInformationNeededForRecovery(CancellationToken)</h4>
@@ -552,21 +430,7 @@ <h4 id="chia_dotnet_DIDWallet_GetInformationNeededForRecovery_System_Threading_C
   <div class="markdown level1 conceptual"></div>
   <h5 class="decalaration">Declaration</h5>
   <div class="codewrapper">
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <pre><code class="lang-csharp hljs">public async Task&lt;(string MyDID, string CoinName, string NewPuzzleHash, string PublicKey, IEnumerable&lt;byte&gt; BackUpIds)&gt; GetInformationNeededForRecovery(CancellationToken cancellationToken = default(CancellationToken))</code></pre>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <pre><code class="lang-csharp hljs">public async Task&lt;(string MyDID, string CoinName, string NewPuzzleHash, string PublicKey, ICollection&lt;byte&gt; BackUpIds)&gt; GetInformationNeededForRecovery(CancellationToken cancellationToken = default(CancellationToken))</code></pre>
-=======
     <pre><code class="lang-csharp hljs">public async Task&lt;(string MyDID, string CoinName, string NewPuzzleHash, string PublicKey, IEnumerable&lt;byte&gt; BackUpIds)&gt; GetInformationNeededForRecovery(CancellationToken cancellationToken = default(CancellationToken))</code></pre>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </div>
   <h5 class="parameters">Parameters</h5>
   <table class="table table-bordered table-striped table-condensed">
@@ -596,21 +460,7 @@ <h5 class="returns">Returns</h5>
     </thead>
     <tbody>
       <tr>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
         <td><a class="xref" href="https://learn.microsoft.com/dotnet/api/system.threading.tasks.task-1">Task</a>&lt;<a class="xref" href="https://learn.microsoft.com/dotnet/api/system.valuetuple-5">(T1, T2, T3, T4, T5)</a>&lt;<a class="xref" href="https://learn.microsoft.com/dotnet/api/system.string">String</a>, <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.string">String</a>, <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.string">String</a>, <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.string">String</a>, <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.collections.generic.ienumerable-1">IEnumerable</a>&lt;<a class="xref" href="https://learn.microsoft.com/dotnet/api/system.byte">Byte</a>&gt;&gt;&gt;</td>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-        <td><a class="xref" href="https://learn.microsoft.com/dotnet/api/system.threading.tasks.task-1">Task</a>&lt;<a class="xref" href="https://learn.microsoft.com/dotnet/api/system.valuetuple-5">(T1, T2, T3, T4, T5)</a>&lt;<a class="xref" href="https://learn.microsoft.com/dotnet/api/system.string">String</a>, <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.string">String</a>, <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.string">String</a>, <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.string">String</a>, <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.collections.generic.icollection-1">ICollection</a>&lt;<a class="xref" href="https://learn.microsoft.com/dotnet/api/system.byte">Byte</a>&gt;&gt;&gt;</td>
-=======
-        <td><a class="xref" href="https://learn.microsoft.com/dotnet/api/system.threading.tasks.task-1">Task</a>&lt;<a class="xref" href="https://learn.microsoft.com/dotnet/api/system.valuetuple-5">(T1, T2, T3, T4, T5)</a>&lt;<a class="xref" href="https://learn.microsoft.com/dotnet/api/system.string">String</a>, <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.string">String</a>, <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.string">String</a>, <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.string">String</a>, <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.collections.generic.ienumerable-1">IEnumerable</a>&lt;<a class="xref" href="https://learn.microsoft.com/dotnet/api/system.byte">Byte</a>&gt;&gt;&gt;</td>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
         <td><p>A spendbundle and information about the attest</p>
 </td>
       </tr>
@@ -618,34 +468,10 @@ <h5 class="returns">Returns</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_DIDWallet_GetMetadata_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.DIDWallet.GetMetadata(System.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-<<<<<<< HEAD
-    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/DIDWallet.cs/#L183">View Source</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_DIDWallet_GetMetadata_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.DIDWallet.GetMetadata(System.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/DIDWallet.cs/#L183">View Source</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_DIDWallet_GetMetadata_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.DIDWallet.GetMetadata(System.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/DIDWallet.cs/#L183">View Source</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-=======
     <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/DIDWallet.cs/#L180">View Source</a>
->>>>>>> main
   </span>
   <a id="chia_dotnet_DIDWallet_GetMetadata_" data-uid="chia.dotnet.DIDWallet.GetMetadata*"></a>
   <h4 id="chia_dotnet_DIDWallet_GetMetadata_System_Threading_CancellationToken_" data-uid="chia.dotnet.DIDWallet.GetMetadata(System.Threading.CancellationToken)">GetMetadata(CancellationToken)</h4>
@@ -692,34 +518,10 @@ <h5 class="returns">Returns</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_DIDWallet_GetName_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.DIDWallet.GetName(System.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
   </span>
   <span class="small pull-right mobile-hide">
-<<<<<<< HEAD
-    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/DIDWallet.cs/#L144">View Source</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_DIDWallet_GetName_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.DIDWallet.GetName(System.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/DIDWallet.cs/#L144">View Source</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_DIDWallet_GetName_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.DIDWallet.GetName(System.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/DIDWallet.cs/#L144">View Source</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-=======
     <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/DIDWallet.cs/#L141">View Source</a>
->>>>>>> main
   </span>
   <a id="chia_dotnet_DIDWallet_GetName_" data-uid="chia.dotnet.DIDWallet.GetName*"></a>
   <h4 id="chia_dotnet_DIDWallet_GetName_System_Threading_CancellationToken_" data-uid="chia.dotnet.DIDWallet.GetName(System.Threading.CancellationToken)">GetName(CancellationToken)</h4>
@@ -766,28 +568,10 @@ <h5 class="returns">Returns</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_DIDWallet_GetPubKey_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.DIDWallet.GetPubKey(System.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_DIDWallet_GetPubKey_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.DIDWallet.GetPubKey(System.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_DIDWallet_GetPubKey_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.DIDWallet.GetPubKey(System.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-<<<<<<< HEAD
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/DIDWallet.cs/#L134">View Source</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/DIDWallet.cs/#L131">View Source</a>
->>>>>>> main
   </span>
   <a id="chia_dotnet_DIDWallet_GetPubKey_" data-uid="chia.dotnet.DIDWallet.GetPubKey*"></a>
   <h4 id="chia_dotnet_DIDWallet_GetPubKey_System_Threading_CancellationToken_" data-uid="chia.dotnet.DIDWallet.GetPubKey(System.Threading.CancellationToken)">GetPubKey(CancellationToken)</h4>
@@ -834,34 +618,10 @@ <h5 class="returns">Returns</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_DIDWallet_GetRecoveryList_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.DIDWallet.GetRecoveryList(System.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-<<<<<<< HEAD
-    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/DIDWallet.cs/#L243">View Source</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_DIDWallet_GetRecoveryList_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.DIDWallet.GetRecoveryList(System.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/DIDWallet.cs/#L243">View Source</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_DIDWallet_GetRecoveryList_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.DIDWallet.GetRecoveryList(System.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/DIDWallet.cs/#L243">View Source</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-=======
     <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/DIDWallet.cs/#L233">View Source</a>
->>>>>>> main
   </span>
   <a id="chia_dotnet_DIDWallet_GetRecoveryList_" data-uid="chia.dotnet.DIDWallet.GetRecoveryList*"></a>
   <h4 id="chia_dotnet_DIDWallet_GetRecoveryList_System_Threading_CancellationToken_" data-uid="chia.dotnet.DIDWallet.GetRecoveryList(System.Threading.CancellationToken)">GetRecoveryList(CancellationToken)</h4>
@@ -908,34 +668,10 @@ <h5 class="returns">Returns</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_DIDWallet_MessageSpend_System_Collections_Generic_IEnumerable_System_String__System_Collections_Generic_IEnumerable_System_String__System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.DIDWallet.MessageSpend(System.Collections.Generic.IEnumerable%7BSystem.String%7D%2CSystem.Collections.Generic.IEnumerable%7BSystem.String%7D%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
   </span>
   <span class="small pull-right mobile-hide">
-<<<<<<< HEAD
-    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/DIDWallet.cs/#L156">View Source</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_DIDWallet_MessageSpend_System_Collections_Generic_IEnumerable_System_String__System_Collections_Generic_IEnumerable_System_String__System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.DIDWallet.MessageSpend(System.Collections.Generic.IEnumerable%7BSystem.String%7D%2CSystem.Collections.Generic.IEnumerable%7BSystem.String%7D%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/DIDWallet.cs/#L156">View Source</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_DIDWallet_MessageSpend_System_Collections_Generic_IEnumerable_System_String__System_Collections_Generic_IEnumerable_System_String__System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.DIDWallet.MessageSpend(System.Collections.Generic.IEnumerable%7BSystem.String%7D%2CSystem.Collections.Generic.IEnumerable%7BSystem.String%7D%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/DIDWallet.cs/#L156">View Source</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-=======
     <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/DIDWallet.cs/#L153">View Source</a>
->>>>>>> main
   </span>
   <a id="chia_dotnet_DIDWallet_MessageSpend_" data-uid="chia.dotnet.DIDWallet.MessageSpend*"></a>
   <h4 id="chia_dotnet_DIDWallet_MessageSpend_System_Collections_Generic_IEnumerable_System_String__System_Collections_Generic_IEnumerable_System_String__System_Threading_CancellationToken_" data-uid="chia.dotnet.DIDWallet.MessageSpend(System.Collections.Generic.IEnumerable{System.String},System.Collections.Generic.IEnumerable{System.String},System.Threading.CancellationToken)">MessageSpend(IEnumerable&lt;String&gt;, IEnumerable&lt;String&gt;, CancellationToken)</h4>
@@ -992,34 +728,10 @@ <h5 class="returns">Returns</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_DIDWallet_RecoverySpend_System_Collections_Generic_IEnumerable_System_String__System_String_System_String_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.DIDWallet.RecoverySpend(System.Collections.Generic.IEnumerable%7BSystem.String%7D%2CSystem.String%2CSystem.String%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
   </span>
   <span class="small pull-right mobile-hide">
-<<<<<<< HEAD
-    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/DIDWallet.cs/#L216">View Source</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_DIDWallet_RecoverySpend_System_Collections_Generic_IEnumerable_System_String__System_String_System_String_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.DIDWallet.RecoverySpend(System.Collections.Generic.IEnumerable%7BSystem.String%7D%2CSystem.String%2CSystem.String%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/DIDWallet.cs/#L216">View Source</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_DIDWallet_RecoverySpend_System_Collections_Generic_IEnumerable_System_String__System_String_System_String_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.DIDWallet.RecoverySpend(System.Collections.Generic.IEnumerable%7BSystem.String%7D%2CSystem.String%2CSystem.String%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/DIDWallet.cs/#L216">View Source</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-=======
     <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/DIDWallet.cs/#L213">View Source</a>
->>>>>>> main
   </span>
   <a id="chia_dotnet_DIDWallet_RecoverySpend_" data-uid="chia.dotnet.DIDWallet.RecoverySpend*"></a>
   <h4 id="chia_dotnet_DIDWallet_RecoverySpend_System_Collections_Generic_IEnumerable_System_String__System_String_System_String_System_Threading_CancellationToken_" data-uid="chia.dotnet.DIDWallet.RecoverySpend(System.Collections.Generic.IEnumerable{System.String},System.String,System.String,System.Threading.CancellationToken)">RecoverySpend(IEnumerable&lt;String&gt;, String, String, CancellationToken)</h4>
@@ -1084,34 +796,10 @@ <h5 class="returns">Returns</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_DIDWallet_SetName_System_String_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.DIDWallet.SetName(System.String%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
   </span>
   <span class="small pull-right mobile-hide">
-<<<<<<< HEAD
-    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/DIDWallet.cs/#L170">View Source</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_DIDWallet_SetName_System_String_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.DIDWallet.SetName(System.String%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/DIDWallet.cs/#L170">View Source</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_DIDWallet_SetName_System_String_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.DIDWallet.SetName(System.String%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/DIDWallet.cs/#L170">View Source</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-=======
     <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/DIDWallet.cs/#L167">View Source</a>
->>>>>>> main
   </span>
   <a id="chia_dotnet_DIDWallet_SetName_" data-uid="chia.dotnet.DIDWallet.SetName*"></a>
   <h4 id="chia_dotnet_DIDWallet_SetName_System_String_System_Threading_CancellationToken_" data-uid="chia.dotnet.DIDWallet.SetName(System.String,System.Threading.CancellationToken)">SetName(String, CancellationToken)</h4>
@@ -1164,28 +852,10 @@ <h5 class="returns">Returns</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_DIDWallet_Spend_System_String_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.DIDWallet.Spend(System.String%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_DIDWallet_Spend_System_String_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.DIDWallet.Spend(System.String%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_DIDWallet_Spend_System_String_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.DIDWallet.Spend(System.String%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-<<<<<<< HEAD
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/DIDWallet.cs/#L86">View Source</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/DIDWallet.cs/#L83">View Source</a>
->>>>>>> main
   </span>
   <a id="chia_dotnet_DIDWallet_Spend_" data-uid="chia.dotnet.DIDWallet.Spend*"></a>
   <h4 id="chia_dotnet_DIDWallet_Spend_System_String_System_Threading_CancellationToken_" data-uid="chia.dotnet.DIDWallet.Spend(System.String,System.Threading.CancellationToken)">Spend(String, CancellationToken)</h4>
@@ -1238,34 +908,10 @@ <h5 class="returns">Returns</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_DIDWallet_Transfer_System_String_System_Boolean_System_Nullable_System_Boolean__System_UInt64_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.DIDWallet.Transfer(System.String%2CSystem.Boolean%2CSystem.Nullable%7BSystem.Boolean%7D%2CSystem.UInt64%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-<<<<<<< HEAD
-    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/DIDWallet.cs/#L331">View Source</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_DIDWallet_Transfer_System_String_System_Boolean_System_Nullable_System_Boolean__System_UInt64_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.DIDWallet.Transfer(System.String%2CSystem.Boolean%2CSystem.Nullable%7BSystem.Boolean%7D%2CSystem.UInt64%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/DIDWallet.cs/#L331">View Source</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_DIDWallet_Transfer_System_String_System_Boolean_System_Nullable_System_Boolean__System_UInt64_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.DIDWallet.Transfer(System.String%2CSystem.Boolean%2CSystem.Nullable%7BSystem.Boolean%7D%2CSystem.UInt64%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/DIDWallet.cs/#L331">View Source</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-=======
     <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/DIDWallet.cs/#L321">View Source</a>
->>>>>>> main
   </span>
   <a id="chia_dotnet_DIDWallet_Transfer_" data-uid="chia.dotnet.DIDWallet.Transfer*"></a>
   <h4 id="chia_dotnet_DIDWallet_Transfer_System_String_System_Boolean_System_Nullable_System_Boolean__System_UInt64_System_Threading_CancellationToken_" data-uid="chia.dotnet.DIDWallet.Transfer(System.String,System.Boolean,System.Nullable{System.Boolean},System.UInt64,System.Threading.CancellationToken)">Transfer(String, Boolean, Nullable&lt;Boolean&gt;, UInt64, CancellationToken)</h4>
@@ -1335,34 +981,10 @@ <h5 class="returns">Returns</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_DIDWallet_UpdateMetadata_System_String_System_Nullable_System_Boolean__System_UInt64_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.DIDWallet.UpdateMetadata(System.String%2CSystem.Nullable%7BSystem.Boolean%7D%2CSystem.UInt64%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-<<<<<<< HEAD
-    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/DIDWallet.cs/#L198">View Source</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_DIDWallet_UpdateMetadata_System_String_System_Nullable_System_Boolean__System_UInt64_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.DIDWallet.UpdateMetadata(System.String%2CSystem.Nullable%7BSystem.Boolean%7D%2CSystem.UInt64%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/DIDWallet.cs/#L198">View Source</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_DIDWallet_UpdateMetadata_System_String_System_Nullable_System_Boolean__System_UInt64_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.DIDWallet.UpdateMetadata(System.String%2CSystem.Nullable%7BSystem.Boolean%7D%2CSystem.UInt64%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/DIDWallet.cs/#L198">View Source</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-=======
     <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/DIDWallet.cs/#L195">View Source</a>
->>>>>>> main
   </span>
   <a id="chia_dotnet_DIDWallet_UpdateMetadata_" data-uid="chia.dotnet.DIDWallet.UpdateMetadata*"></a>
   <h4 id="chia_dotnet_DIDWallet_UpdateMetadata_System_String_System_Nullable_System_Boolean__System_UInt64_System_Threading_CancellationToken_" data-uid="chia.dotnet.DIDWallet.UpdateMetadata(System.String,System.Nullable{System.Boolean},System.UInt64,System.Threading.CancellationToken)">UpdateMetadata(String, Nullable&lt;Boolean&gt;, UInt64, CancellationToken)</h4>
@@ -1426,24 +1048,10 @@ <h5 class="returns">Returns</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_DIDWallet_UpdateRecoveryIds_System_Collections_Generic_IEnumerable_System_String__System_Nullable_System_UInt64__System_Nullable_System_Boolean__System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.DIDWallet.UpdateRecoveryIds(System.Collections.Generic.IEnumerable%7BSystem.String%7D%2CSystem.Nullable%7BSystem.UInt64%7D%2CSystem.Nullable%7BSystem.Boolean%7D%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_DIDWallet_UpdateRecoveryIds_System_Collections_Generic_IEnumerable_System_String__System_Nullable_System_UInt64__System_Nullable_System_Boolean__System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.DIDWallet.UpdateRecoveryIds(System.Collections.Generic.IEnumerable%7BSystem.String%7D%2CSystem.Nullable%7BSystem.UInt64%7D%2CSystem.Nullable%7BSystem.Boolean%7D%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_DIDWallet_UpdateRecoveryIds_System_Collections_Generic_IEnumerable_System_String__System_Nullable_System_UInt64__System_Nullable_System_Boolean__System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.DIDWallet.UpdateRecoveryIds(System.Collections.Generic.IEnumerable%7BSystem.String%7D%2CSystem.Nullable%7BSystem.UInt64%7D%2CSystem.Nullable%7BSystem.Boolean%7D%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/DIDWallet.cs/#L41">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/DIDWallet.cs/#L41">View Source</a>
   </span>
   <a id="chia_dotnet_DIDWallet_UpdateRecoveryIds_" data-uid="chia.dotnet.DIDWallet.UpdateRecoveryIds*"></a>
   <h4 id="chia_dotnet_DIDWallet_UpdateRecoveryIds_System_Collections_Generic_IEnumerable_System_String__System_Nullable_System_UInt64__System_Nullable_System_Boolean__System_Threading_CancellationToken_" data-uid="chia.dotnet.DIDWallet.UpdateRecoveryIds(System.Collections.Generic.IEnumerable{System.String},System.Nullable{System.UInt64},System.Nullable{System.Boolean},System.Threading.CancellationToken)">UpdateRecoveryIds(IEnumerable&lt;String&gt;, Nullable&lt;UInt64&gt;, Nullable&lt;Boolean&gt;, CancellationToken)</h4>
@@ -1507,28 +1115,10 @@ <h5 class="returns">Returns</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_DIDWallet_UpdateRecoveryIds_System_Collections_Generic_IEnumerable_System_String__System_UInt64_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.DIDWallet.UpdateRecoveryIds(System.Collections.Generic.IEnumerable%7BSystem.String%7D%2CSystem.UInt64%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_DIDWallet_UpdateRecoveryIds_System_Collections_Generic_IEnumerable_System_String__System_UInt64_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.DIDWallet.UpdateRecoveryIds(System.Collections.Generic.IEnumerable%7BSystem.String%7D%2CSystem.UInt64%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_DIDWallet_UpdateRecoveryIds_System_Collections_Generic_IEnumerable_System_String__System_UInt64_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.DIDWallet.UpdateRecoveryIds(System.Collections.Generic.IEnumerable%7BSystem.String%7D%2CSystem.UInt64%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-<<<<<<< HEAD
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/DIDWallet.cs/#L66">View Source</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/DIDWallet.cs/#L63">View Source</a>
->>>>>>> main
   </span>
   <a id="chia_dotnet_DIDWallet_UpdateRecoveryIds_" data-uid="chia.dotnet.DIDWallet.UpdateRecoveryIds*"></a>
   <h4 id="chia_dotnet_DIDWallet_UpdateRecoveryIds_System_Collections_Generic_IEnumerable_System_String__System_UInt64_System_Threading_CancellationToken_" data-uid="chia.dotnet.DIDWallet.UpdateRecoveryIds(System.Collections.Generic.IEnumerable{System.String},System.UInt64,System.Threading.CancellationToken)">UpdateRecoveryIds(IEnumerable&lt;String&gt;, UInt64, CancellationToken)</h4>
@@ -1587,24 +1177,10 @@ <h5 class="returns">Returns</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_DIDWallet_Validate_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.DIDWallet.Validate(System.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_DIDWallet_Validate_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.DIDWallet.Validate(System.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_DIDWallet_Validate_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.DIDWallet.Validate(System.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/DIDWallet.cs/#L28">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/DIDWallet.cs/#L28">View Source</a>
   </span>
   <a id="chia_dotnet_DIDWallet_Validate_" data-uid="chia.dotnet.DIDWallet.Validate*"></a>
   <h4 id="chia_dotnet_DIDWallet_Validate_System_Threading_CancellationToken_" data-uid="chia.dotnet.DIDWallet.Validate(System.Threading.CancellationToken)">Validate(CancellationToken)</h4>
@@ -1658,24 +1234,10 @@ <h5 class="overrides">Overrides</h5>
               <div class="contribution">
                 <ul class="nav">
                   <li>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-                    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_DIDWallet.md&amp;value=---%0Auid%3A%20chia.dotnet.DIDWallet%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-                    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_DIDWallet.md&amp;value=---%0Auid%3A%20chia.dotnet.DIDWallet%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-=======
                     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_DIDWallet.md&amp;value=---%0Auid%3A%20chia.dotnet.DIDWallet%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
                   </li>
                   <li>
-                    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/DIDWallet.cs/#L12" class="contribution-link">View Source</a>
+                    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/DIDWallet.cs/#L12" class="contribution-link">View Source</a>
                   </li>
                 </ul>
               </div>
diff --git a/docs/api/chia.dotnet.DaemonProxy.html b/docs/api/chia.dotnet.DaemonProxy.html
index ef24d4cb..4b6002f1 100644
--- a/docs/api/chia.dotnet.DaemonProxy.html
+++ b/docs/api/chia.dotnet.DaemonProxy.html
@@ -145,24 +145,10 @@ <h3 id="constructors">Constructors
   </h3>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_DaemonProxy__ctor_chia_dotnet_WebSocketRpcClient_System_String_.md&amp;value=---%0Auid%3A%20chia.dotnet.DaemonProxy.%23ctor(chia.dotnet.WebSocketRpcClient%2CSystem.String)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_DaemonProxy__ctor_chia_dotnet_WebSocketRpcClient_System_String_.md&amp;value=---%0Auid%3A%20chia.dotnet.DaemonProxy.%23ctor(chia.dotnet.WebSocketRpcClient%2CSystem.String)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_DaemonProxy__ctor_chia_dotnet_WebSocketRpcClient_System_String_.md&amp;value=---%0Auid%3A%20chia.dotnet.DaemonProxy.%23ctor(chia.dotnet.WebSocketRpcClient%2CSystem.String)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/DaemonProxy.cs/#L21">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/DaemonProxy.cs/#L21">View Source</a>
   </span>
   <a id="chia_dotnet_DaemonProxy__ctor_" data-uid="chia.dotnet.DaemonProxy.#ctor*"></a>
   <h4 id="chia_dotnet_DaemonProxy__ctor_chia_dotnet_WebSocketRpcClient_System_String_" data-uid="chia.dotnet.DaemonProxy.#ctor(chia.dotnet.WebSocketRpcClient,System.String)">DaemonProxy(WebSocketRpcClient, String)</h4>
@@ -201,30 +187,10 @@ <h3 id="methods">Methods
   </h3>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_DaemonProxy_AddPrivateKey_System_String_System_String_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.DaemonProxy.AddPrivateKey(System.String%2CSystem.String%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/DaemonProxy.cs/#L281">View Source</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_DaemonProxy_AddPrivateKey_System_String_System_String_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.DaemonProxy.AddPrivateKey(System.String%2CSystem.String%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/DaemonProxy.cs/#L281">View Source</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_DaemonProxy_AddPrivateKey_System_String_System_String_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.DaemonProxy.AddPrivateKey(System.String%2CSystem.String%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
   </span>
   <span class="small pull-right mobile-hide">
     <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/DaemonProxy.cs/#L281">View Source</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <a id="chia_dotnet_DaemonProxy_AddPrivateKey_" data-uid="chia.dotnet.DaemonProxy.AddPrivateKey*"></a>
   <h4 id="chia_dotnet_DaemonProxy_AddPrivateKey_System_String_System_String_System_Threading_CancellationToken_" data-uid="chia.dotnet.DaemonProxy.AddPrivateKey(System.String,System.String,System.Threading.CancellationToken)">AddPrivateKey(String, String, CancellationToken)</h4>
@@ -284,30 +250,10 @@ <h5 class="returns">Returns</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_DaemonProxy_CheckKeys_System_String_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.DaemonProxy.CheckKeys(System.String%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/DaemonProxy.cs/#L317">View Source</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_DaemonProxy_CheckKeys_System_String_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.DaemonProxy.CheckKeys(System.String%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/DaemonProxy.cs/#L317">View Source</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_DaemonProxy_CheckKeys_System_String_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.DaemonProxy.CheckKeys(System.String%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
   </span>
   <span class="small pull-right mobile-hide">
     <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/DaemonProxy.cs/#L317">View Source</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <a id="chia_dotnet_DaemonProxy_CheckKeys_" data-uid="chia.dotnet.DaemonProxy.CheckKeys*"></a>
   <h4 id="chia_dotnet_DaemonProxy_CheckKeys_System_String_System_Threading_CancellationToken_" data-uid="chia.dotnet.DaemonProxy.CheckKeys(System.String,System.Threading.CancellationToken)">CheckKeys(String, CancellationToken)</h4>
@@ -363,24 +309,10 @@ <h5 id="chia_dotnet_DaemonProxy_CheckKeys_System_String_System_Threading_Cancell
 </div>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_DaemonProxy_CreateProxyFrom__1.md&amp;value=---%0Auid%3A%20chia.dotnet.DaemonProxy.CreateProxyFrom%60%601%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_DaemonProxy_CreateProxyFrom__1.md&amp;value=---%0Auid%3A%20chia.dotnet.DaemonProxy.CreateProxyFrom%60%601%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_DaemonProxy_CreateProxyFrom__1.md&amp;value=---%0Auid%3A%20chia.dotnet.DaemonProxy.CreateProxyFrom%60%601%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/DaemonProxy.cs/#L42">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/DaemonProxy.cs/#L42">View Source</a>
   </span>
   <a id="chia_dotnet_DaemonProxy_CreateProxyFrom_" data-uid="chia.dotnet.DaemonProxy.CreateProxyFrom*"></a>
   <h4 id="chia_dotnet_DaemonProxy_CreateProxyFrom__1" data-uid="chia.dotnet.DaemonProxy.CreateProxyFrom``1">CreateProxyFrom&lt;T&gt;()</h4>
@@ -429,30 +361,10 @@ <h5 id="chia_dotnet_DaemonProxy_CreateProxyFrom__1_remarks">Remarks</h5>
 </div>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_DaemonProxy_DeleteAllKeys_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.DaemonProxy.DeleteAllKeys(System.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/DaemonProxy.cs/#L268">View Source</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_DaemonProxy_DeleteAllKeys_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.DaemonProxy.DeleteAllKeys(System.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/DaemonProxy.cs/#L268">View Source</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_DaemonProxy_DeleteAllKeys_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.DaemonProxy.DeleteAllKeys(System.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
   </span>
   <span class="small pull-right mobile-hide">
     <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/DaemonProxy.cs/#L268">View Source</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <a id="chia_dotnet_DaemonProxy_DeleteAllKeys_" data-uid="chia.dotnet.DaemonProxy.DeleteAllKeys*"></a>
   <h4 id="chia_dotnet_DaemonProxy_DeleteAllKeys_System_Threading_CancellationToken_" data-uid="chia.dotnet.DaemonProxy.DeleteAllKeys(System.Threading.CancellationToken)">DeleteAllKeys(CancellationToken)</h4>
@@ -499,30 +411,10 @@ <h5 class="returns">Returns</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_DaemonProxy_DeleteKeyByFingerprint_System_UInt32_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.DaemonProxy.DeleteKeyByFingerprint(System.UInt32%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/DaemonProxy.cs/#L255">View Source</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_DaemonProxy_DeleteKeyByFingerprint_System_UInt32_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.DaemonProxy.DeleteKeyByFingerprint(System.UInt32%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/DaemonProxy.cs/#L255">View Source</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_DaemonProxy_DeleteKeyByFingerprint_System_UInt32_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.DaemonProxy.DeleteKeyByFingerprint(System.UInt32%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
   </span>
   <span class="small pull-right mobile-hide">
     <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/DaemonProxy.cs/#L255">View Source</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <a id="chia_dotnet_DaemonProxy_DeleteKeyByFingerprint_" data-uid="chia.dotnet.DaemonProxy.DeleteKeyByFingerprint*"></a>
   <h4 id="chia_dotnet_DaemonProxy_DeleteKeyByFingerprint_System_UInt32_System_Threading_CancellationToken_" data-uid="chia.dotnet.DaemonProxy.DeleteKeyByFingerprint(System.UInt32,System.Threading.CancellationToken)">DeleteKeyByFingerprint(UInt32, CancellationToken)</h4>
@@ -575,30 +467,10 @@ <h5 class="returns">Returns</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_DaemonProxy_DeleteLabel_System_UInt32_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.DaemonProxy.DeleteLabel(System.UInt32%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/DaemonProxy.cs/#L379">View Source</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_DaemonProxy_DeleteLabel_System_UInt32_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.DaemonProxy.DeleteLabel(System.UInt32%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/DaemonProxy.cs/#L379">View Source</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_DaemonProxy_DeleteLabel_System_UInt32_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.DaemonProxy.DeleteLabel(System.UInt32%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
   </span>
   <span class="small pull-right mobile-hide">
     <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/DaemonProxy.cs/#L379">View Source</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <a id="chia_dotnet_DaemonProxy_DeleteLabel_" data-uid="chia.dotnet.DaemonProxy.DeleteLabel*"></a>
   <h4 id="chia_dotnet_DaemonProxy_DeleteLabel_System_UInt32_System_Threading_CancellationToken_" data-uid="chia.dotnet.DaemonProxy.DeleteLabel(System.UInt32,System.Threading.CancellationToken)">DeleteLabel(UInt32, CancellationToken)</h4>
@@ -649,24 +521,10 @@ <h5 class="returns">Returns</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_DaemonProxy_Exit_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.DaemonProxy.Exit(System.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_DaemonProxy_Exit_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.DaemonProxy.Exit(System.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_DaemonProxy_Exit_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.DaemonProxy.Exit(System.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/DaemonProxy.cs/#L56">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/DaemonProxy.cs/#L56">View Source</a>
   </span>
   <a id="chia_dotnet_DaemonProxy_Exit_" data-uid="chia.dotnet.DaemonProxy.Exit*"></a>
   <h4 id="chia_dotnet_DaemonProxy_Exit_System_Threading_CancellationToken_" data-uid="chia.dotnet.DaemonProxy.Exit(System.Threading.CancellationToken)">Exit(CancellationToken)</h4>
@@ -716,30 +574,10 @@ <h5 id="chia_dotnet_DaemonProxy_Exit_System_Threading_CancellationToken__remarks
 </div>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_DaemonProxy_GetAllPrivateKeys_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.DaemonProxy.GetAllPrivateKeys(System.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/DaemonProxy.cs/#L305">View Source</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_DaemonProxy_GetAllPrivateKeys_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.DaemonProxy.GetAllPrivateKeys(System.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/DaemonProxy.cs/#L305">View Source</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_DaemonProxy_GetAllPrivateKeys_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.DaemonProxy.GetAllPrivateKeys(System.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
   </span>
   <span class="small pull-right mobile-hide">
     <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/DaemonProxy.cs/#L305">View Source</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <a id="chia_dotnet_DaemonProxy_GetAllPrivateKeys_" data-uid="chia.dotnet.DaemonProxy.GetAllPrivateKeys*"></a>
   <h4 id="chia_dotnet_DaemonProxy_GetAllPrivateKeys_System_Threading_CancellationToken_" data-uid="chia.dotnet.DaemonProxy.GetAllPrivateKeys(System.Threading.CancellationToken)">GetAllPrivateKeys(CancellationToken)</h4>
@@ -786,30 +624,10 @@ <h5 class="returns">Returns</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_DaemonProxy_GetFirstPrivateKey_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.DaemonProxy.GetFirstPrivateKey(System.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/DaemonProxy.cs/#L295">View Source</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_DaemonProxy_GetFirstPrivateKey_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.DaemonProxy.GetFirstPrivateKey(System.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/DaemonProxy.cs/#L295">View Source</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_DaemonProxy_GetFirstPrivateKey_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.DaemonProxy.GetFirstPrivateKey(System.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
   </span>
   <span class="small pull-right mobile-hide">
     <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/DaemonProxy.cs/#L295">View Source</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <a id="chia_dotnet_DaemonProxy_GetFirstPrivateKey_" data-uid="chia.dotnet.DaemonProxy.GetFirstPrivateKey*"></a>
   <h4 id="chia_dotnet_DaemonProxy_GetFirstPrivateKey_System_Threading_CancellationToken_" data-uid="chia.dotnet.DaemonProxy.GetFirstPrivateKey(System.Threading.CancellationToken)">GetFirstPrivateKey(CancellationToken)</h4>
@@ -856,30 +674,10 @@ <h5 class="returns">Returns</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_DaemonProxy_GetKey_System_UInt32_System_Boolean_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.DaemonProxy.GetKey(System.UInt32%2CSystem.Boolean%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
   </span>
   <span class="small pull-right mobile-hide">
     <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/DaemonProxy.cs/#L332">View Source</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_DaemonProxy_GetKey_System_UInt32_System_Boolean_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.DaemonProxy.GetKey(System.UInt32%2CSystem.Boolean%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/DaemonProxy.cs/#L332">View Source</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_DaemonProxy_GetKey_System_UInt32_System_Boolean_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.DaemonProxy.GetKey(System.UInt32%2CSystem.Boolean%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/DaemonProxy.cs/#L332">View Source</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <a id="chia_dotnet_DaemonProxy_GetKey_" data-uid="chia.dotnet.DaemonProxy.GetKey*"></a>
   <h4 id="chia_dotnet_DaemonProxy_GetKey_System_UInt32_System_Boolean_System_Threading_CancellationToken_" data-uid="chia.dotnet.DaemonProxy.GetKey(System.UInt32,System.Boolean,System.Threading.CancellationToken)">GetKey(UInt32, Boolean, CancellationToken)</h4>
@@ -936,30 +734,10 @@ <h5 class="returns">Returns</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_DaemonProxy_GetKeyForFingerprint_System_UInt32_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.DaemonProxy.GetKeyForFingerprint(System.UInt32%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
   </span>
   <span class="small pull-right mobile-hide">
     <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/DaemonProxy.cs/#L235">View Source</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_DaemonProxy_GetKeyForFingerprint_System_UInt32_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.DaemonProxy.GetKeyForFingerprint(System.UInt32%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/DaemonProxy.cs/#L235">View Source</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_DaemonProxy_GetKeyForFingerprint_System_UInt32_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.DaemonProxy.GetKeyForFingerprint(System.UInt32%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/DaemonProxy.cs/#L235">View Source</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <a id="chia_dotnet_DaemonProxy_GetKeyForFingerprint_" data-uid="chia.dotnet.DaemonProxy.GetKeyForFingerprint*"></a>
   <h4 id="chia_dotnet_DaemonProxy_GetKeyForFingerprint_System_UInt32_System_Threading_CancellationToken_" data-uid="chia.dotnet.DaemonProxy.GetKeyForFingerprint(System.UInt32,System.Threading.CancellationToken)">GetKeyForFingerprint(UInt32, CancellationToken)</h4>
@@ -1012,30 +790,10 @@ <h5 class="returns">Returns</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_DaemonProxy_GetKeyringStatus_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.DaemonProxy.GetKeyringStatus(System.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/DaemonProxy.cs/#L132">View Source</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_DaemonProxy_GetKeyringStatus_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.DaemonProxy.GetKeyringStatus(System.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/DaemonProxy.cs/#L132">View Source</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_DaemonProxy_GetKeyringStatus_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.DaemonProxy.GetKeyringStatus(System.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
   </span>
   <span class="small pull-right mobile-hide">
     <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/DaemonProxy.cs/#L132">View Source</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <a id="chia_dotnet_DaemonProxy_GetKeyringStatus_" data-uid="chia.dotnet.DaemonProxy.GetKeyringStatus*"></a>
   <h4 id="chia_dotnet_DaemonProxy_GetKeyringStatus_System_Threading_CancellationToken_" data-uid="chia.dotnet.DaemonProxy.GetKeyringStatus(System.Threading.CancellationToken)">GetKeyringStatus(CancellationToken)</h4>
@@ -1082,30 +840,10 @@ <h5 class="returns">Returns</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_DaemonProxy_GetKeys_System_UInt32_System_Boolean_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.DaemonProxy.GetKeys(System.UInt32%2CSystem.Boolean%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
   </span>
   <span class="small pull-right mobile-hide">
     <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/DaemonProxy.cs/#L348">View Source</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_DaemonProxy_GetKeys_System_UInt32_System_Boolean_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.DaemonProxy.GetKeys(System.UInt32%2CSystem.Boolean%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/DaemonProxy.cs/#L348">View Source</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_DaemonProxy_GetKeys_System_UInt32_System_Boolean_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.DaemonProxy.GetKeys(System.UInt32%2CSystem.Boolean%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/DaemonProxy.cs/#L348">View Source</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <a id="chia_dotnet_DaemonProxy_GetKeys_" data-uid="chia.dotnet.DaemonProxy.GetKeys*"></a>
   <h4 id="chia_dotnet_DaemonProxy_GetKeys_System_UInt32_System_Boolean_System_Threading_CancellationToken_" data-uid="chia.dotnet.DaemonProxy.GetKeys(System.UInt32,System.Boolean,System.Threading.CancellationToken)">GetKeys(UInt32, Boolean, CancellationToken)</h4>
@@ -1162,30 +900,10 @@ <h5 class="returns">Returns</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_DaemonProxy_GetVersion_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.DaemonProxy.GetVersion(System.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/DaemonProxy.cs/#L77">View Source</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_DaemonProxy_GetVersion_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.DaemonProxy.GetVersion(System.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/DaemonProxy.cs/#L77">View Source</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_DaemonProxy_GetVersion_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.DaemonProxy.GetVersion(System.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
   </span>
   <span class="small pull-right mobile-hide">
     <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/DaemonProxy.cs/#L77">View Source</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <a id="chia_dotnet_DaemonProxy_GetVersion_" data-uid="chia.dotnet.DaemonProxy.GetVersion*"></a>
   <h4 id="chia_dotnet_DaemonProxy_GetVersion_System_Threading_CancellationToken_" data-uid="chia.dotnet.DaemonProxy.GetVersion(System.Threading.CancellationToken)">GetVersion(CancellationToken)</h4>
@@ -1232,30 +950,10 @@ <h5 class="returns">Returns</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_DaemonProxy_IsKeyringLocked_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.DaemonProxy.IsKeyringLocked(System.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
   </span>
   <span class="small pull-right mobile-hide">
     <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/DaemonProxy.cs/#L170">View Source</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_DaemonProxy_IsKeyringLocked_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.DaemonProxy.IsKeyringLocked(System.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/DaemonProxy.cs/#L170">View Source</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_DaemonProxy_IsKeyringLocked_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.DaemonProxy.IsKeyringLocked(System.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/DaemonProxy.cs/#L170">View Source</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <a id="chia_dotnet_DaemonProxy_IsKeyringLocked_" data-uid="chia.dotnet.DaemonProxy.IsKeyringLocked*"></a>
   <h4 id="chia_dotnet_DaemonProxy_IsKeyringLocked_System_Threading_CancellationToken_" data-uid="chia.dotnet.DaemonProxy.IsKeyringLocked(System.Threading.CancellationToken)">IsKeyringLocked(CancellationToken)</h4>
@@ -1302,30 +1000,10 @@ <h5 class="returns">Returns</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_DaemonProxy_IsRunning_System_String_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.DaemonProxy.IsRunning(System.String%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/DaemonProxy.cs/#L393">View Source</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_DaemonProxy_IsRunning_System_String_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.DaemonProxy.IsRunning(System.String%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/DaemonProxy.cs/#L393">View Source</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_DaemonProxy_IsRunning_System_String_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.DaemonProxy.IsRunning(System.String%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
   </span>
   <span class="small pull-right mobile-hide">
     <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/DaemonProxy.cs/#L393">View Source</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <a id="chia_dotnet_DaemonProxy_IsRunning_" data-uid="chia.dotnet.DaemonProxy.IsRunning*"></a>
   <h4 id="chia_dotnet_DaemonProxy_IsRunning_System_String_System_Threading_CancellationToken_" data-uid="chia.dotnet.DaemonProxy.IsRunning(System.String,System.Threading.CancellationToken)">IsRunning(String, CancellationToken)</h4>
@@ -1378,24 +1056,10 @@ <h5 class="returns">Returns</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_DaemonProxy_IsServiceRunning_System_String_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.DaemonProxy.IsServiceRunning(System.String%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_DaemonProxy_IsServiceRunning_System_String_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.DaemonProxy.IsServiceRunning(System.String%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_DaemonProxy_IsServiceRunning_System_String_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.DaemonProxy.IsServiceRunning(System.String%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/DaemonProxy.cs/#L67">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/DaemonProxy.cs/#L67">View Source</a>
   </span>
   <a id="chia_dotnet_DaemonProxy_IsServiceRunning_" data-uid="chia.dotnet.DaemonProxy.IsServiceRunning*"></a>
   <h4 id="chia_dotnet_DaemonProxy_IsServiceRunning_System_String_System_Threading_CancellationToken_" data-uid="chia.dotnet.DaemonProxy.IsServiceRunning(System.String,System.Threading.CancellationToken)">IsServiceRunning(String, CancellationToken)</h4>
@@ -1448,30 +1112,10 @@ <h5 class="returns">Returns</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_DaemonProxy_MigrateKeyring_System_String_System_String_System_Boolean_System_Boolean_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.DaemonProxy.MigrateKeyring(System.String%2CSystem.String%2CSystem.Boolean%2CSystem.Boolean%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/DaemonProxy.cs/#L184">View Source</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_DaemonProxy_MigrateKeyring_System_String_System_String_System_Boolean_System_Boolean_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.DaemonProxy.MigrateKeyring(System.String%2CSystem.String%2CSystem.Boolean%2CSystem.Boolean%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/DaemonProxy.cs/#L184">View Source</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_DaemonProxy_MigrateKeyring_System_String_System_String_System_Boolean_System_Boolean_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.DaemonProxy.MigrateKeyring(System.String%2CSystem.String%2CSystem.Boolean%2CSystem.Boolean%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
   </span>
   <span class="small pull-right mobile-hide">
     <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/DaemonProxy.cs/#L184">View Source</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <a id="chia_dotnet_DaemonProxy_MigrateKeyring_" data-uid="chia.dotnet.DaemonProxy.MigrateKeyring*"></a>
   <h4 id="chia_dotnet_DaemonProxy_MigrateKeyring_System_String_System_String_System_Boolean_System_Boolean_System_Threading_CancellationToken_" data-uid="chia.dotnet.DaemonProxy.MigrateKeyring(System.String,System.String,System.Boolean,System.Boolean,System.Threading.CancellationToken)">MigrateKeyring(String, String, Boolean, Boolean, CancellationToken)</h4>
@@ -1542,24 +1186,10 @@ <h5 class="returns">Returns</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_DaemonProxy_Ping_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.DaemonProxy.Ping(System.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_DaemonProxy_Ping_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.DaemonProxy.Ping(System.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_DaemonProxy_Ping_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.DaemonProxy.Ping(System.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/DaemonProxy.cs/#L31">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/DaemonProxy.cs/#L31">View Source</a>
   </span>
   <a id="chia_dotnet_DaemonProxy_Ping_" data-uid="chia.dotnet.DaemonProxy.Ping*"></a>
   <h4 id="chia_dotnet_DaemonProxy_Ping_System_Threading_CancellationToken_" data-uid="chia.dotnet.DaemonProxy.Ping(System.Threading.CancellationToken)">Ping(CancellationToken)</h4>
@@ -1606,30 +1236,10 @@ <h5 class="returns">Returns</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_DaemonProxy_RegisterService_System_String_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.DaemonProxy.RegisterService(System.String%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/DaemonProxy.cs/#L100">View Source</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_DaemonProxy_RegisterService_System_String_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.DaemonProxy.RegisterService(System.String%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/DaemonProxy.cs/#L100">View Source</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_DaemonProxy_RegisterService_System_String_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.DaemonProxy.RegisterService(System.String%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
   </span>
   <span class="small pull-right mobile-hide">
     <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/DaemonProxy.cs/#L100">View Source</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <a id="chia_dotnet_DaemonProxy_RegisterService_" data-uid="chia.dotnet.DaemonProxy.RegisterService*"></a>
   <h4 id="chia_dotnet_DaemonProxy_RegisterService_System_String_System_Threading_CancellationToken_" data-uid="chia.dotnet.DaemonProxy.RegisterService(System.String,System.Threading.CancellationToken)">RegisterService(String, CancellationToken)</h4>
@@ -1683,30 +1293,10 @@ <h5 class="returns">Returns</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_DaemonProxy_RegisterService_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.DaemonProxy.RegisterService(System.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/DaemonProxy.cs/#L88">View Source</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_DaemonProxy_RegisterService_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.DaemonProxy.RegisterService(System.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/DaemonProxy.cs/#L88">View Source</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_DaemonProxy_RegisterService_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.DaemonProxy.RegisterService(System.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
   </span>
   <span class="small pull-right mobile-hide">
     <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/DaemonProxy.cs/#L88">View Source</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <a id="chia_dotnet_DaemonProxy_RegisterService_" data-uid="chia.dotnet.DaemonProxy.RegisterService*"></a>
   <h4 id="chia_dotnet_DaemonProxy_RegisterService_System_Threading_CancellationToken_" data-uid="chia.dotnet.DaemonProxy.RegisterService(System.Threading.CancellationToken)">RegisterService(CancellationToken)</h4>
@@ -1754,30 +1344,10 @@ <h5 class="returns">Returns</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_DaemonProxy_RemoveKeyringPassphrase_System_String_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.DaemonProxy.RemoveKeyringPassphrase(System.String%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
   </span>
   <span class="small pull-right mobile-hide">
     <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/DaemonProxy.cs/#L221">View Source</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_DaemonProxy_RemoveKeyringPassphrase_System_String_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.DaemonProxy.RemoveKeyringPassphrase(System.String%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/DaemonProxy.cs/#L221">View Source</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_DaemonProxy_RemoveKeyringPassphrase_System_String_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.DaemonProxy.RemoveKeyringPassphrase(System.String%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/DaemonProxy.cs/#L221">View Source</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <a id="chia_dotnet_DaemonProxy_RemoveKeyringPassphrase_" data-uid="chia.dotnet.DaemonProxy.RemoveKeyringPassphrase*"></a>
   <h4 id="chia_dotnet_DaemonProxy_RemoveKeyringPassphrase_System_String_System_Threading_CancellationToken_" data-uid="chia.dotnet.DaemonProxy.RemoveKeyringPassphrase(System.String,System.Threading.CancellationToken)">RemoveKeyringPassphrase(String, CancellationToken)</h4>
@@ -1830,30 +1400,10 @@ <h5 class="returns">Returns</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_DaemonProxy_SetKeyringPassphrase_System_String_System_String_System_String_System_Boolean_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.DaemonProxy.SetKeyringPassphrase(System.String%2CSystem.String%2CSystem.String%2CSystem.Boolean%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
   </span>
   <span class="small pull-right mobile-hide">
     <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/DaemonProxy.cs/#L204">View Source</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_DaemonProxy_SetKeyringPassphrase_System_String_System_String_System_String_System_Boolean_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.DaemonProxy.SetKeyringPassphrase(System.String%2CSystem.String%2CSystem.String%2CSystem.Boolean%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/DaemonProxy.cs/#L204">View Source</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_DaemonProxy_SetKeyringPassphrase_System_String_System_String_System_String_System_Boolean_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.DaemonProxy.SetKeyringPassphrase(System.String%2CSystem.String%2CSystem.String%2CSystem.Boolean%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/DaemonProxy.cs/#L204">View Source</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <a id="chia_dotnet_DaemonProxy_SetKeyringPassphrase_" data-uid="chia.dotnet.DaemonProxy.SetKeyringPassphrase*"></a>
   <h4 id="chia_dotnet_DaemonProxy_SetKeyringPassphrase_System_String_System_String_System_String_System_Boolean_System_Threading_CancellationToken_" data-uid="chia.dotnet.DaemonProxy.SetKeyringPassphrase(System.String,System.String,System.String,System.Boolean,System.Threading.CancellationToken)">SetKeyringPassphrase(String, String, String, Boolean, CancellationToken)</h4>
@@ -1924,30 +1474,10 @@ <h5 class="returns">Returns</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_DaemonProxy_SetLabel_System_UInt32_System_String_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.DaemonProxy.SetLabel(System.UInt32%2CSystem.String%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/DaemonProxy.cs/#L364">View Source</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_DaemonProxy_SetLabel_System_UInt32_System_String_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.DaemonProxy.SetLabel(System.UInt32%2CSystem.String%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/DaemonProxy.cs/#L364">View Source</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_DaemonProxy_SetLabel_System_UInt32_System_String_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.DaemonProxy.SetLabel(System.UInt32%2CSystem.String%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
   </span>
   <span class="small pull-right mobile-hide">
     <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/DaemonProxy.cs/#L364">View Source</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <a id="chia_dotnet_DaemonProxy_SetLabel_" data-uid="chia.dotnet.DaemonProxy.SetLabel*"></a>
   <h4 id="chia_dotnet_DaemonProxy_SetLabel_System_UInt32_System_String_System_Threading_CancellationToken_" data-uid="chia.dotnet.DaemonProxy.SetLabel(System.UInt32,System.String,System.Threading.CancellationToken)">SetLabel(UInt32, String, CancellationToken)</h4>
@@ -2004,12 +1534,6 @@ <h5 class="returns">Returns</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_DaemonProxy_StartService_System_String_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.DaemonProxy.StartService(System.String%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-=======
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_DaemonProxy_StartService_System_String_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.DaemonProxy.StartService(System.String%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
   </span>
   <span class="small pull-right mobile-hide">
@@ -2067,141 +1591,10 @@ <h5 class="returns">Returns</h5>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_DaemonProxy_StopService_System_String_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.DaemonProxy.StopService(System.String%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-<<<<<<< HEAD
-=======
-=======
-<<<<<<< HEAD
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_DaemonProxy_StartService_System_String_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.DaemonProxy.StartService(System.String%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_DaemonProxy_StartService_System_String_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.DaemonProxy.StartService(System.String%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/DaemonProxy.cs/#L111">View Source</a>
-  </span>
-<<<<<<< HEAD
-=======
-  <a id="chia_dotnet_DaemonProxy_StartService_" data-uid="chia.dotnet.DaemonProxy.StartService*"></a>
-  <h4 id="chia_dotnet_DaemonProxy_StartService_System_String_System_Threading_CancellationToken_" data-uid="chia.dotnet.DaemonProxy.StartService(System.String,System.Threading.CancellationToken)">StartService(String, CancellationToken)</h4>
-  <div class="markdown level1 summary"><p>Starts the named service.</p>
-</div>
-  <div class="markdown level1 conceptual"></div>
-  <h5 class="decalaration">Declaration</h5>
-  <div class="codewrapper">
-    <pre><code class="lang-csharp hljs">public async Task StartService(string service, CancellationToken cancellationToken = default(CancellationToken))</code></pre>
-  </div>
-  <h5 class="parameters">Parameters</h5>
-  <table class="table table-bordered table-striped table-condensed">
-    <thead>
-      <tr>
-        <th>Type</th>
-        <th>Name</th>
-        <th>Description</th>
-      </tr>
-    </thead>
-    <tbody>
-      <tr>
-        <td><a class="xref" href="https://learn.microsoft.com/dotnet/api/system.string">String</a></td>
-        <td><span class="parametername">service</span></td>
-        <td><p>The <a class="xref" href="chia.dotnet.ServiceNames.html">ServiceNames</a> of the service</p>
-</td>
-      </tr>
-      <tr>
-        <td><a class="xref" href="https://learn.microsoft.com/dotnet/api/system.threading.cancellationtoken">CancellationToken</a></td>
-        <td><span class="parametername">cancellationToken</span></td>
-        <td><p>A token to allow the call to be cancelled</p>
-</td>
-      </tr>
-    </tbody>
-  </table>
-  <h5 class="returns">Returns</h5>
-  <table class="table table-bordered table-striped table-condensed">
-    <thead>
-      <tr>
-        <th>Type</th>
-        <th>Description</th>
-      </tr>
-    </thead>
-    <tbody>
-      <tr>
-        <td><a class="xref" href="https://learn.microsoft.com/dotnet/api/system.threading.tasks.task">Task</a></td>
-        <td><p>Awaitable <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.threading.tasks.task">Task</a></p>
-</td>
-      </tr>
-    </tbody>
-  </table>
-  <span class="small pull-right mobile-hide">
-    <span class="divider">|</span>
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_DaemonProxy_StopService_System_String_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.DaemonProxy.StopService(System.String%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/DaemonProxy.cs/#L111">View Source</a>
-  </span>
-<<<<<<< HEAD
-  <a id="chia_dotnet_DaemonProxy_StartService_" data-uid="chia.dotnet.DaemonProxy.StartService*"></a>
-  <h4 id="chia_dotnet_DaemonProxy_StartService_System_String_System_Threading_CancellationToken_" data-uid="chia.dotnet.DaemonProxy.StartService(System.String,System.Threading.CancellationToken)">StartService(String, CancellationToken)</h4>
-  <div class="markdown level1 summary"><p>Starts the named service.</p>
-</div>
-  <div class="markdown level1 conceptual"></div>
-  <h5 class="decalaration">Declaration</h5>
-  <div class="codewrapper">
-    <pre><code class="lang-csharp hljs">public async Task StartService(string service, CancellationToken cancellationToken = default(CancellationToken))</code></pre>
-  </div>
-  <h5 class="parameters">Parameters</h5>
-  <table class="table table-bordered table-striped table-condensed">
-    <thead>
-      <tr>
-        <th>Type</th>
-        <th>Name</th>
-        <th>Description</th>
-      </tr>
-    </thead>
-    <tbody>
-      <tr>
-        <td><a class="xref" href="https://learn.microsoft.com/dotnet/api/system.string">String</a></td>
-        <td><span class="parametername">service</span></td>
-        <td><p>The <a class="xref" href="chia.dotnet.ServiceNames.html">ServiceNames</a> of the service</p>
-</td>
-      </tr>
-      <tr>
-        <td><a class="xref" href="https://learn.microsoft.com/dotnet/api/system.threading.cancellationtoken">CancellationToken</a></td>
-        <td><span class="parametername">cancellationToken</span></td>
-        <td><p>A token to allow the call to be cancelled</p>
-</td>
-      </tr>
-    </tbody>
-  </table>
-  <h5 class="returns">Returns</h5>
-  <table class="table table-bordered table-striped table-condensed">
-    <thead>
-      <tr>
-        <th>Type</th>
-        <th>Description</th>
-      </tr>
-    </thead>
-    <tbody>
-      <tr>
-        <td><a class="xref" href="https://learn.microsoft.com/dotnet/api/system.threading.tasks.task">Task</a></td>
-        <td><p>Awaitable <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.threading.tasks.task">Task</a></p>
-</td>
-      </tr>
-    </tbody>
-  </table>
-  <span class="small pull-right mobile-hide">
-    <span class="divider">|</span>
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_DaemonProxy_StopService_System_String_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.DaemonProxy.StopService(System.String%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/DaemonProxy.cs/#L122">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/DaemonProxy.cs/#L122">View Source</a>
   </span>
-=======
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   <a id="chia_dotnet_DaemonProxy_StopService_" data-uid="chia.dotnet.DaemonProxy.StopService*"></a>
   <h4 id="chia_dotnet_DaemonProxy_StopService_System_String_System_Threading_CancellationToken_" data-uid="chia.dotnet.DaemonProxy.StopService(System.String,System.Threading.CancellationToken)">StopService(String, CancellationToken)</h4>
   <div class="markdown level1 summary"><p>Stops the named service</p>
@@ -2253,30 +1646,10 @@ <h5 class="returns">Returns</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_DaemonProxy_UnlockKeyring_System_String_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.DaemonProxy.UnlockKeyring(System.String%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/DaemonProxy.cs/#L157">View Source</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_DaemonProxy_UnlockKeyring_System_String_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.DaemonProxy.UnlockKeyring(System.String%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/DaemonProxy.cs/#L157">View Source</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_DaemonProxy_UnlockKeyring_System_String_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.DaemonProxy.UnlockKeyring(System.String%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
   </span>
   <span class="small pull-right mobile-hide">
     <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/DaemonProxy.cs/#L157">View Source</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <a id="chia_dotnet_DaemonProxy_UnlockKeyring_" data-uid="chia.dotnet.DaemonProxy.UnlockKeyring*"></a>
   <h4 id="chia_dotnet_DaemonProxy_UnlockKeyring_System_String_System_Threading_CancellationToken_" data-uid="chia.dotnet.DaemonProxy.UnlockKeyring(System.String,System.Threading.CancellationToken)">UnlockKeyring(String, CancellationToken)</h4>
@@ -2329,30 +1702,10 @@ <h5 class="returns">Returns</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_DaemonProxy_ValidateKeyringPassphrase_System_String_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.DaemonProxy.ValidateKeyringPassphrase(System.String%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
   </span>
   <span class="small pull-right mobile-hide">
     <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/DaemonProxy.cs/#L143">View Source</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_DaemonProxy_ValidateKeyringPassphrase_System_String_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.DaemonProxy.ValidateKeyringPassphrase(System.String%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/DaemonProxy.cs/#L143">View Source</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_DaemonProxy_ValidateKeyringPassphrase_System_String_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.DaemonProxy.ValidateKeyringPassphrase(System.String%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/DaemonProxy.cs/#L143">View Source</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <a id="chia_dotnet_DaemonProxy_ValidateKeyringPassphrase_" data-uid="chia.dotnet.DaemonProxy.ValidateKeyringPassphrase*"></a>
   <h4 id="chia_dotnet_DaemonProxy_ValidateKeyringPassphrase_System_String_System_Threading_CancellationToken_" data-uid="chia.dotnet.DaemonProxy.ValidateKeyringPassphrase(System.String,System.Threading.CancellationToken)">ValidateKeyringPassphrase(String, CancellationToken)</h4>
@@ -2411,24 +1764,10 @@ <h5 class="returns">Returns</h5>
               <div class="contribution">
                 <ul class="nav">
                   <li>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-                    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_DaemonProxy.md&amp;value=---%0Auid%3A%20chia.dotnet.DaemonProxy%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-                    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_DaemonProxy.md&amp;value=---%0Auid%3A%20chia.dotnet.DaemonProxy%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-=======
                     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_DaemonProxy.md&amp;value=---%0Auid%3A%20chia.dotnet.DaemonProxy%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
                   </li>
                   <li>
-                    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/DaemonProxy.cs/#L14" class="contribution-link">View Source</a>
+                    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/DaemonProxy.cs/#L14" class="contribution-link">View Source</a>
                   </li>
                 </ul>
               </div>
diff --git a/docs/api/chia.dotnet.DataLayerOffer.html b/docs/api/chia.dotnet.DataLayerOffer.html
index 4670e876..9b8757e7 100644
--- a/docs/api/chia.dotnet.DataLayerOffer.html
+++ b/docs/api/chia.dotnet.DataLayerOffer.html
@@ -90,21 +90,7 @@ <h5>Inherited Members</h5>
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object)">Object.Equals(Object)</a>
     </div>
     <div>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object-system-object)">Object.Equals(Object, Object)</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-      <span class="xref">System.Object.Equals(System.Object, System.Object)</span>
-=======
-      <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object-system-object)">Object.Equals(Object, Object)</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
     </div>
     <div>
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.gethashcode#system-object-gethashcode">Object.GetHashCode()</a>
@@ -132,24 +118,10 @@ <h3 id="properties">Properties
   </h3>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_DataLayerOffer_Maker.md&amp;value=---%0Auid%3A%20chia.dotnet.DataLayerOffer.Maker%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_DataLayerOffer_Maker.md&amp;value=---%0Auid%3A%20chia.dotnet.DataLayerOffer.Maker%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_DataLayerOffer_Maker.md&amp;value=---%0Auid%3A%20chia.dotnet.DataLayerOffer.Maker%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/DataLayerOffer.cs/#L7">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/DataLayerOffer.cs/#L7">View Source</a>
   </span>
   <a id="chia_dotnet_DataLayerOffer_Maker_" data-uid="chia.dotnet.DataLayerOffer.Maker*"></a>
   <h4 id="chia_dotnet_DataLayerOffer_Maker" data-uid="chia.dotnet.DataLayerOffer.Maker">Maker</h4>
@@ -176,24 +148,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_DataLayerOffer_Offer.md&amp;value=---%0Auid%3A%20chia.dotnet.DataLayerOffer.Offer%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_DataLayerOffer_Offer.md&amp;value=---%0Auid%3A%20chia.dotnet.DataLayerOffer.Offer%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_DataLayerOffer_Offer.md&amp;value=---%0Auid%3A%20chia.dotnet.DataLayerOffer.Offer%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/DataLayerOffer.cs/#L6">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/DataLayerOffer.cs/#L6">View Source</a>
   </span>
   <a id="chia_dotnet_DataLayerOffer_Offer_" data-uid="chia.dotnet.DataLayerOffer.Offer*"></a>
   <h4 id="chia_dotnet_DataLayerOffer_Offer" data-uid="chia.dotnet.DataLayerOffer.Offer">Offer</h4>
@@ -220,24 +178,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_DataLayerOffer_Taker.md&amp;value=---%0Auid%3A%20chia.dotnet.DataLayerOffer.Taker%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_DataLayerOffer_Taker.md&amp;value=---%0Auid%3A%20chia.dotnet.DataLayerOffer.Taker%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_DataLayerOffer_Taker.md&amp;value=---%0Auid%3A%20chia.dotnet.DataLayerOffer.Taker%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/DataLayerOffer.cs/#L8">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/DataLayerOffer.cs/#L8">View Source</a>
   </span>
   <a id="chia_dotnet_DataLayerOffer_Taker_" data-uid="chia.dotnet.DataLayerOffer.Taker*"></a>
   <h4 id="chia_dotnet_DataLayerOffer_Taker" data-uid="chia.dotnet.DataLayerOffer.Taker">Taker</h4>
@@ -264,24 +208,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_DataLayerOffer_TradeId.md&amp;value=---%0Auid%3A%20chia.dotnet.DataLayerOffer.TradeId%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_DataLayerOffer_TradeId.md&amp;value=---%0Auid%3A%20chia.dotnet.DataLayerOffer.TradeId%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_DataLayerOffer_TradeId.md&amp;value=---%0Auid%3A%20chia.dotnet.DataLayerOffer.TradeId%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/DataLayerOffer.cs/#L5">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/DataLayerOffer.cs/#L5">View Source</a>
   </span>
   <a id="chia_dotnet_DataLayerOffer_TradeId_" data-uid="chia.dotnet.DataLayerOffer.TradeId*"></a>
   <h4 id="chia_dotnet_DataLayerOffer_TradeId" data-uid="chia.dotnet.DataLayerOffer.TradeId">TradeId</h4>
@@ -318,24 +248,10 @@ <h3 id="implements">Implements</h3>
               <div class="contribution">
                 <ul class="nav">
                   <li>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-                    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_DataLayerOffer.md&amp;value=---%0Auid%3A%20chia.dotnet.DataLayerOffer%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-                    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_DataLayerOffer.md&amp;value=---%0Auid%3A%20chia.dotnet.DataLayerOffer%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-=======
                     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_DataLayerOffer.md&amp;value=---%0Auid%3A%20chia.dotnet.DataLayerOffer%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
                   </li>
                   <li>
-                    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/DataLayerOffer.cs/#L3" class="contribution-link">View Source</a>
+                    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/DataLayerOffer.cs/#L3" class="contribution-link">View Source</a>
                   </li>
                 </ul>
               </div>
diff --git a/docs/api/chia.dotnet.DataLayerProxy.html b/docs/api/chia.dotnet.DataLayerProxy.html
index 6a6f8770..b701a22c 100644
--- a/docs/api/chia.dotnet.DataLayerProxy.html
+++ b/docs/api/chia.dotnet.DataLayerProxy.html
@@ -143,24 +143,10 @@ <h3 id="constructors">Constructors
   </h3>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_DataLayerProxy__ctor_chia_dotnet_IRpcClient_System_String_.md&amp;value=---%0Auid%3A%20chia.dotnet.DataLayerProxy.%23ctor(chia.dotnet.IRpcClient%2CSystem.String)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_DataLayerProxy__ctor_chia_dotnet_IRpcClient_System_String_.md&amp;value=---%0Auid%3A%20chia.dotnet.DataLayerProxy.%23ctor(chia.dotnet.IRpcClient%2CSystem.String)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_DataLayerProxy__ctor_chia_dotnet_IRpcClient_System_String_.md&amp;value=---%0Auid%3A%20chia.dotnet.DataLayerProxy.%23ctor(chia.dotnet.IRpcClient%2CSystem.String)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/DataLayerProxy.cs/#L20">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/DataLayerProxy.cs/#L20">View Source</a>
   </span>
   <a id="chia_dotnet_DataLayerProxy__ctor_" data-uid="chia.dotnet.DataLayerProxy.#ctor*"></a>
   <h4 id="chia_dotnet_DataLayerProxy__ctor_chia_dotnet_IRpcClient_System_String_" data-uid="chia.dotnet.DataLayerProxy.#ctor(chia.dotnet.IRpcClient,System.String)">DataLayerProxy(IRpcClient, String)</h4>
@@ -199,24 +185,10 @@ <h3 id="methods">Methods
   </h3>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_DataLayerProxy_AddMirror_System_String_System_UInt64_System_Collections_Generic_IEnumerable_System_String__System_UInt64_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.DataLayerProxy.AddMirror(System.String%2CSystem.UInt64%2CSystem.Collections.Generic.IEnumerable%7BSystem.String%7D%2CSystem.UInt64%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_DataLayerProxy_AddMirror_System_String_System_UInt64_System_Collections_Generic_IEnumerable_System_String__System_UInt64_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.DataLayerProxy.AddMirror(System.String%2CSystem.UInt64%2CSystem.Collections.Generic.IEnumerable%7BSystem.String%7D%2CSystem.UInt64%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_DataLayerProxy_AddMirror_System_String_System_UInt64_System_Collections_Generic_IEnumerable_System_String__System_UInt64_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.DataLayerProxy.AddMirror(System.String%2CSystem.UInt64%2CSystem.Collections.Generic.IEnumerable%7BSystem.String%7D%2CSystem.UInt64%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/DataLayerProxy.cs/#L34">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/DataLayerProxy.cs/#L34">View Source</a>
   </span>
   <a id="chia_dotnet_DataLayerProxy_AddMirror_" data-uid="chia.dotnet.DataLayerProxy.AddMirror*"></a>
   <h4 id="chia_dotnet_DataLayerProxy_AddMirror_System_String_System_UInt64_System_Collections_Generic_IEnumerable_System_String__System_UInt64_System_Threading_CancellationToken_" data-uid="chia.dotnet.DataLayerProxy.AddMirror(System.String,System.UInt64,System.Collections.Generic.IEnumerable{System.String},System.UInt64,System.Threading.CancellationToken)">AddMirror(String, UInt64, IEnumerable&lt;String&gt;, UInt64, CancellationToken)</h4>
@@ -287,24 +259,10 @@ <h5 class="returns">Returns</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_DataLayerProxy_AddMissingFiles_System_String___System_String_System_Boolean_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.DataLayerProxy.AddMissingFiles(System.String%5B%5D%2CSystem.String%2CSystem.Boolean%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_DataLayerProxy_AddMissingFiles_System_String___System_String_System_Boolean_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.DataLayerProxy.AddMissingFiles(System.String%5B%5D%2CSystem.String%2CSystem.Boolean%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_DataLayerProxy_AddMissingFiles_System_String___System_String_System_Boolean_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.DataLayerProxy.AddMissingFiles(System.String%5B%5D%2CSystem.String%2CSystem.Boolean%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/DataLayerProxy.cs/#L54">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/DataLayerProxy.cs/#L54">View Source</a>
   </span>
   <a id="chia_dotnet_DataLayerProxy_AddMissingFiles_" data-uid="chia.dotnet.DataLayerProxy.AddMissingFiles*"></a>
   <h4 id="chia_dotnet_DataLayerProxy_AddMissingFiles_System_String___System_String_System_Boolean_System_Threading_CancellationToken_" data-uid="chia.dotnet.DataLayerProxy.AddMissingFiles(System.String[],System.String,System.Boolean,System.Threading.CancellationToken)">AddMissingFiles(String[], String, Boolean, CancellationToken)</h4>
@@ -369,24 +327,10 @@ <h5 class="returns">Returns</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_DataLayerProxy_BatchUpdate_System_String_System_Collections_Generic_IDictionary_System_String_System_String__System_UInt64_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.DataLayerProxy.BatchUpdate(System.String%2CSystem.Collections.Generic.IDictionary%7BSystem.String%2CSystem.String%7D%2CSystem.UInt64%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_DataLayerProxy_BatchUpdate_System_String_System_Collections_Generic_IDictionary_System_String_System_String__System_UInt64_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.DataLayerProxy.BatchUpdate(System.String%2CSystem.Collections.Generic.IDictionary%7BSystem.String%2CSystem.String%7D%2CSystem.UInt64%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_DataLayerProxy_BatchUpdate_System_String_System_Collections_Generic_IDictionary_System_String_System_String__System_UInt64_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.DataLayerProxy.BatchUpdate(System.String%2CSystem.Collections.Generic.IDictionary%7BSystem.String%2CSystem.String%7D%2CSystem.UInt64%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/DataLayerProxy.cs/#L75">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/DataLayerProxy.cs/#L75">View Source</a>
   </span>
   <a id="chia_dotnet_DataLayerProxy_BatchUpdate_" data-uid="chia.dotnet.DataLayerProxy.BatchUpdate*"></a>
   <h4 id="chia_dotnet_DataLayerProxy_BatchUpdate_System_String_System_Collections_Generic_IDictionary_System_String_System_String__System_UInt64_System_Threading_CancellationToken_" data-uid="chia.dotnet.DataLayerProxy.BatchUpdate(System.String,System.Collections.Generic.IDictionary{System.String,System.String},System.UInt64,System.Threading.CancellationToken)">BatchUpdate(String, IDictionary&lt;String, String&gt;, UInt64, CancellationToken)</h4>
@@ -451,28 +395,10 @@ <h5 class="returns">Returns</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_DataLayerProxy_CancelOffer_System_String_System_Boolean_System_UInt64_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.DataLayerProxy.CancelOffer(System.String%2CSystem.Boolean%2CSystem.UInt64%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_DataLayerProxy_CancelOffer_System_String_System_Boolean_System_UInt64_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.DataLayerProxy.CancelOffer(System.String%2CSystem.Boolean%2CSystem.UInt64%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_DataLayerProxy_CancelOffer_System_String_System_Boolean_System_UInt64_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.DataLayerProxy.CancelOffer(System.String%2CSystem.Boolean%2CSystem.UInt64%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-<<<<<<< HEAD
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/DataLayerProxy.cs/#L99">View Source</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/DataLayerProxy.cs/#L98">View Source</a>
->>>>>>> main
   </span>
   <a id="chia_dotnet_DataLayerProxy_CancelOffer_" data-uid="chia.dotnet.DataLayerProxy.CancelOffer*"></a>
   <h4 id="chia_dotnet_DataLayerProxy_CancelOffer_System_String_System_Boolean_System_UInt64_System_Threading_CancellationToken_" data-uid="chia.dotnet.DataLayerProxy.CancelOffer(System.String,System.Boolean,System.UInt64,System.Threading.CancellationToken)">CancelOffer(String, Boolean, UInt64, CancellationToken)</h4>
@@ -537,28 +463,10 @@ <h5 class="returns">Returns</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_DataLayerProxy_CheckPlugins_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.DataLayerProxy.CheckPlugins(System.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_DataLayerProxy_CheckPlugins_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.DataLayerProxy.CheckPlugins(System.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_DataLayerProxy_CheckPlugins_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.DataLayerProxy.CheckPlugins(System.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-<<<<<<< HEAD
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/DataLayerProxy.cs/#L113">View Source</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/DataLayerProxy.cs/#L112">View Source</a>
->>>>>>> main
   </span>
   <a id="chia_dotnet_DataLayerProxy_CheckPlugins_" data-uid="chia.dotnet.DataLayerProxy.CheckPlugins*"></a>
   <h4 id="chia_dotnet_DataLayerProxy_CheckPlugins_System_Threading_CancellationToken_" data-uid="chia.dotnet.DataLayerProxy.CheckPlugins(System.Threading.CancellationToken)">CheckPlugins(CancellationToken)</h4>
@@ -604,28 +512,10 @@ <h5 class="returns">Returns</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_DataLayerProxy_CreateDataStore_System_UInt64_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.DataLayerProxy.CreateDataStore(System.UInt64%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_DataLayerProxy_CreateDataStore_System_UInt64_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.DataLayerProxy.CreateDataStore(System.UInt64%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_DataLayerProxy_CreateDataStore_System_UInt64_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.DataLayerProxy.CreateDataStore(System.UInt64%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-<<<<<<< HEAD
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/DataLayerProxy.cs/#L124">View Source</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/DataLayerProxy.cs/#L123">View Source</a>
->>>>>>> main
   </span>
   <a id="chia_dotnet_DataLayerProxy_CreateDataStore_" data-uid="chia.dotnet.DataLayerProxy.CreateDataStore*"></a>
   <h4 id="chia_dotnet_DataLayerProxy_CreateDataStore_System_UInt64_System_Threading_CancellationToken_" data-uid="chia.dotnet.DataLayerProxy.CreateDataStore(System.UInt64,System.Threading.CancellationToken)">CreateDataStore(UInt64, CancellationToken)</h4>
@@ -678,28 +568,10 @@ <h5 class="returns">Returns</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_DataLayerProxy_DeleteKey_System_String_System_String_System_UInt64_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.DataLayerProxy.DeleteKey(System.String%2CSystem.String%2CSystem.UInt64%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_DataLayerProxy_DeleteKey_System_String_System_String_System_UInt64_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.DataLayerProxy.DeleteKey(System.String%2CSystem.String%2CSystem.UInt64%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_DataLayerProxy_DeleteKey_System_String_System_String_System_UInt64_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.DataLayerProxy.DeleteKey(System.String%2CSystem.String%2CSystem.UInt64%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-<<<<<<< HEAD
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/DataLayerProxy.cs/#L145">View Source</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/DataLayerProxy.cs/#L144">View Source</a>
->>>>>>> main
   </span>
   <a id="chia_dotnet_DataLayerProxy_DeleteKey_" data-uid="chia.dotnet.DataLayerProxy.DeleteKey*"></a>
   <h4 id="chia_dotnet_DataLayerProxy_DeleteKey_System_String_System_String_System_UInt64_System_Threading_CancellationToken_" data-uid="chia.dotnet.DataLayerProxy.DeleteKey(System.String,System.String,System.UInt64,System.Threading.CancellationToken)">DeleteKey(String, String, UInt64, CancellationToken)</h4>
@@ -764,28 +636,10 @@ <h5 class="returns">Returns</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_DataLayerProxy_DeleteMirror_System_String_System_UInt64_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.DataLayerProxy.DeleteMirror(System.String%2CSystem.UInt64%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_DataLayerProxy_DeleteMirror_System_String_System_UInt64_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.DataLayerProxy.DeleteMirror(System.String%2CSystem.UInt64%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_DataLayerProxy_DeleteMirror_System_String_System_UInt64_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.DataLayerProxy.DeleteMirror(System.String%2CSystem.UInt64%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-<<<<<<< HEAD
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/DataLayerProxy.cs/#L164">View Source</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/DataLayerProxy.cs/#L161">View Source</a>
->>>>>>> main
   </span>
   <a id="chia_dotnet_DataLayerProxy_DeleteMirror_" data-uid="chia.dotnet.DataLayerProxy.DeleteMirror*"></a>
   <h4 id="chia_dotnet_DataLayerProxy_DeleteMirror_System_String_System_UInt64_System_Threading_CancellationToken_" data-uid="chia.dotnet.DataLayerProxy.DeleteMirror(System.String,System.UInt64,System.Threading.CancellationToken)">DeleteMirror(String, UInt64, CancellationToken)</h4>
@@ -843,28 +697,10 @@ <h5 class="returns">Returns</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_DataLayerProxy_GetAncestors_System_String_System_String_System_UInt64_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.DataLayerProxy.GetAncestors(System.String%2CSystem.String%2CSystem.UInt64%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_DataLayerProxy_GetAncestors_System_String_System_String_System_UInt64_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.DataLayerProxy.GetAncestors(System.String%2CSystem.String%2CSystem.UInt64%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_DataLayerProxy_GetAncestors_System_String_System_String_System_UInt64_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.DataLayerProxy.GetAncestors(System.String%2CSystem.String%2CSystem.UInt64%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-<<<<<<< HEAD
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/DataLayerProxy.cs/#L181">View Source</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/DataLayerProxy.cs/#L178">View Source</a>
->>>>>>> main
   </span>
   <a id="chia_dotnet_DataLayerProxy_GetAncestors_" data-uid="chia.dotnet.DataLayerProxy.GetAncestors*"></a>
   <h4 id="chia_dotnet_DataLayerProxy_GetAncestors_System_String_System_String_System_UInt64_System_Threading_CancellationToken_" data-uid="chia.dotnet.DataLayerProxy.GetAncestors(System.String,System.String,System.UInt64,System.Threading.CancellationToken)">GetAncestors(String, String, UInt64, CancellationToken)</h4>
@@ -928,36 +764,11 @@ <h5 class="returns">Returns</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_DataLayerProxy_GetKeys_System_String_System_String_System_UInt64_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.DataLayerProxy.GetKeys(System.String%2CSystem.String%2CSystem.UInt64%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
   </span>
   <span class="small pull-right mobile-hide">
     <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/DataLayerProxy.cs/#L196">View Source</a>
   </span>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_DataLayerProxy_GetKeys_System_String_System_String_System_UInt64_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.DataLayerProxy.GetKeys(System.String%2CSystem.String%2CSystem.UInt64%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/DataLayerProxy.cs/#L199">View Source</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_DataLayerProxy_GetKeys_System_String_System_String_System_UInt64_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.DataLayerProxy.GetKeys(System.String%2CSystem.String%2CSystem.UInt64%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-<<<<<<< HEAD
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/DataLayerProxy.cs/#L199">View Source</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-=======
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/DataLayerProxy.cs/#L199">View Source</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-  </span>
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
   <a id="chia_dotnet_DataLayerProxy_GetKeys_" data-uid="chia.dotnet.DataLayerProxy.GetKeys*"></a>
   <h4 id="chia_dotnet_DataLayerProxy_GetKeys_System_String_System_String_System_UInt64_System_Threading_CancellationToken_" data-uid="chia.dotnet.DataLayerProxy.GetKeys(System.String,System.String,System.UInt64,System.Threading.CancellationToken)">GetKeys(String, String, UInt64, CancellationToken)</h4>
   <div class="markdown level1 summary"><p>Gets the list of ancestors for a given id/hash pair.</p>
@@ -1020,37 +831,10 @@ <h5 class="returns">Returns</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_DataLayerProxy_GetKeysValues_System_String_System_String_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.DataLayerProxy.GetKeysValues(System.String%2CSystem.String%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/DataLayerProxy.cs/#L217">View Source</a>
-=======
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_DataLayerProxy_GetKeysValues_System_String_System_String_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.DataLayerProxy.GetKeysValues(System.String%2CSystem.String%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
   </span>
   <span class="small pull-right mobile-hide">
-<<<<<<< HEAD
-    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/DataLayerProxy.cs/#L217">View Source</a>
-<<<<<<< HEAD
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-=======
-<<<<<<< HEAD
-=======
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-=======
     <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/DataLayerProxy.cs/#L214">View Source</a>
->>>>>>> main
   </span>
   <a id="chia_dotnet_DataLayerProxy_GetKeysValues_" data-uid="chia.dotnet.DataLayerProxy.GetKeysValues*"></a>
   <h4 id="chia_dotnet_DataLayerProxy_GetKeysValues_System_String_System_String_System_Threading_CancellationToken_" data-uid="chia.dotnet.DataLayerProxy.GetKeysValues(System.String,System.String,System.Threading.CancellationToken)">GetKeysValues(String, String, CancellationToken)</h4>
@@ -1108,37 +892,10 @@ <h5 class="returns">Returns</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_DataLayerProxy_GetKVDiff_System_String_System_String_System_String_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.DataLayerProxy.GetKVDiff(System.String%2CSystem.String%2CSystem.String%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/DataLayerProxy.cs/#L234">View Source</a>
-=======
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_DataLayerProxy_GetKVDiff_System_String_System_String_System_String_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.DataLayerProxy.GetKVDiff(System.String%2CSystem.String%2CSystem.String%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
   </span>
   <span class="small pull-right mobile-hide">
-<<<<<<< HEAD
-    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/DataLayerProxy.cs/#L234">View Source</a>
-<<<<<<< HEAD
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-=======
-<<<<<<< HEAD
-=======
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-=======
     <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/DataLayerProxy.cs/#L231">View Source</a>
->>>>>>> main
   </span>
   <a id="chia_dotnet_DataLayerProxy_GetKVDiff_" data-uid="chia.dotnet.DataLayerProxy.GetKVDiff*"></a>
   <h4 id="chia_dotnet_DataLayerProxy_GetKVDiff_System_String_System_String_System_String_System_Threading_CancellationToken_" data-uid="chia.dotnet.DataLayerProxy.GetKVDiff(System.String,System.String,System.String,System.Threading.CancellationToken)">GetKVDiff(String, String, String, CancellationToken)</h4>
@@ -1203,30 +960,10 @@ <h5 class="returns">Returns</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_DataLayerProxy_GetLocalRoot_System_String_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.DataLayerProxy.GetLocalRoot(System.String%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/DataLayerProxy.cs/#L250">View Source</a>
-=======
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_DataLayerProxy_GetLocalRoot_System_String_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.DataLayerProxy.GetLocalRoot(System.String%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
   </span>
   <span class="small pull-right mobile-hide">
-<<<<<<< HEAD
-    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/DataLayerProxy.cs/#L250">View Source</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-=======
     <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/DataLayerProxy.cs/#L247">View Source</a>
->>>>>>> main
   </span>
   <a id="chia_dotnet_DataLayerProxy_GetLocalRoot_" data-uid="chia.dotnet.DataLayerProxy.GetLocalRoot*"></a>
   <h4 id="chia_dotnet_DataLayerProxy_GetLocalRoot_System_String_System_Threading_CancellationToken_" data-uid="chia.dotnet.DataLayerProxy.GetLocalRoot(System.String,System.Threading.CancellationToken)">GetLocalRoot(String, CancellationToken)</h4>
@@ -1279,28 +1016,10 @@ <h5 class="returns">Returns</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_DataLayerProxy_GetMirrors_System_String_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.DataLayerProxy.GetMirrors(System.String%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_DataLayerProxy_GetMirrors_System_String_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.DataLayerProxy.GetMirrors(System.String%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_DataLayerProxy_GetMirrors_System_String_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.DataLayerProxy.GetMirrors(System.String%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-<<<<<<< HEAD
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/DataLayerProxy.cs/#L264">View Source</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/DataLayerProxy.cs/#L261">View Source</a>
->>>>>>> main
   </span>
   <a id="chia_dotnet_DataLayerProxy_GetMirrors_" data-uid="chia.dotnet.DataLayerProxy.GetMirrors*"></a>
   <h4 id="chia_dotnet_DataLayerProxy_GetMirrors_System_String_System_Threading_CancellationToken_" data-uid="chia.dotnet.DataLayerProxy.GetMirrors(System.String,System.Threading.CancellationToken)">GetMirrors(String, CancellationToken)</h4>
@@ -1353,28 +1072,10 @@ <h5 class="returns">Returns</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_DataLayerProxy_GetOwnedStores_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.DataLayerProxy.GetOwnedStores(System.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_DataLayerProxy_GetOwnedStores_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.DataLayerProxy.GetOwnedStores(System.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_DataLayerProxy_GetOwnedStores_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.DataLayerProxy.GetOwnedStores(System.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-<<<<<<< HEAD
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/DataLayerProxy.cs/#L277">View Source</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/DataLayerProxy.cs/#L274">View Source</a>
->>>>>>> main
   </span>
   <a id="chia_dotnet_DataLayerProxy_GetOwnedStores_" data-uid="chia.dotnet.DataLayerProxy.GetOwnedStores*"></a>
   <h4 id="chia_dotnet_DataLayerProxy_GetOwnedStores_System_Threading_CancellationToken_" data-uid="chia.dotnet.DataLayerProxy.GetOwnedStores(System.Threading.CancellationToken)">GetOwnedStores(CancellationToken)</h4>
@@ -1421,28 +1122,10 @@ <h5 class="returns">Returns</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_DataLayerProxy_GetRoot_System_String_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.DataLayerProxy.GetRoot(System.String%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_DataLayerProxy_GetRoot_System_String_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.DataLayerProxy.GetRoot(System.String%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_DataLayerProxy_GetRoot_System_String_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.DataLayerProxy.GetRoot(System.String%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-<<<<<<< HEAD
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/DataLayerProxy.cs/#L288">View Source</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/DataLayerProxy.cs/#L285">View Source</a>
->>>>>>> main
   </span>
   <a id="chia_dotnet_DataLayerProxy_GetRoot_" data-uid="chia.dotnet.DataLayerProxy.GetRoot*"></a>
   <h4 id="chia_dotnet_DataLayerProxy_GetRoot_System_String_System_Threading_CancellationToken_" data-uid="chia.dotnet.DataLayerProxy.GetRoot(System.String,System.Threading.CancellationToken)">GetRoot(String, CancellationToken)</h4>
@@ -1494,28 +1177,10 @@ <h5 class="returns">Returns</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_DataLayerProxy_GetRootHistory_System_String_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.DataLayerProxy.GetRootHistory(System.String%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_DataLayerProxy_GetRootHistory_System_String_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.DataLayerProxy.GetRootHistory(System.String%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_DataLayerProxy_GetRootHistory_System_String_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.DataLayerProxy.GetRootHistory(System.String%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-<<<<<<< HEAD
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/DataLayerProxy.cs/#L308">View Source</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/DataLayerProxy.cs/#L298">View Source</a>
->>>>>>> main
   </span>
   <a id="chia_dotnet_DataLayerProxy_GetRootHistory_" data-uid="chia.dotnet.DataLayerProxy.GetRootHistory*"></a>
   <h4 id="chia_dotnet_DataLayerProxy_GetRootHistory_System_String_System_Threading_CancellationToken_" data-uid="chia.dotnet.DataLayerProxy.GetRootHistory(System.String,System.Threading.CancellationToken)">GetRootHistory(String, CancellationToken)</h4>
@@ -1567,28 +1232,10 @@ <h5 class="returns">Returns</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_DataLayerProxy_GetRoots_System_Collections_Generic_IEnumerable_System_String__System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.DataLayerProxy.GetRoots(System.Collections.Generic.IEnumerable%7BSystem.String%7D%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_DataLayerProxy_GetRoots_System_Collections_Generic_IEnumerable_System_String__System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.DataLayerProxy.GetRoots(System.Collections.Generic.IEnumerable%7BSystem.String%7D%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_DataLayerProxy_GetRoots_System_Collections_Generic_IEnumerable_System_String__System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.DataLayerProxy.GetRoots(System.Collections.Generic.IEnumerable%7BSystem.String%7D%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-<<<<<<< HEAD
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/DataLayerProxy.cs/#L321">View Source</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/DataLayerProxy.cs/#L311">View Source</a>
->>>>>>> main
   </span>
   <a id="chia_dotnet_DataLayerProxy_GetRoots_" data-uid="chia.dotnet.DataLayerProxy.GetRoots*"></a>
   <h4 id="chia_dotnet_DataLayerProxy_GetRoots_System_Collections_Generic_IEnumerable_System_String__System_Threading_CancellationToken_" data-uid="chia.dotnet.DataLayerProxy.GetRoots(System.Collections.Generic.IEnumerable{System.String},System.Threading.CancellationToken)">GetRoots(IEnumerable&lt;String&gt;, CancellationToken)</h4>
@@ -1640,28 +1287,10 @@ <h5 class="returns">Returns</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_DataLayerProxy_GetSyncStatus_System_String_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.DataLayerProxy.GetSyncStatus(System.String%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_DataLayerProxy_GetSyncStatus_System_String_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.DataLayerProxy.GetSyncStatus(System.String%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_DataLayerProxy_GetSyncStatus_System_String_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.DataLayerProxy.GetSyncStatus(System.String%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-<<<<<<< HEAD
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/DataLayerProxy.cs/#L334">View Source</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/DataLayerProxy.cs/#L324">View Source</a>
->>>>>>> main
   </span>
   <a id="chia_dotnet_DataLayerProxy_GetSyncStatus_" data-uid="chia.dotnet.DataLayerProxy.GetSyncStatus*"></a>
   <h4 id="chia_dotnet_DataLayerProxy_GetSyncStatus_System_String_System_Threading_CancellationToken_" data-uid="chia.dotnet.DataLayerProxy.GetSyncStatus(System.String,System.Threading.CancellationToken)">GetSyncStatus(String, CancellationToken)</h4>
@@ -1713,28 +1342,10 @@ <h5 class="returns">Returns</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_DataLayerProxy_GetValue_System_String_System_String_System_String_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.DataLayerProxy.GetValue(System.String%2CSystem.String%2CSystem.String%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_DataLayerProxy_GetValue_System_String_System_String_System_String_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.DataLayerProxy.GetValue(System.String%2CSystem.String%2CSystem.String%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_DataLayerProxy_GetValue_System_String_System_String_System_String_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.DataLayerProxy.GetValue(System.String%2CSystem.String%2CSystem.String%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-<<<<<<< HEAD
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/DataLayerProxy.cs/#L349">View Source</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/DataLayerProxy.cs/#L339">View Source</a>
->>>>>>> main
   </span>
   <a id="chia_dotnet_DataLayerProxy_GetValue_" data-uid="chia.dotnet.DataLayerProxy.GetValue*"></a>
   <h4 id="chia_dotnet_DataLayerProxy_GetValue_System_String_System_String_System_String_System_Threading_CancellationToken_" data-uid="chia.dotnet.DataLayerProxy.GetValue(System.String,System.String,System.String,System.Threading.CancellationToken)">GetValue(String, String, String, CancellationToken)</h4>
@@ -1796,28 +1407,10 @@ <h5 class="returns">Returns</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_DataLayerProxy_Insert_System_String_System_String_System_UInt64_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.DataLayerProxy.Insert(System.String%2CSystem.String%2CSystem.UInt64%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_DataLayerProxy_Insert_System_String_System_String_System_UInt64_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.DataLayerProxy.Insert(System.String%2CSystem.String%2CSystem.UInt64%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_DataLayerProxy_Insert_System_String_System_String_System_UInt64_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.DataLayerProxy.Insert(System.String%2CSystem.String%2CSystem.UInt64%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-<<<<<<< HEAD
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/DataLayerProxy.cs/#L366">View Source</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/DataLayerProxy.cs/#L356">View Source</a>
->>>>>>> main
   </span>
   <a id="chia_dotnet_DataLayerProxy_Insert_" data-uid="chia.dotnet.DataLayerProxy.Insert*"></a>
   <h4 id="chia_dotnet_DataLayerProxy_Insert_System_String_System_String_System_UInt64_System_Threading_CancellationToken_" data-uid="chia.dotnet.DataLayerProxy.Insert(System.String,System.String,System.UInt64,System.Threading.CancellationToken)">Insert(String, String, UInt64, CancellationToken)</h4>
@@ -1880,28 +1473,10 @@ <h5 class="returns">Returns</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_DataLayerProxy_MakeOffer_System_Collections_Generic_IEnumerable_chia_dotnet_OfferStore__System_Collections_Generic_IEnumerable_chia_dotnet_OfferStore__System_UInt64_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.DataLayerProxy.MakeOffer(System.Collections.Generic.IEnumerable%7Bchia.dotnet.OfferStore%7D%2CSystem.Collections.Generic.IEnumerable%7Bchia.dotnet.OfferStore%7D%2CSystem.UInt64%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_DataLayerProxy_MakeOffer_System_Collections_Generic_IEnumerable_chia_dotnet_OfferStore__System_Collections_Generic_IEnumerable_chia_dotnet_OfferStore__System_UInt64_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.DataLayerProxy.MakeOffer(System.Collections.Generic.IEnumerable%7Bchia.dotnet.OfferStore%7D%2CSystem.Collections.Generic.IEnumerable%7Bchia.dotnet.OfferStore%7D%2CSystem.UInt64%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_DataLayerProxy_MakeOffer_System_Collections_Generic_IEnumerable_chia_dotnet_OfferStore__System_Collections_Generic_IEnumerable_chia_dotnet_OfferStore__System_UInt64_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.DataLayerProxy.MakeOffer(System.Collections.Generic.IEnumerable%7Bchia.dotnet.OfferStore%7D%2CSystem.Collections.Generic.IEnumerable%7Bchia.dotnet.OfferStore%7D%2CSystem.UInt64%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-<<<<<<< HEAD
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/DataLayerProxy.cs/#L383">View Source</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/DataLayerProxy.cs/#L373">View Source</a>
->>>>>>> main
   </span>
   <a id="chia_dotnet_DataLayerProxy_MakeOffer_" data-uid="chia.dotnet.DataLayerProxy.MakeOffer*"></a>
   <h4 id="chia_dotnet_DataLayerProxy_MakeOffer_System_Collections_Generic_IEnumerable_chia_dotnet_OfferStore__System_Collections_Generic_IEnumerable_chia_dotnet_OfferStore__System_UInt64_System_Threading_CancellationToken_" data-uid="chia.dotnet.DataLayerProxy.MakeOffer(System.Collections.Generic.IEnumerable{chia.dotnet.OfferStore},System.Collections.Generic.IEnumerable{chia.dotnet.OfferStore},System.UInt64,System.Threading.CancellationToken)">MakeOffer(IEnumerable&lt;OfferStore&gt;, IEnumerable&lt;OfferStore&gt;, UInt64, CancellationToken)</h4>
@@ -1964,28 +1539,10 @@ <h5 class="returns">Returns</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_DataLayerProxy_RemoveSubscriptions_System_String_System_Collections_Generic_IEnumerable_System_String__System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.DataLayerProxy.RemoveSubscriptions(System.String%2CSystem.Collections.Generic.IEnumerable%7BSystem.String%7D%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_DataLayerProxy_RemoveSubscriptions_System_String_System_Collections_Generic_IEnumerable_System_String__System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.DataLayerProxy.RemoveSubscriptions(System.String%2CSystem.Collections.Generic.IEnumerable%7BSystem.String%7D%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_DataLayerProxy_RemoveSubscriptions_System_String_System_Collections_Generic_IEnumerable_System_String__System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.DataLayerProxy.RemoveSubscriptions(System.String%2CSystem.Collections.Generic.IEnumerable%7BSystem.String%7D%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-<<<<<<< HEAD
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/DataLayerProxy.cs/#L399">View Source</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/DataLayerProxy.cs/#L389">View Source</a>
->>>>>>> main
   </span>
   <a id="chia_dotnet_DataLayerProxy_RemoveSubscriptions_" data-uid="chia.dotnet.DataLayerProxy.RemoveSubscriptions*"></a>
   <h4 id="chia_dotnet_DataLayerProxy_RemoveSubscriptions_System_String_System_Collections_Generic_IEnumerable_System_String__System_Threading_CancellationToken_" data-uid="chia.dotnet.DataLayerProxy.RemoveSubscriptions(System.String,System.Collections.Generic.IEnumerable{System.String},System.Threading.CancellationToken)">RemoveSubscriptions(String, IEnumerable&lt;String&gt;, CancellationToken)</h4>
@@ -2042,28 +1599,10 @@ <h5 class="returns">Returns</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_DataLayerProxy_Subscribe_System_String_System_Collections_Generic_IEnumerable_System_String__System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.DataLayerProxy.Subscribe(System.String%2CSystem.Collections.Generic.IEnumerable%7BSystem.String%7D%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_DataLayerProxy_Subscribe_System_String_System_Collections_Generic_IEnumerable_System_String__System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.DataLayerProxy.Subscribe(System.String%2CSystem.Collections.Generic.IEnumerable%7BSystem.String%7D%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_DataLayerProxy_Subscribe_System_String_System_Collections_Generic_IEnumerable_System_String__System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.DataLayerProxy.Subscribe(System.String%2CSystem.Collections.Generic.IEnumerable%7BSystem.String%7D%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-<<<<<<< HEAD
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/DataLayerProxy.cs/#L414">View Source</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/DataLayerProxy.cs/#L404">View Source</a>
->>>>>>> main
   </span>
   <a id="chia_dotnet_DataLayerProxy_Subscribe_" data-uid="chia.dotnet.DataLayerProxy.Subscribe*"></a>
   <h4 id="chia_dotnet_DataLayerProxy_Subscribe_System_String_System_Collections_Generic_IEnumerable_System_String__System_Threading_CancellationToken_" data-uid="chia.dotnet.DataLayerProxy.Subscribe(System.String,System.Collections.Generic.IEnumerable{System.String},System.Threading.CancellationToken)">Subscribe(String, IEnumerable&lt;String&gt;, CancellationToken)</h4>
@@ -2120,28 +1659,10 @@ <h5 class="returns">Returns</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_DataLayerProxy_Subscriptions_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.DataLayerProxy.Subscriptions(System.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_DataLayerProxy_Subscriptions_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.DataLayerProxy.Subscriptions(System.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_DataLayerProxy_Subscriptions_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.DataLayerProxy.Subscriptions(System.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-<<<<<<< HEAD
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/DataLayerProxy.cs/#L427">View Source</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/DataLayerProxy.cs/#L417">View Source</a>
->>>>>>> main
   </span>
   <a id="chia_dotnet_DataLayerProxy_Subscriptions_" data-uid="chia.dotnet.DataLayerProxy.Subscriptions*"></a>
   <h4 id="chia_dotnet_DataLayerProxy_Subscriptions_System_Threading_CancellationToken_" data-uid="chia.dotnet.DataLayerProxy.Subscriptions(System.Threading.CancellationToken)">Subscriptions(CancellationToken)</h4>
@@ -2188,28 +1709,10 @@ <h5 class="returns">Returns</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_DataLayerProxy_TakeOffer_System_Object_System_UInt64_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.DataLayerProxy.TakeOffer(System.Object%2CSystem.UInt64%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_DataLayerProxy_TakeOffer_System_Object_System_UInt64_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.DataLayerProxy.TakeOffer(System.Object%2CSystem.UInt64%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_DataLayerProxy_TakeOffer_System_Object_System_UInt64_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.DataLayerProxy.TakeOffer(System.Object%2CSystem.UInt64%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-<<<<<<< HEAD
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/DataLayerProxy.cs/#L439">View Source</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/DataLayerProxy.cs/#L429">View Source</a>
->>>>>>> main
   </span>
   <a id="chia_dotnet_DataLayerProxy_TakeOffer_" data-uid="chia.dotnet.DataLayerProxy.TakeOffer*"></a>
   <h4 id="chia_dotnet_DataLayerProxy_TakeOffer_System_Object_System_UInt64_System_Threading_CancellationToken_" data-uid="chia.dotnet.DataLayerProxy.TakeOffer(System.Object,System.UInt64,System.Threading.CancellationToken)">TakeOffer(Object, UInt64, CancellationToken)</h4>
@@ -2267,28 +1770,10 @@ <h5 class="returns">Returns</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_DataLayerProxy_Unsubscribe_System_String_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.DataLayerProxy.Unsubscribe(System.String%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_DataLayerProxy_Unsubscribe_System_String_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.DataLayerProxy.Unsubscribe(System.String%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_DataLayerProxy_Unsubscribe_System_String_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.DataLayerProxy.Unsubscribe(System.String%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-<<<<<<< HEAD
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/DataLayerProxy.cs/#L453">View Source</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/DataLayerProxy.cs/#L443">View Source</a>
->>>>>>> main
   </span>
   <a id="chia_dotnet_DataLayerProxy_Unsubscribe_" data-uid="chia.dotnet.DataLayerProxy.Unsubscribe*"></a>
   <h4 id="chia_dotnet_DataLayerProxy_Unsubscribe_System_String_System_Threading_CancellationToken_" data-uid="chia.dotnet.DataLayerProxy.Unsubscribe(System.String,System.Threading.CancellationToken)">Unsubscribe(String, CancellationToken)</h4>
@@ -2340,28 +1825,10 @@ <h5 class="returns">Returns</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_DataLayerProxy_VerifyOffer_chia_dotnet_DataLayerOffer_System_UInt64_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.DataLayerProxy.VerifyOffer(chia.dotnet.DataLayerOffer%2CSystem.UInt64%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_DataLayerProxy_VerifyOffer_chia_dotnet_DataLayerOffer_System_UInt64_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.DataLayerProxy.VerifyOffer(chia.dotnet.DataLayerOffer%2CSystem.UInt64%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_DataLayerProxy_VerifyOffer_chia_dotnet_DataLayerOffer_System_UInt64_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.DataLayerProxy.VerifyOffer(chia.dotnet.DataLayerOffer%2CSystem.UInt64%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-<<<<<<< HEAD
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/DataLayerProxy.cs/#L467">View Source</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/DataLayerProxy.cs/#L457">View Source</a>
->>>>>>> main
   </span>
   <a id="chia_dotnet_DataLayerProxy_VerifyOffer_" data-uid="chia.dotnet.DataLayerProxy.VerifyOffer*"></a>
   <h4 id="chia_dotnet_DataLayerProxy_VerifyOffer_chia_dotnet_DataLayerOffer_System_UInt64_System_Threading_CancellationToken_" data-uid="chia.dotnet.DataLayerProxy.VerifyOffer(chia.dotnet.DataLayerOffer,System.UInt64,System.Threading.CancellationToken)">VerifyOffer(DataLayerOffer, UInt64, CancellationToken)</h4>
@@ -2425,24 +1892,10 @@ <h5 class="returns">Returns</h5>
               <div class="contribution">
                 <ul class="nav">
                   <li>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-                    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_DataLayerProxy.md&amp;value=---%0Auid%3A%20chia.dotnet.DataLayerProxy%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-                    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_DataLayerProxy.md&amp;value=---%0Auid%3A%20chia.dotnet.DataLayerProxy%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-=======
                     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_DataLayerProxy.md&amp;value=---%0Auid%3A%20chia.dotnet.DataLayerProxy%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
                   </li>
                   <li>
-                    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/DataLayerProxy.cs/#L13" class="contribution-link">View Source</a>
+                    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/DataLayerProxy.cs/#L13" class="contribution-link">View Source</a>
                   </li>
                 </ul>
               </div>
diff --git a/docs/api/chia.dotnet.DataLayerSyncStatus.html b/docs/api/chia.dotnet.DataLayerSyncStatus.html
index efeecdd2..daeb7016 100644
--- a/docs/api/chia.dotnet.DataLayerSyncStatus.html
+++ b/docs/api/chia.dotnet.DataLayerSyncStatus.html
@@ -90,21 +90,7 @@ <h5>Inherited Members</h5>
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object)">Object.Equals(Object)</a>
     </div>
     <div>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object-system-object)">Object.Equals(Object, Object)</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-      <span class="xref">System.Object.Equals(System.Object, System.Object)</span>
-=======
-      <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object-system-object)">Object.Equals(Object, Object)</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
     </div>
     <div>
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.gethashcode#system-object-gethashcode">Object.GetHashCode()</a>
@@ -132,24 +118,10 @@ <h3 id="properties">Properties
   </h3>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_DataLayerSyncStatus_Generation.md&amp;value=---%0Auid%3A%20chia.dotnet.DataLayerSyncStatus.Generation%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_DataLayerSyncStatus_Generation.md&amp;value=---%0Auid%3A%20chia.dotnet.DataLayerSyncStatus.Generation%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_DataLayerSyncStatus_Generation.md&amp;value=---%0Auid%3A%20chia.dotnet.DataLayerSyncStatus.Generation%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/DataLayerSyncStatus.cs/#L6">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/DataLayerSyncStatus.cs/#L6">View Source</a>
   </span>
   <a id="chia_dotnet_DataLayerSyncStatus_Generation_" data-uid="chia.dotnet.DataLayerSyncStatus.Generation*"></a>
   <h4 id="chia_dotnet_DataLayerSyncStatus_Generation" data-uid="chia.dotnet.DataLayerSyncStatus.Generation">Generation</h4>
@@ -176,24 +148,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_DataLayerSyncStatus_RootHash.md&amp;value=---%0Auid%3A%20chia.dotnet.DataLayerSyncStatus.RootHash%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_DataLayerSyncStatus_RootHash.md&amp;value=---%0Auid%3A%20chia.dotnet.DataLayerSyncStatus.RootHash%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_DataLayerSyncStatus_RootHash.md&amp;value=---%0Auid%3A%20chia.dotnet.DataLayerSyncStatus.RootHash%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/DataLayerSyncStatus.cs/#L5">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/DataLayerSyncStatus.cs/#L5">View Source</a>
   </span>
   <a id="chia_dotnet_DataLayerSyncStatus_RootHash_" data-uid="chia.dotnet.DataLayerSyncStatus.RootHash*"></a>
   <h4 id="chia_dotnet_DataLayerSyncStatus_RootHash" data-uid="chia.dotnet.DataLayerSyncStatus.RootHash">RootHash</h4>
@@ -220,24 +178,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_DataLayerSyncStatus_TargetGeneration.md&amp;value=---%0Auid%3A%20chia.dotnet.DataLayerSyncStatus.TargetGeneration%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_DataLayerSyncStatus_TargetGeneration.md&amp;value=---%0Auid%3A%20chia.dotnet.DataLayerSyncStatus.TargetGeneration%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_DataLayerSyncStatus_TargetGeneration.md&amp;value=---%0Auid%3A%20chia.dotnet.DataLayerSyncStatus.TargetGeneration%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/DataLayerSyncStatus.cs/#L8">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/DataLayerSyncStatus.cs/#L8">View Source</a>
   </span>
   <a id="chia_dotnet_DataLayerSyncStatus_TargetGeneration_" data-uid="chia.dotnet.DataLayerSyncStatus.TargetGeneration*"></a>
   <h4 id="chia_dotnet_DataLayerSyncStatus_TargetGeneration" data-uid="chia.dotnet.DataLayerSyncStatus.TargetGeneration">TargetGeneration</h4>
@@ -264,24 +208,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_DataLayerSyncStatus_TargetRootHash.md&amp;value=---%0Auid%3A%20chia.dotnet.DataLayerSyncStatus.TargetRootHash%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_DataLayerSyncStatus_TargetRootHash.md&amp;value=---%0Auid%3A%20chia.dotnet.DataLayerSyncStatus.TargetRootHash%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_DataLayerSyncStatus_TargetRootHash.md&amp;value=---%0Auid%3A%20chia.dotnet.DataLayerSyncStatus.TargetRootHash%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/DataLayerSyncStatus.cs/#L7">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/DataLayerSyncStatus.cs/#L7">View Source</a>
   </span>
   <a id="chia_dotnet_DataLayerSyncStatus_TargetRootHash_" data-uid="chia.dotnet.DataLayerSyncStatus.TargetRootHash*"></a>
   <h4 id="chia_dotnet_DataLayerSyncStatus_TargetRootHash" data-uid="chia.dotnet.DataLayerSyncStatus.TargetRootHash">TargetRootHash</h4>
@@ -318,24 +248,10 @@ <h3 id="implements">Implements</h3>
               <div class="contribution">
                 <ul class="nav">
                   <li>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-                    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_DataLayerSyncStatus.md&amp;value=---%0Auid%3A%20chia.dotnet.DataLayerSyncStatus%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-                    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_DataLayerSyncStatus.md&amp;value=---%0Auid%3A%20chia.dotnet.DataLayerSyncStatus%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-=======
                     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_DataLayerSyncStatus.md&amp;value=---%0Auid%3A%20chia.dotnet.DataLayerSyncStatus%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
                   </li>
                   <li>
-                    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/DataLayerSyncStatus.cs/#L3" class="contribution-link">View Source</a>
+                    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/DataLayerSyncStatus.cs/#L3" class="contribution-link">View Source</a>
                   </li>
                 </ul>
               </div>
diff --git a/docs/api/chia.dotnet.DataLayerWallet.html b/docs/api/chia.dotnet.DataLayerWallet.html
index 6f06f76a..4475dff3 100644
--- a/docs/api/chia.dotnet.DataLayerWallet.html
+++ b/docs/api/chia.dotnet.DataLayerWallet.html
@@ -158,24 +158,10 @@ <h3 id="constructors">Constructors
   </h3>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_DataLayerWallet__ctor_System_UInt32_chia_dotnet_WalletProxy_.md&amp;value=---%0Auid%3A%20chia.dotnet.DataLayerWallet.%23ctor(System.UInt32%2Cchia.dotnet.WalletProxy)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_DataLayerWallet__ctor_System_UInt32_chia_dotnet_WalletProxy_.md&amp;value=---%0Auid%3A%20chia.dotnet.DataLayerWallet.%23ctor(System.UInt32%2Cchia.dotnet.WalletProxy)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_DataLayerWallet__ctor_System_UInt32_chia_dotnet_WalletProxy_.md&amp;value=---%0Auid%3A%20chia.dotnet.DataLayerWallet.%23ctor(System.UInt32%2Cchia.dotnet.WalletProxy)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/DataLayerWallet.cs/#L19">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/DataLayerWallet.cs/#L19">View Source</a>
   </span>
   <a id="chia_dotnet_DataLayerWallet__ctor_" data-uid="chia.dotnet.DataLayerWallet.#ctor*"></a>
   <h4 id="chia_dotnet_DataLayerWallet__ctor_System_UInt32_chia_dotnet_WalletProxy_" data-uid="chia.dotnet.DataLayerWallet.#ctor(System.UInt32,chia.dotnet.WalletProxy)">DataLayerWallet(UInt32, WalletProxy)</h4>
@@ -214,24 +200,10 @@ <h3 id="methods">Methods
   </h3>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_DataLayerWallet_DeleteMirror_System_String_System_UInt64_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.DataLayerWallet.DeleteMirror(System.String%2CSystem.UInt64%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_DataLayerWallet_DeleteMirror_System_String_System_UInt64_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.DataLayerWallet.DeleteMirror(System.String%2CSystem.UInt64%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_DataLayerWallet_DeleteMirror_System_String_System_UInt64_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.DataLayerWallet.DeleteMirror(System.String%2CSystem.UInt64%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/DataLayerWallet.cs/#L40">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/DataLayerWallet.cs/#L40">View Source</a>
   </span>
   <a id="chia_dotnet_DataLayerWallet_DeleteMirror_" data-uid="chia.dotnet.DataLayerWallet.DeleteMirror*"></a>
   <h4 id="chia_dotnet_DataLayerWallet_DeleteMirror_System_String_System_UInt64_System_Threading_CancellationToken_" data-uid="chia.dotnet.DataLayerWallet.DeleteMirror(System.String,System.UInt64,System.Threading.CancellationToken)">DeleteMirror(String, UInt64, CancellationToken)</h4>
@@ -289,24 +261,10 @@ <h5 class="returns">Returns</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_DataLayerWallet_GetMirrors_System_String_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.DataLayerWallet.GetMirrors(System.String%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_DataLayerWallet_GetMirrors_System_String_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.DataLayerWallet.GetMirrors(System.String%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_DataLayerWallet_GetMirrors_System_String_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.DataLayerWallet.GetMirrors(System.String%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/DataLayerWallet.cs/#L54">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/DataLayerWallet.cs/#L54">View Source</a>
   </span>
   <a id="chia_dotnet_DataLayerWallet_GetMirrors_" data-uid="chia.dotnet.DataLayerWallet.GetMirrors*"></a>
   <h4 id="chia_dotnet_DataLayerWallet_GetMirrors_System_String_System_Threading_CancellationToken_" data-uid="chia.dotnet.DataLayerWallet.GetMirrors(System.String,System.Threading.CancellationToken)">GetMirrors(String, CancellationToken)</h4>
@@ -358,24 +316,10 @@ <h5 class="returns">Returns</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_DataLayerWallet_History_System_String_System_Nullable_System_UInt32__System_Nullable_System_UInt32__System_Nullable_System_UInt32__System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.DataLayerWallet.History(System.String%2CSystem.Nullable%7BSystem.UInt32%7D%2CSystem.Nullable%7BSystem.UInt32%7D%2CSystem.Nullable%7BSystem.UInt32%7D%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_DataLayerWallet_History_System_String_System_Nullable_System_UInt32__System_Nullable_System_UInt32__System_Nullable_System_UInt32__System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.DataLayerWallet.History(System.String%2CSystem.Nullable%7BSystem.UInt32%7D%2CSystem.Nullable%7BSystem.UInt32%7D%2CSystem.Nullable%7BSystem.UInt32%7D%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_DataLayerWallet_History_System_String_System_Nullable_System_UInt32__System_Nullable_System_UInt32__System_Nullable_System_UInt32__System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.DataLayerWallet.History(System.String%2CSystem.Nullable%7BSystem.UInt32%7D%2CSystem.Nullable%7BSystem.UInt32%7D%2CSystem.Nullable%7BSystem.UInt32%7D%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/DataLayerWallet.cs/#L70">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/DataLayerWallet.cs/#L70">View Source</a>
   </span>
   <a id="chia_dotnet_DataLayerWallet_History_" data-uid="chia.dotnet.DataLayerWallet.History*"></a>
   <h4 id="chia_dotnet_DataLayerWallet_History_System_String_System_Nullable_System_UInt32__System_Nullable_System_UInt32__System_Nullable_System_UInt32__System_Threading_CancellationToken_" data-uid="chia.dotnet.DataLayerWallet.History(System.String,System.Nullable{System.UInt32},System.Nullable{System.UInt32},System.Nullable{System.UInt32},System.Threading.CancellationToken)">History(String, Nullable&lt;UInt32&gt;, Nullable&lt;UInt32&gt;, Nullable&lt;UInt32&gt;, CancellationToken)</h4>
@@ -442,30 +386,10 @@ <h5 class="returns">Returns</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_DataLayerWallet_LatestSingleton_System_String_System_String_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.DataLayerWallet.LatestSingleton(System.String%2CSystem.String%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/DataLayerWallet.cs/#L88">View Source</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_DataLayerWallet_LatestSingleton_System_String_System_String_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.DataLayerWallet.LatestSingleton(System.String%2CSystem.String%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/DataLayerWallet.cs/#L88">View Source</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_DataLayerWallet_LatestSingleton_System_String_System_String_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.DataLayerWallet.LatestSingleton(System.String%2CSystem.String%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
   </span>
   <span class="small pull-right mobile-hide">
     <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/DataLayerWallet.cs/#L88">View Source</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <a id="chia_dotnet_DataLayerWallet_LatestSingleton_" data-uid="chia.dotnet.DataLayerWallet.LatestSingleton*"></a>
   <h4 id="chia_dotnet_DataLayerWallet_LatestSingleton_System_String_System_String_System_Threading_CancellationToken_" data-uid="chia.dotnet.DataLayerWallet.LatestSingleton(System.String,System.String,System.Threading.CancellationToken)">LatestSingleton(String, String, CancellationToken)</h4>
@@ -522,30 +446,10 @@ <h5 class="returns">Returns</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_DataLayerWallet_NewMirror_System_String_System_UInt64_System_Collections_Generic_IEnumerable_System_String__System_UInt64_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.DataLayerWallet.NewMirror(System.String%2CSystem.UInt64%2CSystem.Collections.Generic.IEnumerable%7BSystem.String%7D%2CSystem.UInt64%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
   </span>
   <span class="small pull-right mobile-hide">
     <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/DataLayerWallet.cs/#L105">View Source</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_DataLayerWallet_NewMirror_System_String_System_UInt64_System_Collections_Generic_IEnumerable_System_String__System_UInt64_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.DataLayerWallet.NewMirror(System.String%2CSystem.UInt64%2CSystem.Collections.Generic.IEnumerable%7BSystem.String%7D%2CSystem.UInt64%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/DataLayerWallet.cs/#L105">View Source</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_DataLayerWallet_NewMirror_System_String_System_UInt64_System_Collections_Generic_IEnumerable_System_String__System_UInt64_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.DataLayerWallet.NewMirror(System.String%2CSystem.UInt64%2CSystem.Collections.Generic.IEnumerable%7BSystem.String%7D%2CSystem.UInt64%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/DataLayerWallet.cs/#L105">View Source</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <a id="chia_dotnet_DataLayerWallet_NewMirror_" data-uid="chia.dotnet.DataLayerWallet.NewMirror*"></a>
   <h4 id="chia_dotnet_DataLayerWallet_NewMirror_System_String_System_UInt64_System_Collections_Generic_IEnumerable_System_String__System_UInt64_System_Threading_CancellationToken_" data-uid="chia.dotnet.DataLayerWallet.NewMirror(System.String,System.UInt64,System.Collections.Generic.IEnumerable{System.String},System.UInt64,System.Threading.CancellationToken)">NewMirror(String, UInt64, IEnumerable&lt;String&gt;, UInt64, CancellationToken)</h4>
@@ -613,30 +517,10 @@ <h5 class="returns">Returns</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_DataLayerWallet_OwnedSingletons_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.DataLayerWallet.OwnedSingletons(System.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
   </span>
   <span class="small pull-right mobile-hide">
     <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/DataLayerWallet.cs/#L120">View Source</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_DataLayerWallet_OwnedSingletons_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.DataLayerWallet.OwnedSingletons(System.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/DataLayerWallet.cs/#L120">View Source</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_DataLayerWallet_OwnedSingletons_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.DataLayerWallet.OwnedSingletons(System.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/DataLayerWallet.cs/#L120">View Source</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <a id="chia_dotnet_DataLayerWallet_OwnedSingletons_" data-uid="chia.dotnet.DataLayerWallet.OwnedSingletons*"></a>
   <h4 id="chia_dotnet_DataLayerWallet_OwnedSingletons_System_Threading_CancellationToken_" data-uid="chia.dotnet.DataLayerWallet.OwnedSingletons(System.Threading.CancellationToken)">OwnedSingletons(CancellationToken)</h4>
@@ -683,30 +567,10 @@ <h5 class="returns">Returns</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_DataLayerWallet_SingletonsByRoot_System_String_System_String_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.DataLayerWallet.SingletonsByRoot(System.String%2CSystem.String%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/DataLayerWallet.cs/#L132">View Source</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_DataLayerWallet_SingletonsByRoot_System_String_System_String_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.DataLayerWallet.SingletonsByRoot(System.String%2CSystem.String%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/DataLayerWallet.cs/#L132">View Source</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_DataLayerWallet_SingletonsByRoot_System_String_System_String_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.DataLayerWallet.SingletonsByRoot(System.String%2CSystem.String%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
   </span>
   <span class="small pull-right mobile-hide">
     <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/DataLayerWallet.cs/#L132">View Source</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <a id="chia_dotnet_DataLayerWallet_SingletonsByRoot_" data-uid="chia.dotnet.DataLayerWallet.SingletonsByRoot*"></a>
   <h4 id="chia_dotnet_DataLayerWallet_SingletonsByRoot_System_String_System_String_System_Threading_CancellationToken_" data-uid="chia.dotnet.DataLayerWallet.SingletonsByRoot(System.String,System.String,System.Threading.CancellationToken)">SingletonsByRoot(String, String, CancellationToken)</h4>
@@ -763,30 +627,10 @@ <h5 class="returns">Returns</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_DataLayerWallet_StopTracking_System_String_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.DataLayerWallet.StopTracking(System.String%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/DataLayerWallet.cs/#L146">View Source</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_DataLayerWallet_StopTracking_System_String_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.DataLayerWallet.StopTracking(System.String%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/DataLayerWallet.cs/#L146">View Source</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_DataLayerWallet_StopTracking_System_String_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.DataLayerWallet.StopTracking(System.String%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
   </span>
   <span class="small pull-right mobile-hide">
     <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/DataLayerWallet.cs/#L146">View Source</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <a id="chia_dotnet_DataLayerWallet_StopTracking_" data-uid="chia.dotnet.DataLayerWallet.StopTracking*"></a>
   <h4 id="chia_dotnet_DataLayerWallet_StopTracking_System_String_System_Threading_CancellationToken_" data-uid="chia.dotnet.DataLayerWallet.StopTracking(System.String,System.Threading.CancellationToken)">StopTracking(String, CancellationToken)</h4>
@@ -838,30 +682,10 @@ <h5 class="returns">Returns</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_DataLayerWallet_TrackNew_System_String_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.DataLayerWallet.TrackNew(System.String%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
   </span>
   <span class="small pull-right mobile-hide">
     <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/DataLayerWallet.cs/#L159">View Source</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_DataLayerWallet_TrackNew_System_String_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.DataLayerWallet.TrackNew(System.String%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/DataLayerWallet.cs/#L159">View Source</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_DataLayerWallet_TrackNew_System_String_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.DataLayerWallet.TrackNew(System.String%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/DataLayerWallet.cs/#L159">View Source</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <a id="chia_dotnet_DataLayerWallet_TrackNew_" data-uid="chia.dotnet.DataLayerWallet.TrackNew*"></a>
   <h4 id="chia_dotnet_DataLayerWallet_TrackNew_System_String_System_Threading_CancellationToken_" data-uid="chia.dotnet.DataLayerWallet.TrackNew(System.String,System.Threading.CancellationToken)">TrackNew(String, CancellationToken)</h4>
@@ -913,30 +737,10 @@ <h5 class="returns">Returns</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_DataLayerWallet_UpdateMultiple_System_Collections_Generic_IEnumerable_chia_dotnet_SingletonInfo__System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.DataLayerWallet.UpdateMultiple(System.Collections.Generic.IEnumerable%7Bchia.dotnet.SingletonInfo%7D%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
   </span>
   <span class="small pull-right mobile-hide">
     <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/DataLayerWallet.cs/#L172">View Source</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_DataLayerWallet_UpdateMultiple_System_Collections_Generic_IEnumerable_chia_dotnet_SingletonInfo__System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.DataLayerWallet.UpdateMultiple(System.Collections.Generic.IEnumerable%7Bchia.dotnet.SingletonInfo%7D%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/DataLayerWallet.cs/#L172">View Source</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_DataLayerWallet_UpdateMultiple_System_Collections_Generic_IEnumerable_chia_dotnet_SingletonInfo__System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.DataLayerWallet.UpdateMultiple(System.Collections.Generic.IEnumerable%7Bchia.dotnet.SingletonInfo%7D%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/DataLayerWallet.cs/#L172">View Source</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <a id="chia_dotnet_DataLayerWallet_UpdateMultiple_" data-uid="chia.dotnet.DataLayerWallet.UpdateMultiple*"></a>
   <h4 id="chia_dotnet_DataLayerWallet_UpdateMultiple_System_Collections_Generic_IEnumerable_chia_dotnet_SingletonInfo__System_Threading_CancellationToken_" data-uid="chia.dotnet.DataLayerWallet.UpdateMultiple(System.Collections.Generic.IEnumerable{chia.dotnet.SingletonInfo},System.Threading.CancellationToken)">UpdateMultiple(IEnumerable&lt;SingletonInfo&gt;, CancellationToken)</h4>
@@ -988,30 +792,10 @@ <h5 class="returns">Returns</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_DataLayerWallet_UpdateRoot_System_String_System_String_System_UInt64_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.DataLayerWallet.UpdateRoot(System.String%2CSystem.String%2CSystem.UInt64%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
   </span>
   <span class="small pull-right mobile-hide">
     <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/DataLayerWallet.cs/#L187">View Source</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_DataLayerWallet_UpdateRoot_System_String_System_String_System_UInt64_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.DataLayerWallet.UpdateRoot(System.String%2CSystem.String%2CSystem.UInt64%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/DataLayerWallet.cs/#L187">View Source</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_DataLayerWallet_UpdateRoot_System_String_System_String_System_UInt64_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.DataLayerWallet.UpdateRoot(System.String%2CSystem.String%2CSystem.UInt64%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/DataLayerWallet.cs/#L187">View Source</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <a id="chia_dotnet_DataLayerWallet_UpdateRoot_" data-uid="chia.dotnet.DataLayerWallet.UpdateRoot*"></a>
   <h4 id="chia_dotnet_DataLayerWallet_UpdateRoot_System_String_System_String_System_UInt64_System_Threading_CancellationToken_" data-uid="chia.dotnet.DataLayerWallet.UpdateRoot(System.String,System.String,System.UInt64,System.Threading.CancellationToken)">UpdateRoot(String, String, UInt64, CancellationToken)</h4>
@@ -1074,24 +858,10 @@ <h5 class="returns">Returns</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_DataLayerWallet_Validate_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.DataLayerWallet.Validate(System.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_DataLayerWallet_Validate_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.DataLayerWallet.Validate(System.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_DataLayerWallet_Validate_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.DataLayerWallet.Validate(System.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/DataLayerWallet.cs/#L28">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/DataLayerWallet.cs/#L28">View Source</a>
   </span>
   <a id="chia_dotnet_DataLayerWallet_Validate_" data-uid="chia.dotnet.DataLayerWallet.Validate*"></a>
   <h4 id="chia_dotnet_DataLayerWallet_Validate_System_Threading_CancellationToken_" data-uid="chia.dotnet.DataLayerWallet.Validate(System.Threading.CancellationToken)">Validate(CancellationToken)</h4>
@@ -1145,24 +915,10 @@ <h5 class="overrides">Overrides</h5>
               <div class="contribution">
                 <ul class="nav">
                   <li>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-                    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_DataLayerWallet.md&amp;value=---%0Auid%3A%20chia.dotnet.DataLayerWallet%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-                    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_DataLayerWallet.md&amp;value=---%0Auid%3A%20chia.dotnet.DataLayerWallet%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-=======
                     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_DataLayerWallet.md&amp;value=---%0Auid%3A%20chia.dotnet.DataLayerWallet%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
                   </li>
                   <li>
-                    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/DataLayerWallet.cs/#L12" class="contribution-link">View Source</a>
+                    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/DataLayerWallet.cs/#L12" class="contribution-link">View Source</a>
                   </li>
                 </ul>
               </div>
diff --git a/docs/api/chia.dotnet.DidInfo.html b/docs/api/chia.dotnet.DidInfo.html
index d8166772..9bcf5a94 100644
--- a/docs/api/chia.dotnet.DidInfo.html
+++ b/docs/api/chia.dotnet.DidInfo.html
@@ -90,21 +90,7 @@ <h5>Inherited Members</h5>
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object)">Object.Equals(Object)</a>
     </div>
     <div>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object-system-object)">Object.Equals(Object, Object)</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-      <span class="xref">System.Object.Equals(System.Object, System.Object)</span>
-=======
-      <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object-system-object)">Object.Equals(Object, Object)</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
     </div>
     <div>
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.gethashcode#system-object-gethashcode">Object.GetHashCode()</a>
@@ -132,24 +118,10 @@ <h3 id="properties">Properties
   </h3>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_DidInfo_DidId.md&amp;value=---%0Auid%3A%20chia.dotnet.DidInfo.DidId%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_DidInfo_DidId.md&amp;value=---%0Auid%3A%20chia.dotnet.DidInfo.DidId%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_DidInfo_DidId.md&amp;value=---%0Auid%3A%20chia.dotnet.DidInfo.DidId%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/DidInfo.cs/#L7">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/DidInfo.cs/#L7">View Source</a>
   </span>
   <a id="chia_dotnet_DidInfo_DidId_" data-uid="chia.dotnet.DidInfo.DidId*"></a>
   <h4 id="chia_dotnet_DidInfo_DidId" data-uid="chia.dotnet.DidInfo.DidId">DidId</h4>
@@ -176,24 +148,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_DidInfo_FullPuzzle.md&amp;value=---%0Auid%3A%20chia.dotnet.DidInfo.FullPuzzle%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_DidInfo_FullPuzzle.md&amp;value=---%0Auid%3A%20chia.dotnet.DidInfo.FullPuzzle%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_DidInfo_FullPuzzle.md&amp;value=---%0Auid%3A%20chia.dotnet.DidInfo.FullPuzzle%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/DidInfo.cs/#L15">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/DidInfo.cs/#L15">View Source</a>
   </span>
   <a id="chia_dotnet_DidInfo_FullPuzzle_" data-uid="chia.dotnet.DidInfo.FullPuzzle*"></a>
   <h4 id="chia_dotnet_DidInfo_FullPuzzle" data-uid="chia.dotnet.DidInfo.FullPuzzle">FullPuzzle</h4>
@@ -220,24 +178,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_DidInfo_Hints.md&amp;value=---%0Auid%3A%20chia.dotnet.DidInfo.Hints%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_DidInfo_Hints.md&amp;value=---%0Auid%3A%20chia.dotnet.DidInfo.Hints%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_DidInfo_Hints.md&amp;value=---%0Auid%3A%20chia.dotnet.DidInfo.Hints%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/DidInfo.cs/#L17">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/DidInfo.cs/#L17">View Source</a>
   </span>
   <a id="chia_dotnet_DidInfo_Hints_" data-uid="chia.dotnet.DidInfo.Hints*"></a>
   <h4 id="chia_dotnet_DidInfo_Hints" data-uid="chia.dotnet.DidInfo.Hints">Hints</h4>
@@ -264,24 +208,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_DidInfo_LastestCoin.md&amp;value=---%0Auid%3A%20chia.dotnet.DidInfo.LastestCoin%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_DidInfo_LastestCoin.md&amp;value=---%0Auid%3A%20chia.dotnet.DidInfo.LastestCoin%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_DidInfo_LastestCoin.md&amp;value=---%0Auid%3A%20chia.dotnet.DidInfo.LastestCoin%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/DidInfo.cs/#L8">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/DidInfo.cs/#L8">View Source</a>
   </span>
   <a id="chia_dotnet_DidInfo_LastestCoin_" data-uid="chia.dotnet.DidInfo.LastestCoin*"></a>
   <h4 id="chia_dotnet_DidInfo_LastestCoin" data-uid="chia.dotnet.DidInfo.LastestCoin">LastestCoin</h4>
@@ -308,24 +238,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_DidInfo_LauncherId.md&amp;value=---%0Auid%3A%20chia.dotnet.DidInfo.LauncherId%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_DidInfo_LauncherId.md&amp;value=---%0Auid%3A%20chia.dotnet.DidInfo.LauncherId%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_DidInfo_LauncherId.md&amp;value=---%0Auid%3A%20chia.dotnet.DidInfo.LauncherId%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/DidInfo.cs/#L14">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/DidInfo.cs/#L14">View Source</a>
   </span>
   <a id="chia_dotnet_DidInfo_LauncherId_" data-uid="chia.dotnet.DidInfo.LauncherId*"></a>
   <h4 id="chia_dotnet_DidInfo_LauncherId" data-uid="chia.dotnet.DidInfo.LauncherId">LauncherId</h4>
@@ -352,24 +268,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_DidInfo_Metadata.md&amp;value=---%0Auid%3A%20chia.dotnet.DidInfo.Metadata%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_DidInfo_Metadata.md&amp;value=---%0Auid%3A%20chia.dotnet.DidInfo.Metadata%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_DidInfo_Metadata.md&amp;value=---%0Auid%3A%20chia.dotnet.DidInfo.Metadata%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/DidInfo.cs/#L13">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/DidInfo.cs/#L13">View Source</a>
   </span>
   <a id="chia_dotnet_DidInfo_Metadata_" data-uid="chia.dotnet.DidInfo.Metadata*"></a>
   <h4 id="chia_dotnet_DidInfo_Metadata" data-uid="chia.dotnet.DidInfo.Metadata">Metadata</h4>
@@ -396,24 +298,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_DidInfo_NumVerifications.md&amp;value=---%0Auid%3A%20chia.dotnet.DidInfo.NumVerifications%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_DidInfo_NumVerifications.md&amp;value=---%0Auid%3A%20chia.dotnet.DidInfo.NumVerifications%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_DidInfo_NumVerifications.md&amp;value=---%0Auid%3A%20chia.dotnet.DidInfo.NumVerifications%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/DidInfo.cs/#L12">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/DidInfo.cs/#L12">View Source</a>
   </span>
   <a id="chia_dotnet_DidInfo_NumVerifications_" data-uid="chia.dotnet.DidInfo.NumVerifications*"></a>
   <h4 id="chia_dotnet_DidInfo_NumVerifications" data-uid="chia.dotnet.DidInfo.NumVerifications">NumVerifications</h4>
@@ -440,24 +328,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_DidInfo_P2Address.md&amp;value=---%0Auid%3A%20chia.dotnet.DidInfo.P2Address%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_DidInfo_P2Address.md&amp;value=---%0Auid%3A%20chia.dotnet.DidInfo.P2Address%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_DidInfo_P2Address.md&amp;value=---%0Auid%3A%20chia.dotnet.DidInfo.P2Address%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/DidInfo.cs/#L9">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/DidInfo.cs/#L9">View Source</a>
   </span>
   <a id="chia_dotnet_DidInfo_P2Address_" data-uid="chia.dotnet.DidInfo.P2Address*"></a>
   <h4 id="chia_dotnet_DidInfo_P2Address" data-uid="chia.dotnet.DidInfo.P2Address">P2Address</h4>
@@ -484,24 +358,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_DidInfo_PublicKey.md&amp;value=---%0Auid%3A%20chia.dotnet.DidInfo.PublicKey%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_DidInfo_PublicKey.md&amp;value=---%0Auid%3A%20chia.dotnet.DidInfo.PublicKey%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_DidInfo_PublicKey.md&amp;value=---%0Auid%3A%20chia.dotnet.DidInfo.PublicKey%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/DidInfo.cs/#L10">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/DidInfo.cs/#L10">View Source</a>
   </span>
   <a id="chia_dotnet_DidInfo_PublicKey_" data-uid="chia.dotnet.DidInfo.PublicKey*"></a>
   <h4 id="chia_dotnet_DidInfo_PublicKey" data-uid="chia.dotnet.DidInfo.PublicKey">PublicKey</h4>
@@ -528,24 +388,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_DidInfo_RecoveryListHash.md&amp;value=---%0Auid%3A%20chia.dotnet.DidInfo.RecoveryListHash%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_DidInfo_RecoveryListHash.md&amp;value=---%0Auid%3A%20chia.dotnet.DidInfo.RecoveryListHash%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_DidInfo_RecoveryListHash.md&amp;value=---%0Auid%3A%20chia.dotnet.DidInfo.RecoveryListHash%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/DidInfo.cs/#L11">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/DidInfo.cs/#L11">View Source</a>
   </span>
   <a id="chia_dotnet_DidInfo_RecoveryListHash_" data-uid="chia.dotnet.DidInfo.RecoveryListHash*"></a>
   <h4 id="chia_dotnet_DidInfo_RecoveryListHash" data-uid="chia.dotnet.DidInfo.RecoveryListHash">RecoveryListHash</h4>
@@ -572,24 +418,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_DidInfo_Solution.md&amp;value=---%0Auid%3A%20chia.dotnet.DidInfo.Solution%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_DidInfo_Solution.md&amp;value=---%0Auid%3A%20chia.dotnet.DidInfo.Solution%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_DidInfo_Solution.md&amp;value=---%0Auid%3A%20chia.dotnet.DidInfo.Solution%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/DidInfo.cs/#L16">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/DidInfo.cs/#L16">View Source</a>
   </span>
   <a id="chia_dotnet_DidInfo_Solution_" data-uid="chia.dotnet.DidInfo.Solution*"></a>
   <h4 id="chia_dotnet_DidInfo_Solution" data-uid="chia.dotnet.DidInfo.Solution">Solution</h4>
@@ -626,24 +458,10 @@ <h3 id="implements">Implements</h3>
               <div class="contribution">
                 <ul class="nav">
                   <li>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-                    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_DidInfo.md&amp;value=---%0Auid%3A%20chia.dotnet.DidInfo%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-                    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_DidInfo.md&amp;value=---%0Auid%3A%20chia.dotnet.DidInfo%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-=======
                     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_DidInfo.md&amp;value=---%0Auid%3A%20chia.dotnet.DidInfo%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
                   </li>
                   <li>
-                    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/DidInfo.cs/#L5" class="contribution-link">View Source</a>
+                    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/DidInfo.cs/#L5" class="contribution-link">View Source</a>
                   </li>
                 </ul>
               </div>
diff --git a/docs/api/chia.dotnet.EndOfSubSlotBundle.html b/docs/api/chia.dotnet.EndOfSubSlotBundle.html
index b92db91f..f26c85ef 100644
--- a/docs/api/chia.dotnet.EndOfSubSlotBundle.html
+++ b/docs/api/chia.dotnet.EndOfSubSlotBundle.html
@@ -90,21 +90,7 @@ <h5>Inherited Members</h5>
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object)">Object.Equals(Object)</a>
     </div>
     <div>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object-system-object)">Object.Equals(Object, Object)</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-      <span class="xref">System.Object.Equals(System.Object, System.Object)</span>
-=======
-      <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object-system-object)">Object.Equals(Object, Object)</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
     </div>
     <div>
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.gethashcode#system-object-gethashcode">Object.GetHashCode()</a>
@@ -132,24 +118,10 @@ <h3 id="properties">Properties
   </h3>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_EndOfSubSlotBundle_ChallengeChain.md&amp;value=---%0Auid%3A%20chia.dotnet.EndOfSubSlotBundle.ChallengeChain%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_EndOfSubSlotBundle_ChallengeChain.md&amp;value=---%0Auid%3A%20chia.dotnet.EndOfSubSlotBundle.ChallengeChain%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_EndOfSubSlotBundle_ChallengeChain.md&amp;value=---%0Auid%3A%20chia.dotnet.EndOfSubSlotBundle.ChallengeChain%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/EndOfSubSlotBundle.cs/#L5">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/EndOfSubSlotBundle.cs/#L5">View Source</a>
   </span>
   <a id="chia_dotnet_EndOfSubSlotBundle_ChallengeChain_" data-uid="chia.dotnet.EndOfSubSlotBundle.ChallengeChain*"></a>
   <h4 id="chia_dotnet_EndOfSubSlotBundle_ChallengeChain" data-uid="chia.dotnet.EndOfSubSlotBundle.ChallengeChain">ChallengeChain</h4>
@@ -176,24 +148,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_EndOfSubSlotBundle_InfusedChallengeChain.md&amp;value=---%0Auid%3A%20chia.dotnet.EndOfSubSlotBundle.InfusedChallengeChain%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_EndOfSubSlotBundle_InfusedChallengeChain.md&amp;value=---%0Auid%3A%20chia.dotnet.EndOfSubSlotBundle.InfusedChallengeChain%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_EndOfSubSlotBundle_InfusedChallengeChain.md&amp;value=---%0Auid%3A%20chia.dotnet.EndOfSubSlotBundle.InfusedChallengeChain%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/EndOfSubSlotBundle.cs/#L6">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/EndOfSubSlotBundle.cs/#L6">View Source</a>
   </span>
   <a id="chia_dotnet_EndOfSubSlotBundle_InfusedChallengeChain_" data-uid="chia.dotnet.EndOfSubSlotBundle.InfusedChallengeChain*"></a>
   <h4 id="chia_dotnet_EndOfSubSlotBundle_InfusedChallengeChain" data-uid="chia.dotnet.EndOfSubSlotBundle.InfusedChallengeChain">InfusedChallengeChain</h4>
@@ -220,24 +178,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_EndOfSubSlotBundle_Proofs.md&amp;value=---%0Auid%3A%20chia.dotnet.EndOfSubSlotBundle.Proofs%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_EndOfSubSlotBundle_Proofs.md&amp;value=---%0Auid%3A%20chia.dotnet.EndOfSubSlotBundle.Proofs%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_EndOfSubSlotBundle_Proofs.md&amp;value=---%0Auid%3A%20chia.dotnet.EndOfSubSlotBundle.Proofs%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/EndOfSubSlotBundle.cs/#L8">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/EndOfSubSlotBundle.cs/#L8">View Source</a>
   </span>
   <a id="chia_dotnet_EndOfSubSlotBundle_Proofs_" data-uid="chia.dotnet.EndOfSubSlotBundle.Proofs*"></a>
   <h4 id="chia_dotnet_EndOfSubSlotBundle_Proofs" data-uid="chia.dotnet.EndOfSubSlotBundle.Proofs">Proofs</h4>
@@ -264,24 +208,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_EndOfSubSlotBundle_RewardChain.md&amp;value=---%0Auid%3A%20chia.dotnet.EndOfSubSlotBundle.RewardChain%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_EndOfSubSlotBundle_RewardChain.md&amp;value=---%0Auid%3A%20chia.dotnet.EndOfSubSlotBundle.RewardChain%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_EndOfSubSlotBundle_RewardChain.md&amp;value=---%0Auid%3A%20chia.dotnet.EndOfSubSlotBundle.RewardChain%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/EndOfSubSlotBundle.cs/#L7">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/EndOfSubSlotBundle.cs/#L7">View Source</a>
   </span>
   <a id="chia_dotnet_EndOfSubSlotBundle_RewardChain_" data-uid="chia.dotnet.EndOfSubSlotBundle.RewardChain*"></a>
   <h4 id="chia_dotnet_EndOfSubSlotBundle_RewardChain" data-uid="chia.dotnet.EndOfSubSlotBundle.RewardChain">RewardChain</h4>
@@ -318,24 +248,10 @@ <h3 id="implements">Implements</h3>
               <div class="contribution">
                 <ul class="nav">
                   <li>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-                    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_EndOfSubSlotBundle.md&amp;value=---%0Auid%3A%20chia.dotnet.EndOfSubSlotBundle%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-                    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_EndOfSubSlotBundle.md&amp;value=---%0Auid%3A%20chia.dotnet.EndOfSubSlotBundle%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-=======
                     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_EndOfSubSlotBundle.md&amp;value=---%0Auid%3A%20chia.dotnet.EndOfSubSlotBundle%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
                   </li>
                   <li>
-                    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/EndOfSubSlotBundle.cs/#L3" class="contribution-link">View Source</a>
+                    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/EndOfSubSlotBundle.cs/#L3" class="contribution-link">View Source</a>
                   </li>
                 </ul>
               </div>
diff --git a/docs/api/chia.dotnet.EndpointInfo.html b/docs/api/chia.dotnet.EndpointInfo.html
index 8fe2ccdd..4adbaee2 100644
--- a/docs/api/chia.dotnet.EndpointInfo.html
+++ b/docs/api/chia.dotnet.EndpointInfo.html
@@ -91,21 +91,7 @@ <h5>Inherited Members</h5>
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object)">Object.Equals(Object)</a>
     </div>
     <div>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object-system-object)">Object.Equals(Object, Object)</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-      <span class="xref">System.Object.Equals(System.Object, System.Object)</span>
-=======
-      <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object-system-object)">Object.Equals(Object, Object)</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
     </div>
     <div>
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.gethashcode#system-object-gethashcode">Object.GetHashCode()</a>
@@ -133,24 +119,10 @@ <h3 id="properties">Properties
   </h3>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_EndpointInfo_CertPath.md&amp;value=---%0Auid%3A%20chia.dotnet.EndpointInfo.CertPath%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_EndpointInfo_CertPath.md&amp;value=---%0Auid%3A%20chia.dotnet.EndpointInfo.CertPath%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_EndpointInfo_CertPath.md&amp;value=---%0Auid%3A%20chia.dotnet.EndpointInfo.CertPath%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/EndpointInfo.cs/#L18">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/EndpointInfo.cs/#L18">View Source</a>
   </span>
   <a id="chia_dotnet_EndpointInfo_CertPath_" data-uid="chia.dotnet.EndpointInfo.CertPath*"></a>
   <h4 id="chia_dotnet_EndpointInfo_CertPath" data-uid="chia.dotnet.EndpointInfo.CertPath">CertPath</h4>
@@ -178,24 +150,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_EndpointInfo_KeyPath.md&amp;value=---%0Auid%3A%20chia.dotnet.EndpointInfo.KeyPath%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_EndpointInfo_KeyPath.md&amp;value=---%0Auid%3A%20chia.dotnet.EndpointInfo.KeyPath%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_EndpointInfo_KeyPath.md&amp;value=---%0Auid%3A%20chia.dotnet.EndpointInfo.KeyPath%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/EndpointInfo.cs/#L23">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/EndpointInfo.cs/#L23">View Source</a>
   </span>
   <a id="chia_dotnet_EndpointInfo_KeyPath_" data-uid="chia.dotnet.EndpointInfo.KeyPath*"></a>
   <h4 id="chia_dotnet_EndpointInfo_KeyPath" data-uid="chia.dotnet.EndpointInfo.KeyPath">KeyPath</h4>
@@ -223,24 +181,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_EndpointInfo_Uri.md&amp;value=---%0Auid%3A%20chia.dotnet.EndpointInfo.Uri%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_EndpointInfo_Uri.md&amp;value=---%0Auid%3A%20chia.dotnet.EndpointInfo.Uri%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_EndpointInfo_Uri.md&amp;value=---%0Auid%3A%20chia.dotnet.EndpointInfo.Uri%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/EndpointInfo.cs/#L13">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/EndpointInfo.cs/#L13">View Source</a>
   </span>
   <a id="chia_dotnet_EndpointInfo_Uri_" data-uid="chia.dotnet.EndpointInfo.Uri*"></a>
   <h4 id="chia_dotnet_EndpointInfo_Uri" data-uid="chia.dotnet.EndpointInfo.Uri">Uri</h4>
@@ -278,24 +222,10 @@ <h3 id="implements">Implements</h3>
               <div class="contribution">
                 <ul class="nav">
                   <li>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-                    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_EndpointInfo.md&amp;value=---%0Auid%3A%20chia.dotnet.EndpointInfo%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-                    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_EndpointInfo.md&amp;value=---%0Auid%3A%20chia.dotnet.EndpointInfo%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-=======
                     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_EndpointInfo.md&amp;value=---%0Auid%3A%20chia.dotnet.EndpointInfo%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
                   </li>
                   <li>
-                    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/EndpointInfo.cs/#L8" class="contribution-link">View Source</a>
+                    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/EndpointInfo.cs/#L8" class="contribution-link">View Source</a>
                   </li>
                 </ul>
               </div>
diff --git a/docs/api/chia.dotnet.ErrorResponse.html b/docs/api/chia.dotnet.ErrorResponse.html
index 1f6302d1..b6f3ab20 100644
--- a/docs/api/chia.dotnet.ErrorResponse.html
+++ b/docs/api/chia.dotnet.ErrorResponse.html
@@ -91,21 +91,7 @@ <h5>Inherited Members</h5>
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object)">Object.Equals(Object)</a>
     </div>
     <div>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object-system-object)">Object.Equals(Object, Object)</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-      <span class="xref">System.Object.Equals(System.Object, System.Object)</span>
-=======
-      <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object-system-object)">Object.Equals(Object, Object)</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
     </div>
     <div>
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.gethashcode#system-object-gethashcode">Object.GetHashCode()</a>
@@ -133,24 +119,10 @@ <h3 id="properties">Properties
   </h3>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_ErrorResponse_ErrorCode.md&amp;value=---%0Auid%3A%20chia.dotnet.ErrorResponse.ErrorCode%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_ErrorResponse_ErrorCode.md&amp;value=---%0Auid%3A%20chia.dotnet.ErrorResponse.ErrorCode%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_ErrorResponse_ErrorCode.md&amp;value=---%0Auid%3A%20chia.dotnet.ErrorResponse.ErrorCode%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/ErrorResponse.cs/#L8">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/ErrorResponse.cs/#L8">View Source</a>
   </span>
   <a id="chia_dotnet_ErrorResponse_ErrorCode_" data-uid="chia.dotnet.ErrorResponse.ErrorCode*"></a>
   <h4 id="chia_dotnet_ErrorResponse_ErrorCode" data-uid="chia.dotnet.ErrorResponse.ErrorCode">ErrorCode</h4>
@@ -177,24 +149,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_ErrorResponse_ErrorMessage.md&amp;value=---%0Auid%3A%20chia.dotnet.ErrorResponse.ErrorMessage%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_ErrorResponse_ErrorMessage.md&amp;value=---%0Auid%3A%20chia.dotnet.ErrorResponse.ErrorMessage%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_ErrorResponse_ErrorMessage.md&amp;value=---%0Auid%3A%20chia.dotnet.ErrorResponse.ErrorMessage%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/ErrorResponse.cs/#L9">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/ErrorResponse.cs/#L9">View Source</a>
   </span>
   <a id="chia_dotnet_ErrorResponse_ErrorMessage_" data-uid="chia.dotnet.ErrorResponse.ErrorMessage*"></a>
   <h4 id="chia_dotnet_ErrorResponse_ErrorMessage" data-uid="chia.dotnet.ErrorResponse.ErrorMessage">ErrorMessage</h4>
@@ -231,24 +189,10 @@ <h3 id="implements">Implements</h3>
               <div class="contribution">
                 <ul class="nav">
                   <li>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-                    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_ErrorResponse.md&amp;value=---%0Auid%3A%20chia.dotnet.ErrorResponse%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-                    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_ErrorResponse.md&amp;value=---%0Auid%3A%20chia.dotnet.ErrorResponse%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-=======
                     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_ErrorResponse.md&amp;value=---%0Auid%3A%20chia.dotnet.ErrorResponse%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
                   </li>
                   <li>
-                    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/ErrorResponse.cs/#L6" class="contribution-link">View Source</a>
+                    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/ErrorResponse.cs/#L6" class="contribution-link">View Source</a>
                   </li>
                 </ul>
               </div>
diff --git a/docs/api/chia.dotnet.Extensions.html b/docs/api/chia.dotnet.Extensions.html
index 7717dab3..e1c27c8c 100644
--- a/docs/api/chia.dotnet.Extensions.html
+++ b/docs/api/chia.dotnet.Extensions.html
@@ -87,21 +87,7 @@ <h5>Inherited Members</h5>
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object)">Object.Equals(Object)</a>
     </div>
     <div>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object-system-object)">Object.Equals(Object, Object)</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-      <span class="xref">System.Object.Equals(System.Object, System.Object)</span>
-=======
-      <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object-system-object)">Object.Equals(Object, Object)</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
     </div>
     <div>
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.gethashcode#system-object-gethashcode">Object.GetHashCode()</a>
@@ -129,24 +115,10 @@ <h3 id="fields">Fields
   </h3>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_Extensions_OneTrillion.md&amp;value=---%0Auid%3A%20chia.dotnet.Extensions.OneTrillion%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_Extensions_OneTrillion.md&amp;value=---%0Auid%3A%20chia.dotnet.Extensions.OneTrillion%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_Extensions_OneTrillion.md&amp;value=---%0Auid%3A%20chia.dotnet.Extensions.OneTrillion%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/Extensions.cs/#L14">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/Extensions.cs/#L14">View Source</a>
   </span>
   <h4 id="chia_dotnet_Extensions_OneTrillion" data-uid="chia.dotnet.Extensions.OneTrillion">OneTrillion</h4>
   <div class="markdown level1 summary"><p>There are 1 tillion mojo in a chia</p>
@@ -175,24 +147,10 @@ <h3 id="methods">Methods
   </h3>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_Extensions_AsChia_System_UInt64_.md&amp;value=---%0Auid%3A%20chia.dotnet.Extensions.AsChia(System.UInt64)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_Extensions_AsChia_System_UInt64_.md&amp;value=---%0Auid%3A%20chia.dotnet.Extensions.AsChia(System.UInt64)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_Extensions_AsChia_System_UInt64_.md&amp;value=---%0Auid%3A%20chia.dotnet.Extensions.AsChia(System.UInt64)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/Extensions.cs/#L41">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/Extensions.cs/#L41">View Source</a>
   </span>
   <a id="chia_dotnet_Extensions_AsChia_" data-uid="chia.dotnet.Extensions.AsChia*"></a>
   <h4 id="chia_dotnet_Extensions_AsChia_System_UInt64_" data-uid="chia.dotnet.Extensions.AsChia(System.UInt64)">AsChia(UInt64)</h4>
@@ -239,24 +197,10 @@ <h5 class="returns">Returns</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_Extensions_AsChia_System_UInt64_System_IFormatProvider_.md&amp;value=---%0Auid%3A%20chia.dotnet.Extensions.AsChia(System.UInt64%2CSystem.IFormatProvider)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_Extensions_AsChia_System_UInt64_System_IFormatProvider_.md&amp;value=---%0Auid%3A%20chia.dotnet.Extensions.AsChia(System.UInt64%2CSystem.IFormatProvider)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_Extensions_AsChia_System_UInt64_System_IFormatProvider_.md&amp;value=---%0Auid%3A%20chia.dotnet.Extensions.AsChia(System.UInt64%2CSystem.IFormatProvider)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/Extensions.cs/#L52">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/Extensions.cs/#L52">View Source</a>
   </span>
   <a id="chia_dotnet_Extensions_AsChia_" data-uid="chia.dotnet.Extensions.AsChia*"></a>
   <h4 id="chia_dotnet_Extensions_AsChia_System_UInt64_System_IFormatProvider_" data-uid="chia.dotnet.Extensions.AsChia(System.UInt64,System.IFormatProvider)">AsChia(UInt64, IFormatProvider)</h4>
@@ -309,24 +253,10 @@ <h5 class="returns">Returns</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_Extensions_AsChia_System_UInt64_System_String_.md&amp;value=---%0Auid%3A%20chia.dotnet.Extensions.AsChia(System.UInt64%2CSystem.String)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_Extensions_AsChia_System_UInt64_System_String_.md&amp;value=---%0Auid%3A%20chia.dotnet.Extensions.AsChia(System.UInt64%2CSystem.String)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_Extensions_AsChia_System_UInt64_System_String_.md&amp;value=---%0Auid%3A%20chia.dotnet.Extensions.AsChia(System.UInt64%2CSystem.String)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/Extensions.cs/#L63">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/Extensions.cs/#L63">View Source</a>
   </span>
   <a id="chia_dotnet_Extensions_AsChia_" data-uid="chia.dotnet.Extensions.AsChia*"></a>
   <h4 id="chia_dotnet_Extensions_AsChia_System_UInt64_System_String_" data-uid="chia.dotnet.Extensions.AsChia(System.UInt64,System.String)">AsChia(UInt64, String)</h4>
@@ -379,24 +309,10 @@ <h5 class="returns">Returns</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_Extensions_AsChia_System_UInt64_System_String_System_IFormatProvider_.md&amp;value=---%0Auid%3A%20chia.dotnet.Extensions.AsChia(System.UInt64%2CSystem.String%2CSystem.IFormatProvider)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_Extensions_AsChia_System_UInt64_System_String_System_IFormatProvider_.md&amp;value=---%0Auid%3A%20chia.dotnet.Extensions.AsChia(System.UInt64%2CSystem.String%2CSystem.IFormatProvider)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_Extensions_AsChia_System_UInt64_System_String_System_IFormatProvider_.md&amp;value=---%0Auid%3A%20chia.dotnet.Extensions.AsChia(System.UInt64%2CSystem.String%2CSystem.IFormatProvider)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/Extensions.cs/#L75">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/Extensions.cs/#L75">View Source</a>
   </span>
   <a id="chia_dotnet_Extensions_AsChia_" data-uid="chia.dotnet.Extensions.AsChia*"></a>
   <h4 id="chia_dotnet_Extensions_AsChia_System_UInt64_System_String_System_IFormatProvider_" data-uid="chia.dotnet.Extensions.AsChia(System.UInt64,System.String,System.IFormatProvider)">AsChia(UInt64, String, IFormatProvider)</h4>
@@ -455,24 +371,10 @@ <h5 class="returns">Returns</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_Extensions_ToBytesString_System_Double_System_String_.md&amp;value=---%0Auid%3A%20chia.dotnet.Extensions.ToBytesString(System.Double%2CSystem.String)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_Extensions_ToBytesString_System_Double_System_String_.md&amp;value=---%0Auid%3A%20chia.dotnet.Extensions.ToBytesString(System.Double%2CSystem.String)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_Extensions_ToBytesString_System_Double_System_String_.md&amp;value=---%0Auid%3A%20chia.dotnet.Extensions.ToBytesString(System.Double%2CSystem.String)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/Extensions.cs/#L161">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/Extensions.cs/#L161">View Source</a>
   </span>
   <a id="chia_dotnet_Extensions_ToBytesString_" data-uid="chia.dotnet.Extensions.ToBytesString*"></a>
   <h4 id="chia_dotnet_Extensions_ToBytesString_System_Double_System_String_" data-uid="chia.dotnet.Extensions.ToBytesString(System.Double,System.String)">ToBytesString(Double, String)</h4>
@@ -524,24 +426,10 @@ <h5 class="returns">Returns</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_Extensions_ToBytesString_System_Int32_System_String_.md&amp;value=---%0Auid%3A%20chia.dotnet.Extensions.ToBytesString(System.Int32%2CSystem.String)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_Extensions_ToBytesString_System_Int32_System_String_.md&amp;value=---%0Auid%3A%20chia.dotnet.Extensions.ToBytesString(System.Int32%2CSystem.String)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_Extensions_ToBytesString_System_Int32_System_String_.md&amp;value=---%0Auid%3A%20chia.dotnet.Extensions.ToBytesString(System.Int32%2CSystem.String)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/Extensions.cs/#L141">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/Extensions.cs/#L141">View Source</a>
   </span>
   <a id="chia_dotnet_Extensions_ToBytesString_" data-uid="chia.dotnet.Extensions.ToBytesString*"></a>
   <h4 id="chia_dotnet_Extensions_ToBytesString_System_Int32_System_String_" data-uid="chia.dotnet.Extensions.ToBytesString(System.Int32,System.String)">ToBytesString(Int32, String)</h4>
@@ -593,24 +481,10 @@ <h5 class="returns">Returns</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_Extensions_ToBytesString_System_Int64_System_String_.md&amp;value=---%0Auid%3A%20chia.dotnet.Extensions.ToBytesString(System.Int64%2CSystem.String)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_Extensions_ToBytesString_System_Int64_System_String_.md&amp;value=---%0Auid%3A%20chia.dotnet.Extensions.ToBytesString(System.Int64%2CSystem.String)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_Extensions_ToBytesString_System_Int64_System_String_.md&amp;value=---%0Auid%3A%20chia.dotnet.Extensions.ToBytesString(System.Int64%2CSystem.String)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/Extensions.cs/#L151">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/Extensions.cs/#L151">View Source</a>
   </span>
   <a id="chia_dotnet_Extensions_ToBytesString_" data-uid="chia.dotnet.Extensions.ToBytesString*"></a>
   <h4 id="chia_dotnet_Extensions_ToBytesString_System_Int64_System_String_" data-uid="chia.dotnet.Extensions.ToBytesString(System.Int64,System.String)">ToBytesString(Int64, String)</h4>
@@ -662,24 +536,10 @@ <h5 class="returns">Returns</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_Extensions_ToBytesString_System_Numerics_BigInteger_System_String_.md&amp;value=---%0Auid%3A%20chia.dotnet.Extensions.ToBytesString(System.Numerics.BigInteger%2CSystem.String)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_Extensions_ToBytesString_System_Numerics_BigInteger_System_String_.md&amp;value=---%0Auid%3A%20chia.dotnet.Extensions.ToBytesString(System.Numerics.BigInteger%2CSystem.String)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_Extensions_ToBytesString_System_Numerics_BigInteger_System_String_.md&amp;value=---%0Auid%3A%20chia.dotnet.Extensions.ToBytesString(System.Numerics.BigInteger%2CSystem.String)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/Extensions.cs/#L86">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/Extensions.cs/#L86">View Source</a>
   </span>
   <a id="chia_dotnet_Extensions_ToBytesString_" data-uid="chia.dotnet.Extensions.ToBytesString*"></a>
   <h4 id="chia_dotnet_Extensions_ToBytesString_System_Numerics_BigInteger_System_String_" data-uid="chia.dotnet.Extensions.ToBytesString(System.Numerics.BigInteger,System.String)">ToBytesString(BigInteger, String)</h4>
@@ -734,24 +594,10 @@ <h5 id="chia_dotnet_Extensions_ToBytesString_System_Numerics_BigInteger_System_S
 </div>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_Extensions_ToBytesString_System_UInt32_System_String_.md&amp;value=---%0Auid%3A%20chia.dotnet.Extensions.ToBytesString(System.UInt32%2CSystem.String)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_Extensions_ToBytesString_System_UInt32_System_String_.md&amp;value=---%0Auid%3A%20chia.dotnet.Extensions.ToBytesString(System.UInt32%2CSystem.String)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_Extensions_ToBytesString_System_UInt32_System_String_.md&amp;value=---%0Auid%3A%20chia.dotnet.Extensions.ToBytesString(System.UInt32%2CSystem.String)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/Extensions.cs/#L131">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/Extensions.cs/#L131">View Source</a>
   </span>
   <a id="chia_dotnet_Extensions_ToBytesString_" data-uid="chia.dotnet.Extensions.ToBytesString*"></a>
   <h4 id="chia_dotnet_Extensions_ToBytesString_System_UInt32_System_String_" data-uid="chia.dotnet.Extensions.ToBytesString(System.UInt32,System.String)">ToBytesString(UInt32, String)</h4>
@@ -803,24 +649,10 @@ <h5 class="returns">Returns</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_Extensions_ToBytesString_System_UInt64_System_String_.md&amp;value=---%0Auid%3A%20chia.dotnet.Extensions.ToBytesString(System.UInt64%2CSystem.String)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_Extensions_ToBytesString_System_UInt64_System_String_.md&amp;value=---%0Auid%3A%20chia.dotnet.Extensions.ToBytesString(System.UInt64%2CSystem.String)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_Extensions_ToBytesString_System_UInt64_System_String_.md&amp;value=---%0Auid%3A%20chia.dotnet.Extensions.ToBytesString(System.UInt64%2CSystem.String)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/Extensions.cs/#L112">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/Extensions.cs/#L112">View Source</a>
   </span>
   <a id="chia_dotnet_Extensions_ToBytesString_" data-uid="chia.dotnet.Extensions.ToBytesString*"></a>
   <h4 id="chia_dotnet_Extensions_ToBytesString_System_UInt64_System_String_" data-uid="chia.dotnet.Extensions.ToBytesString(System.UInt64,System.String)">ToBytesString(UInt64, String)</h4>
@@ -875,24 +707,10 @@ <h5 id="chia_dotnet_Extensions_ToBytesString_System_UInt64_System_String__remark
 </div>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_Extensions_ToChia_System_UInt64_.md&amp;value=---%0Auid%3A%20chia.dotnet.Extensions.ToChia(System.UInt64)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_Extensions_ToChia_System_UInt64_.md&amp;value=---%0Auid%3A%20chia.dotnet.Extensions.ToChia(System.UInt64)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_Extensions_ToChia_System_UInt64_.md&amp;value=---%0Auid%3A%20chia.dotnet.Extensions.ToChia(System.UInt64)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/Extensions.cs/#L21">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/Extensions.cs/#L21">View Source</a>
   </span>
   <a id="chia_dotnet_Extensions_ToChia_" data-uid="chia.dotnet.Extensions.ToChia*"></a>
   <h4 id="chia_dotnet_Extensions_ToChia_System_UInt64_" data-uid="chia.dotnet.Extensions.ToChia(System.UInt64)">ToChia(UInt64)</h4>
@@ -939,24 +757,10 @@ <h5 class="returns">Returns</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_Extensions_ToMojo_System_Decimal_.md&amp;value=---%0Auid%3A%20chia.dotnet.Extensions.ToMojo(System.Decimal)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_Extensions_ToMojo_System_Decimal_.md&amp;value=---%0Auid%3A%20chia.dotnet.Extensions.ToMojo(System.Decimal)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_Extensions_ToMojo_System_Decimal_.md&amp;value=---%0Auid%3A%20chia.dotnet.Extensions.ToMojo(System.Decimal)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/Extensions.cs/#L31">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/Extensions.cs/#L31">View Source</a>
   </span>
   <a id="chia_dotnet_Extensions_ToMojo_" data-uid="chia.dotnet.Extensions.ToMojo*"></a>
   <h4 id="chia_dotnet_Extensions_ToMojo_System_Decimal_" data-uid="chia.dotnet.Extensions.ToMojo(System.Decimal)">ToMojo(Decimal)</h4>
@@ -1009,24 +813,10 @@ <h5 class="returns">Returns</h5>
               <div class="contribution">
                 <ul class="nav">
                   <li>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-                    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_Extensions.md&amp;value=---%0Auid%3A%20chia.dotnet.Extensions%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-                    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_Extensions.md&amp;value=---%0Auid%3A%20chia.dotnet.Extensions%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-=======
                     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_Extensions.md&amp;value=---%0Auid%3A%20chia.dotnet.Extensions%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
                   </li>
                   <li>
-                    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/Extensions.cs/#L9" class="contribution-link">View Source</a>
+                    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/Extensions.cs/#L9" class="contribution-link">View Source</a>
                   </li>
                 </ul>
               </div>
diff --git a/docs/api/chia.dotnet.FarmerProxy.html b/docs/api/chia.dotnet.FarmerProxy.html
index 08a70dca..75fc9a78 100644
--- a/docs/api/chia.dotnet.FarmerProxy.html
+++ b/docs/api/chia.dotnet.FarmerProxy.html
@@ -143,24 +143,10 @@ <h3 id="constructors">Constructors
   </h3>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_FarmerProxy__ctor_chia_dotnet_IRpcClient_System_String_.md&amp;value=---%0Auid%3A%20chia.dotnet.FarmerProxy.%23ctor(chia.dotnet.IRpcClient%2CSystem.String)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_FarmerProxy__ctor_chia_dotnet_IRpcClient_System_String_.md&amp;value=---%0Auid%3A%20chia.dotnet.FarmerProxy.%23ctor(chia.dotnet.IRpcClient%2CSystem.String)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_FarmerProxy__ctor_chia_dotnet_IRpcClient_System_String_.md&amp;value=---%0Auid%3A%20chia.dotnet.FarmerProxy.%23ctor(chia.dotnet.IRpcClient%2CSystem.String)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/FarmerProxy.cs/#L20">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/FarmerProxy.cs/#L20">View Source</a>
   </span>
   <a id="chia_dotnet_FarmerProxy__ctor_" data-uid="chia.dotnet.FarmerProxy.#ctor*"></a>
   <h4 id="chia_dotnet_FarmerProxy__ctor_chia_dotnet_IRpcClient_System_String_" data-uid="chia.dotnet.FarmerProxy.#ctor(chia.dotnet.IRpcClient,System.String)">FarmerProxy(IRpcClient, String)</h4>
@@ -199,24 +185,10 @@ <h3 id="methods">Methods
   </h3>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_FarmerProxy_GetHarvesterPlotsDuplicates_chia_dotnet_PlotPathRequestData_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.FarmerProxy.GetHarvesterPlotsDuplicates(chia.dotnet.PlotPathRequestData%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_FarmerProxy_GetHarvesterPlotsDuplicates_chia_dotnet_PlotPathRequestData_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.FarmerProxy.GetHarvesterPlotsDuplicates(chia.dotnet.PlotPathRequestData%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_FarmerProxy_GetHarvesterPlotsDuplicates_chia_dotnet_PlotPathRequestData_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.FarmerProxy.GetHarvesterPlotsDuplicates(chia.dotnet.PlotPathRequestData%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/FarmerProxy.cs/#L221">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/FarmerProxy.cs/#L221">View Source</a>
   </span>
   <a id="chia_dotnet_FarmerProxy_GetHarvesterPlotsDuplicates_" data-uid="chia.dotnet.FarmerProxy.GetHarvesterPlotsDuplicates*"></a>
   <h4 id="chia_dotnet_FarmerProxy_GetHarvesterPlotsDuplicates_chia_dotnet_PlotPathRequestData_System_Threading_CancellationToken_" data-uid="chia.dotnet.FarmerProxy.GetHarvesterPlotsDuplicates(chia.dotnet.PlotPathRequestData,System.Threading.CancellationToken)">GetHarvesterPlotsDuplicates(PlotPathRequestData, CancellationToken)</h4>
@@ -269,24 +241,10 @@ <h5 class="returns">Returns</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_FarmerProxy_GetHarvesterPlotsInvalid_chia_dotnet_PlotPathRequestData_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.FarmerProxy.GetHarvesterPlotsInvalid(chia.dotnet.PlotPathRequestData%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_FarmerProxy_GetHarvesterPlotsInvalid_chia_dotnet_PlotPathRequestData_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.FarmerProxy.GetHarvesterPlotsInvalid(chia.dotnet.PlotPathRequestData%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_FarmerProxy_GetHarvesterPlotsInvalid_chia_dotnet_PlotPathRequestData_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.FarmerProxy.GetHarvesterPlotsInvalid(chia.dotnet.PlotPathRequestData%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/FarmerProxy.cs/#L199">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/FarmerProxy.cs/#L199">View Source</a>
   </span>
   <a id="chia_dotnet_FarmerProxy_GetHarvesterPlotsInvalid_" data-uid="chia.dotnet.FarmerProxy.GetHarvesterPlotsInvalid*"></a>
   <h4 id="chia_dotnet_FarmerProxy_GetHarvesterPlotsInvalid_chia_dotnet_PlotPathRequestData_System_Threading_CancellationToken_" data-uid="chia.dotnet.FarmerProxy.GetHarvesterPlotsInvalid(chia.dotnet.PlotPathRequestData,System.Threading.CancellationToken)">GetHarvesterPlotsInvalid(PlotPathRequestData, CancellationToken)</h4>
@@ -339,24 +297,10 @@ <h5 class="returns">Returns</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_FarmerProxy_GetHarvesterPlotsKeysMissing_chia_dotnet_PlotPathRequestData_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.FarmerProxy.GetHarvesterPlotsKeysMissing(chia.dotnet.PlotPathRequestData%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_FarmerProxy_GetHarvesterPlotsKeysMissing_chia_dotnet_PlotPathRequestData_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.FarmerProxy.GetHarvesterPlotsKeysMissing(chia.dotnet.PlotPathRequestData%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_FarmerProxy_GetHarvesterPlotsKeysMissing_chia_dotnet_PlotPathRequestData_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.FarmerProxy.GetHarvesterPlotsKeysMissing(chia.dotnet.PlotPathRequestData%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/FarmerProxy.cs/#L210">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/FarmerProxy.cs/#L210">View Source</a>
   </span>
   <a id="chia_dotnet_FarmerProxy_GetHarvesterPlotsKeysMissing_" data-uid="chia.dotnet.FarmerProxy.GetHarvesterPlotsKeysMissing*"></a>
   <h4 id="chia_dotnet_FarmerProxy_GetHarvesterPlotsKeysMissing_chia_dotnet_PlotPathRequestData_System_Threading_CancellationToken_" data-uid="chia.dotnet.FarmerProxy.GetHarvesterPlotsKeysMissing(chia.dotnet.PlotPathRequestData,System.Threading.CancellationToken)">GetHarvesterPlotsKeysMissing(PlotPathRequestData, CancellationToken)</h4>
@@ -409,24 +353,10 @@ <h5 class="returns">Returns</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_FarmerProxy_GetHarvesterPlotsValid_chia_dotnet_PlotInfoRequestData_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.FarmerProxy.GetHarvesterPlotsValid(chia.dotnet.PlotInfoRequestData%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_FarmerProxy_GetHarvesterPlotsValid_chia_dotnet_PlotInfoRequestData_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.FarmerProxy.GetHarvesterPlotsValid(chia.dotnet.PlotInfoRequestData%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_FarmerProxy_GetHarvesterPlotsValid_chia_dotnet_PlotInfoRequestData_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.FarmerProxy.GetHarvesterPlotsValid(chia.dotnet.PlotInfoRequestData%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/FarmerProxy.cs/#L188">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/FarmerProxy.cs/#L188">View Source</a>
   </span>
   <a id="chia_dotnet_FarmerProxy_GetHarvesterPlotsValid_" data-uid="chia.dotnet.FarmerProxy.GetHarvesterPlotsValid*"></a>
   <h4 id="chia_dotnet_FarmerProxy_GetHarvesterPlotsValid_chia_dotnet_PlotInfoRequestData_System_Threading_CancellationToken_" data-uid="chia.dotnet.FarmerProxy.GetHarvesterPlotsValid(chia.dotnet.PlotInfoRequestData,System.Threading.CancellationToken)">GetHarvesterPlotsValid(PlotInfoRequestData, CancellationToken)</h4>
@@ -479,24 +409,10 @@ <h5 class="returns">Returns</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_FarmerProxy_GetHarvesters_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.FarmerProxy.GetHarvesters(System.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_FarmerProxy_GetHarvesters_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.FarmerProxy.GetHarvesters(System.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_FarmerProxy_GetHarvesters_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.FarmerProxy.GetHarvesters(System.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/FarmerProxy.cs/#L167">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/FarmerProxy.cs/#L167">View Source</a>
   </span>
   <a id="chia_dotnet_FarmerProxy_GetHarvesters_" data-uid="chia.dotnet.FarmerProxy.GetHarvesters*"></a>
   <h4 id="chia_dotnet_FarmerProxy_GetHarvesters_System_Threading_CancellationToken_" data-uid="chia.dotnet.FarmerProxy.GetHarvesters(System.Threading.CancellationToken)">GetHarvesters(CancellationToken)</h4>
@@ -543,24 +459,10 @@ <h5 class="returns">Returns</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_FarmerProxy_GetHarvestersSummary_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.FarmerProxy.GetHarvestersSummary(System.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_FarmerProxy_GetHarvestersSummary_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.FarmerProxy.GetHarvestersSummary(System.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_FarmerProxy_GetHarvestersSummary_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.FarmerProxy.GetHarvestersSummary(System.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/FarmerProxy.cs/#L177">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/FarmerProxy.cs/#L177">View Source</a>
   </span>
   <a id="chia_dotnet_FarmerProxy_GetHarvestersSummary_" data-uid="chia.dotnet.FarmerProxy.GetHarvestersSummary*"></a>
   <h4 id="chia_dotnet_FarmerProxy_GetHarvestersSummary_System_Threading_CancellationToken_" data-uid="chia.dotnet.FarmerProxy.GetHarvestersSummary(System.Threading.CancellationToken)">GetHarvestersSummary(CancellationToken)</h4>
@@ -607,24 +509,10 @@ <h5 class="returns">Returns</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_FarmerProxy_GetPoolLoginLink_System_String_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.FarmerProxy.GetPoolLoginLink(System.String%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_FarmerProxy_GetPoolLoginLink_System_String_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.FarmerProxy.GetPoolLoginLink(System.String%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_FarmerProxy_GetPoolLoginLink_System_String_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.FarmerProxy.GetPoolLoginLink(System.String%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/FarmerProxy.cs/#L232">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/FarmerProxy.cs/#L232">View Source</a>
   </span>
   <a id="chia_dotnet_FarmerProxy_GetPoolLoginLink_" data-uid="chia.dotnet.FarmerProxy.GetPoolLoginLink*"></a>
   <h4 id="chia_dotnet_FarmerProxy_GetPoolLoginLink_System_String_System_Threading_CancellationToken_" data-uid="chia.dotnet.FarmerProxy.GetPoolLoginLink(System.String,System.Threading.CancellationToken)">GetPoolLoginLink(String, CancellationToken)</h4>
@@ -677,24 +565,10 @@ <h5 class="returns">Returns</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_FarmerProxy_GetPoolState_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.FarmerProxy.GetPoolState(System.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_FarmerProxy_GetPoolState_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.FarmerProxy.GetPoolState(System.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_FarmerProxy_GetPoolState_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.FarmerProxy.GetPoolState(System.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/FarmerProxy.cs/#L252">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/FarmerProxy.cs/#L252">View Source</a>
   </span>
   <a id="chia_dotnet_FarmerProxy_GetPoolState_" data-uid="chia.dotnet.FarmerProxy.GetPoolState*"></a>
   <h4 id="chia_dotnet_FarmerProxy_GetPoolState_System_Threading_CancellationToken_" data-uid="chia.dotnet.FarmerProxy.GetPoolState(System.Threading.CancellationToken)">GetPoolState(CancellationToken)</h4>
@@ -741,24 +615,10 @@ <h5 class="returns">Returns</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_FarmerProxy_GetRewardTargets_System_Int32_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.FarmerProxy.GetRewardTargets(System.Int32%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_FarmerProxy_GetRewardTargets_System_Int32_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.FarmerProxy.GetRewardTargets(System.Int32%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_FarmerProxy_GetRewardTargets_System_Int32_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.FarmerProxy.GetRewardTargets(System.Int32%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/FarmerProxy.cs/#L41">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/FarmerProxy.cs/#L41">View Source</a>
   </span>
   <a id="chia_dotnet_FarmerProxy_GetRewardTargets_" data-uid="chia.dotnet.FarmerProxy.GetRewardTargets*"></a>
   <h4 id="chia_dotnet_FarmerProxy_GetRewardTargets_System_Int32_System_Threading_CancellationToken_" data-uid="chia.dotnet.FarmerProxy.GetRewardTargets(System.Int32,System.Threading.CancellationToken)">GetRewardTargets(Int32, CancellationToken)</h4>
@@ -811,24 +671,10 @@ <h5 class="returns">Returns</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_FarmerProxy_GetRewardTargets_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.FarmerProxy.GetRewardTargets(System.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_FarmerProxy_GetRewardTargets_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.FarmerProxy.GetRewardTargets(System.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_FarmerProxy_GetRewardTargets_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.FarmerProxy.GetRewardTargets(System.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/FarmerProxy.cs/#L30">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/FarmerProxy.cs/#L30">View Source</a>
   </span>
   <a id="chia_dotnet_FarmerProxy_GetRewardTargets_" data-uid="chia.dotnet.FarmerProxy.GetRewardTargets*"></a>
   <h4 id="chia_dotnet_FarmerProxy_GetRewardTargets_System_Threading_CancellationToken_" data-uid="chia.dotnet.FarmerProxy.GetRewardTargets(System.Threading.CancellationToken)">GetRewardTargets(CancellationToken)</h4>
@@ -875,24 +721,10 @@ <h5 class="returns">Returns</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_FarmerProxy_GetRewardTargetsIncludingPrivateKey_System_Int32_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.FarmerProxy.GetRewardTargetsIncludingPrivateKey(System.Int32%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_FarmerProxy_GetRewardTargetsIncludingPrivateKey_System_Int32_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.FarmerProxy.GetRewardTargetsIncludingPrivateKey(System.Int32%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_FarmerProxy_GetRewardTargetsIncludingPrivateKey_System_Int32_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.FarmerProxy.GetRewardTargetsIncludingPrivateKey(System.Int32%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/FarmerProxy.cs/#L68">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/FarmerProxy.cs/#L68">View Source</a>
   </span>
   <a id="chia_dotnet_FarmerProxy_GetRewardTargetsIncludingPrivateKey_" data-uid="chia.dotnet.FarmerProxy.GetRewardTargetsIncludingPrivateKey*"></a>
   <h4 id="chia_dotnet_FarmerProxy_GetRewardTargetsIncludingPrivateKey_System_Int32_System_Threading_CancellationToken_" data-uid="chia.dotnet.FarmerProxy.GetRewardTargetsIncludingPrivateKey(System.Int32,System.Threading.CancellationToken)">GetRewardTargetsIncludingPrivateKey(Int32, CancellationToken)</h4>
@@ -945,24 +777,10 @@ <h5 class="returns">Returns</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_FarmerProxy_GetRewardTargetsIncludingPrivateKey_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.FarmerProxy.GetRewardTargetsIncludingPrivateKey(System.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_FarmerProxy_GetRewardTargetsIncludingPrivateKey_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.FarmerProxy.GetRewardTargetsIncludingPrivateKey(System.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_FarmerProxy_GetRewardTargetsIncludingPrivateKey_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.FarmerProxy.GetRewardTargetsIncludingPrivateKey(System.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/FarmerProxy.cs/#L57">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/FarmerProxy.cs/#L57">View Source</a>
   </span>
   <a id="chia_dotnet_FarmerProxy_GetRewardTargetsIncludingPrivateKey_" data-uid="chia.dotnet.FarmerProxy.GetRewardTargetsIncludingPrivateKey*"></a>
   <h4 id="chia_dotnet_FarmerProxy_GetRewardTargetsIncludingPrivateKey_System_Threading_CancellationToken_" data-uid="chia.dotnet.FarmerProxy.GetRewardTargetsIncludingPrivateKey(System.Threading.CancellationToken)">GetRewardTargetsIncludingPrivateKey(CancellationToken)</h4>
@@ -1009,24 +827,10 @@ <h5 class="returns">Returns</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_FarmerProxy_GetSignagePoint_System_String_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.FarmerProxy.GetSignagePoint(System.String%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_FarmerProxy_GetSignagePoint_System_String_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.FarmerProxy.GetSignagePoint(System.String%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_FarmerProxy_GetSignagePoint_System_String_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.FarmerProxy.GetSignagePoint(System.String%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/FarmerProxy.cs/#L147">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/FarmerProxy.cs/#L147">View Source</a>
   </span>
   <a id="chia_dotnet_FarmerProxy_GetSignagePoint_" data-uid="chia.dotnet.FarmerProxy.GetSignagePoint*"></a>
   <h4 id="chia_dotnet_FarmerProxy_GetSignagePoint_System_String_System_Threading_CancellationToken_" data-uid="chia.dotnet.FarmerProxy.GetSignagePoint(System.String,System.Threading.CancellationToken)">GetSignagePoint(String, CancellationToken)</h4>
@@ -1079,24 +883,10 @@ <h5 class="returns">Returns</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_FarmerProxy_GetSignagePoints_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.FarmerProxy.GetSignagePoints(System.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_FarmerProxy_GetSignagePoints_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.FarmerProxy.GetSignagePoints(System.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_FarmerProxy_GetSignagePoints_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.FarmerProxy.GetSignagePoints(System.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/FarmerProxy.cs/#L110">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/FarmerProxy.cs/#L110">View Source</a>
   </span>
   <a id="chia_dotnet_FarmerProxy_GetSignagePoints_" data-uid="chia.dotnet.FarmerProxy.GetSignagePoints*"></a>
   <h4 id="chia_dotnet_FarmerProxy_GetSignagePoints_System_Threading_CancellationToken_" data-uid="chia.dotnet.FarmerProxy.GetSignagePoints(System.Threading.CancellationToken)">GetSignagePoints(CancellationToken)</h4>
@@ -1143,24 +933,10 @@ <h5 class="returns">Returns</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_FarmerProxy_SetPayoutInstructions_System_String_System_String_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.FarmerProxy.SetPayoutInstructions(System.String%2CSystem.String%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_FarmerProxy_SetPayoutInstructions_System_String_System_String_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.FarmerProxy.SetPayoutInstructions(System.String%2CSystem.String%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_FarmerProxy_SetPayoutInstructions_System_String_System_String_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.FarmerProxy.SetPayoutInstructions(System.String%2CSystem.String%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/FarmerProxy.cs/#L264">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/FarmerProxy.cs/#L264">View Source</a>
   </span>
   <a id="chia_dotnet_FarmerProxy_SetPayoutInstructions_" data-uid="chia.dotnet.FarmerProxy.SetPayoutInstructions*"></a>
   <h4 id="chia_dotnet_FarmerProxy_SetPayoutInstructions_System_String_System_String_System_Threading_CancellationToken_" data-uid="chia.dotnet.FarmerProxy.SetPayoutInstructions(System.String,System.String,System.Threading.CancellationToken)">SetPayoutInstructions(String, String, CancellationToken)</h4>
@@ -1219,24 +995,10 @@ <h5 class="returns">Returns</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_FarmerProxy_SetRewardTargets_System_String_System_String_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.FarmerProxy.SetRewardTargets(System.String%2CSystem.String%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_FarmerProxy_SetRewardTargets_System_String_System_String_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.FarmerProxy.SetRewardTargets(System.String%2CSystem.String%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_FarmerProxy_SetRewardTargets_System_String_System_String_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.FarmerProxy.SetRewardTargets(System.String%2CSystem.String%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/FarmerProxy.cs/#L86">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/FarmerProxy.cs/#L86">View Source</a>
   </span>
   <a id="chia_dotnet_FarmerProxy_SetRewardTargets_" data-uid="chia.dotnet.FarmerProxy.SetRewardTargets*"></a>
   <h4 id="chia_dotnet_FarmerProxy_SetRewardTargets_System_String_System_String_System_Threading_CancellationToken_" data-uid="chia.dotnet.FarmerProxy.SetRewardTargets(System.String,System.String,System.Threading.CancellationToken)">SetRewardTargets(String, String, CancellationToken)</h4>
@@ -1301,24 +1063,10 @@ <h5 class="returns">Returns</h5>
               <div class="contribution">
                 <ul class="nav">
                   <li>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-                    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_FarmerProxy.md&amp;value=---%0Auid%3A%20chia.dotnet.FarmerProxy%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-                    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_FarmerProxy.md&amp;value=---%0Auid%3A%20chia.dotnet.FarmerProxy%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-=======
                     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_FarmerProxy.md&amp;value=---%0Auid%3A%20chia.dotnet.FarmerProxy%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
                   </li>
                   <li>
-                    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/FarmerProxy.cs/#L13" class="contribution-link">View Source</a>
+                    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/FarmerProxy.cs/#L13" class="contribution-link">View Source</a>
                   </li>
                 </ul>
               </div>
diff --git a/docs/api/chia.dotnet.FarmerRewards.html b/docs/api/chia.dotnet.FarmerRewards.html
index 61588ccc..e75424d5 100644
--- a/docs/api/chia.dotnet.FarmerRewards.html
+++ b/docs/api/chia.dotnet.FarmerRewards.html
@@ -90,21 +90,7 @@ <h5>Inherited Members</h5>
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object)">Object.Equals(Object)</a>
     </div>
     <div>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object-system-object)">Object.Equals(Object, Object)</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-      <span class="xref">System.Object.Equals(System.Object, System.Object)</span>
-=======
-      <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object-system-object)">Object.Equals(Object, Object)</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
     </div>
     <div>
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.gethashcode#system-object-gethashcode">Object.GetHashCode()</a>
@@ -132,24 +118,10 @@ <h3 id="properties">Properties
   </h3>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_FarmerRewards_FarmedAmount.md&amp;value=---%0Auid%3A%20chia.dotnet.FarmerRewards.FarmedAmount%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_FarmerRewards_FarmedAmount.md&amp;value=---%0Auid%3A%20chia.dotnet.FarmerRewards.FarmedAmount%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_FarmerRewards_FarmedAmount.md&amp;value=---%0Auid%3A%20chia.dotnet.FarmerRewards.FarmedAmount%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/FarmerRewards.cs/#L5">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/FarmerRewards.cs/#L5">View Source</a>
   </span>
   <a id="chia_dotnet_FarmerRewards_FarmedAmount_" data-uid="chia.dotnet.FarmerRewards.FarmedAmount*"></a>
   <h4 id="chia_dotnet_FarmerRewards_FarmedAmount" data-uid="chia.dotnet.FarmerRewards.FarmedAmount">FarmedAmount</h4>
@@ -176,24 +148,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_FarmerRewards_FarmerRewardAmount.md&amp;value=---%0Auid%3A%20chia.dotnet.FarmerRewards.FarmerRewardAmount%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_FarmerRewards_FarmerRewardAmount.md&amp;value=---%0Auid%3A%20chia.dotnet.FarmerRewards.FarmerRewardAmount%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_FarmerRewards_FarmerRewardAmount.md&amp;value=---%0Auid%3A%20chia.dotnet.FarmerRewards.FarmerRewardAmount%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/FarmerRewards.cs/#L7">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/FarmerRewards.cs/#L7">View Source</a>
   </span>
   <a id="chia_dotnet_FarmerRewards_FarmerRewardAmount_" data-uid="chia.dotnet.FarmerRewards.FarmerRewardAmount*"></a>
   <h4 id="chia_dotnet_FarmerRewards_FarmerRewardAmount" data-uid="chia.dotnet.FarmerRewards.FarmerRewardAmount">FarmerRewardAmount</h4>
@@ -220,24 +178,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_FarmerRewards_FeeAmount.md&amp;value=---%0Auid%3A%20chia.dotnet.FarmerRewards.FeeAmount%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_FarmerRewards_FeeAmount.md&amp;value=---%0Auid%3A%20chia.dotnet.FarmerRewards.FeeAmount%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_FarmerRewards_FeeAmount.md&amp;value=---%0Auid%3A%20chia.dotnet.FarmerRewards.FeeAmount%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/FarmerRewards.cs/#L8">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/FarmerRewards.cs/#L8">View Source</a>
   </span>
   <a id="chia_dotnet_FarmerRewards_FeeAmount_" data-uid="chia.dotnet.FarmerRewards.FeeAmount*"></a>
   <h4 id="chia_dotnet_FarmerRewards_FeeAmount" data-uid="chia.dotnet.FarmerRewards.FeeAmount">FeeAmount</h4>
@@ -264,24 +208,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_FarmerRewards_LastHeightFarmed.md&amp;value=---%0Auid%3A%20chia.dotnet.FarmerRewards.LastHeightFarmed%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_FarmerRewards_LastHeightFarmed.md&amp;value=---%0Auid%3A%20chia.dotnet.FarmerRewards.LastHeightFarmed%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_FarmerRewards_LastHeightFarmed.md&amp;value=---%0Auid%3A%20chia.dotnet.FarmerRewards.LastHeightFarmed%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/FarmerRewards.cs/#L9">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/FarmerRewards.cs/#L9">View Source</a>
   </span>
   <a id="chia_dotnet_FarmerRewards_LastHeightFarmed_" data-uid="chia.dotnet.FarmerRewards.LastHeightFarmed*"></a>
   <h4 id="chia_dotnet_FarmerRewards_LastHeightFarmed" data-uid="chia.dotnet.FarmerRewards.LastHeightFarmed">LastHeightFarmed</h4>
@@ -308,24 +238,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_FarmerRewards_PoolRewardAmount.md&amp;value=---%0Auid%3A%20chia.dotnet.FarmerRewards.PoolRewardAmount%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_FarmerRewards_PoolRewardAmount.md&amp;value=---%0Auid%3A%20chia.dotnet.FarmerRewards.PoolRewardAmount%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_FarmerRewards_PoolRewardAmount.md&amp;value=---%0Auid%3A%20chia.dotnet.FarmerRewards.PoolRewardAmount%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/FarmerRewards.cs/#L6">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/FarmerRewards.cs/#L6">View Source</a>
   </span>
   <a id="chia_dotnet_FarmerRewards_PoolRewardAmount_" data-uid="chia.dotnet.FarmerRewards.PoolRewardAmount*"></a>
   <h4 id="chia_dotnet_FarmerRewards_PoolRewardAmount" data-uid="chia.dotnet.FarmerRewards.PoolRewardAmount">PoolRewardAmount</h4>
@@ -362,24 +278,10 @@ <h3 id="implements">Implements</h3>
               <div class="contribution">
                 <ul class="nav">
                   <li>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-                    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_FarmerRewards.md&amp;value=---%0Auid%3A%20chia.dotnet.FarmerRewards%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-                    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_FarmerRewards.md&amp;value=---%0Auid%3A%20chia.dotnet.FarmerRewards%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-=======
                     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_FarmerRewards.md&amp;value=---%0Auid%3A%20chia.dotnet.FarmerRewards%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
                   </li>
                   <li>
-                    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/FarmerRewards.cs/#L3" class="contribution-link">View Source</a>
+                    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/FarmerRewards.cs/#L3" class="contribution-link">View Source</a>
                   </li>
                 </ul>
               </div>
diff --git a/docs/api/chia.dotnet.FarmerSignagePoint.html b/docs/api/chia.dotnet.FarmerSignagePoint.html
index ebb7740e..bc2dd7ee 100644
--- a/docs/api/chia.dotnet.FarmerSignagePoint.html
+++ b/docs/api/chia.dotnet.FarmerSignagePoint.html
@@ -92,21 +92,7 @@ <h5>Inherited Members</h5>
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object)">Object.Equals(Object)</a>
     </div>
     <div>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object-system-object)">Object.Equals(Object, Object)</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-      <span class="xref">System.Object.Equals(System.Object, System.Object)</span>
-=======
-      <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object-system-object)">Object.Equals(Object, Object)</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
     </div>
     <div>
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.gethashcode#system-object-gethashcode">Object.GetHashCode()</a>
@@ -134,24 +120,10 @@ <h3 id="properties">Properties
   </h3>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_FarmerSignagePoint_ChallengeChainSp.md&amp;value=---%0Auid%3A%20chia.dotnet.FarmerSignagePoint.ChallengeChainSp%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_FarmerSignagePoint_ChallengeChainSp.md&amp;value=---%0Auid%3A%20chia.dotnet.FarmerSignagePoint.ChallengeChainSp%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_FarmerSignagePoint_ChallengeChainSp.md&amp;value=---%0Auid%3A%20chia.dotnet.FarmerSignagePoint.ChallengeChainSp%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/FarmerSignagePoint.cs/#L9">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/FarmerSignagePoint.cs/#L9">View Source</a>
   </span>
   <a id="chia_dotnet_FarmerSignagePoint_ChallengeChainSp_" data-uid="chia.dotnet.FarmerSignagePoint.ChallengeChainSp*"></a>
   <h4 id="chia_dotnet_FarmerSignagePoint_ChallengeChainSp" data-uid="chia.dotnet.FarmerSignagePoint.ChallengeChainSp">ChallengeChainSp</h4>
@@ -178,24 +150,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_FarmerSignagePoint_ChallengeHash.md&amp;value=---%0Auid%3A%20chia.dotnet.FarmerSignagePoint.ChallengeHash%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_FarmerSignagePoint_ChallengeHash.md&amp;value=---%0Auid%3A%20chia.dotnet.FarmerSignagePoint.ChallengeHash%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_FarmerSignagePoint_ChallengeHash.md&amp;value=---%0Auid%3A%20chia.dotnet.FarmerSignagePoint.ChallengeHash%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/FarmerSignagePoint.cs/#L10">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/FarmerSignagePoint.cs/#L10">View Source</a>
   </span>
   <a id="chia_dotnet_FarmerSignagePoint_ChallengeHash_" data-uid="chia.dotnet.FarmerSignagePoint.ChallengeHash*"></a>
   <h4 id="chia_dotnet_FarmerSignagePoint_ChallengeHash" data-uid="chia.dotnet.FarmerSignagePoint.ChallengeHash">ChallengeHash</h4>
@@ -222,24 +180,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_FarmerSignagePoint_Difficulty.md&amp;value=---%0Auid%3A%20chia.dotnet.FarmerSignagePoint.Difficulty%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_FarmerSignagePoint_Difficulty.md&amp;value=---%0Auid%3A%20chia.dotnet.FarmerSignagePoint.Difficulty%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_FarmerSignagePoint_Difficulty.md&amp;value=---%0Auid%3A%20chia.dotnet.FarmerSignagePoint.Difficulty%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/FarmerSignagePoint.cs/#L11">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/FarmerSignagePoint.cs/#L11">View Source</a>
   </span>
   <a id="chia_dotnet_FarmerSignagePoint_Difficulty_" data-uid="chia.dotnet.FarmerSignagePoint.Difficulty*"></a>
   <h4 id="chia_dotnet_FarmerSignagePoint_Difficulty" data-uid="chia.dotnet.FarmerSignagePoint.Difficulty">Difficulty</h4>
@@ -266,24 +210,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_FarmerSignagePoint_RewardChainSp.md&amp;value=---%0Auid%3A%20chia.dotnet.FarmerSignagePoint.RewardChainSp%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_FarmerSignagePoint_RewardChainSp.md&amp;value=---%0Auid%3A%20chia.dotnet.FarmerSignagePoint.RewardChainSp%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_FarmerSignagePoint_RewardChainSp.md&amp;value=---%0Auid%3A%20chia.dotnet.FarmerSignagePoint.RewardChainSp%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/FarmerSignagePoint.cs/#L12">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/FarmerSignagePoint.cs/#L12">View Source</a>
   </span>
   <a id="chia_dotnet_FarmerSignagePoint_RewardChainSp_" data-uid="chia.dotnet.FarmerSignagePoint.RewardChainSp*"></a>
   <h4 id="chia_dotnet_FarmerSignagePoint_RewardChainSp" data-uid="chia.dotnet.FarmerSignagePoint.RewardChainSp">RewardChainSp</h4>
@@ -310,24 +240,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_FarmerSignagePoint_SignagePointIndex.md&amp;value=---%0Auid%3A%20chia.dotnet.FarmerSignagePoint.SignagePointIndex%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_FarmerSignagePoint_SignagePointIndex.md&amp;value=---%0Auid%3A%20chia.dotnet.FarmerSignagePoint.SignagePointIndex%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_FarmerSignagePoint_SignagePointIndex.md&amp;value=---%0Auid%3A%20chia.dotnet.FarmerSignagePoint.SignagePointIndex%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/FarmerSignagePoint.cs/#L13">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/FarmerSignagePoint.cs/#L13">View Source</a>
   </span>
   <a id="chia_dotnet_FarmerSignagePoint_SignagePointIndex_" data-uid="chia.dotnet.FarmerSignagePoint.SignagePointIndex*"></a>
   <h4 id="chia_dotnet_FarmerSignagePoint_SignagePointIndex" data-uid="chia.dotnet.FarmerSignagePoint.SignagePointIndex">SignagePointIndex</h4>
@@ -354,24 +270,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_FarmerSignagePoint_SubSlotIters.md&amp;value=---%0Auid%3A%20chia.dotnet.FarmerSignagePoint.SubSlotIters%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_FarmerSignagePoint_SubSlotIters.md&amp;value=---%0Auid%3A%20chia.dotnet.FarmerSignagePoint.SubSlotIters%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_FarmerSignagePoint_SubSlotIters.md&amp;value=---%0Auid%3A%20chia.dotnet.FarmerSignagePoint.SubSlotIters%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/FarmerSignagePoint.cs/#L14">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/FarmerSignagePoint.cs/#L14">View Source</a>
   </span>
   <a id="chia_dotnet_FarmerSignagePoint_SubSlotIters_" data-uid="chia.dotnet.FarmerSignagePoint.SubSlotIters*"></a>
   <h4 id="chia_dotnet_FarmerSignagePoint_SubSlotIters" data-uid="chia.dotnet.FarmerSignagePoint.SubSlotIters">SubSlotIters</h4>
@@ -408,24 +310,10 @@ <h3 id="implements">Implements</h3>
               <div class="contribution">
                 <ul class="nav">
                   <li>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-                    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_FarmerSignagePoint.md&amp;value=---%0Auid%3A%20chia.dotnet.FarmerSignagePoint%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-                    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_FarmerSignagePoint.md&amp;value=---%0Auid%3A%20chia.dotnet.FarmerSignagePoint%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-=======
                     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_FarmerSignagePoint.md&amp;value=---%0Auid%3A%20chia.dotnet.FarmerSignagePoint%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
                   </li>
                   <li>
-                    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/FarmerSignagePoint.cs/#L7" class="contribution-link">View Source</a>
+                    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/FarmerSignagePoint.cs/#L7" class="contribution-link">View Source</a>
                   </li>
                 </ul>
               </div>
diff --git a/docs/api/chia.dotnet.FilterItem.html b/docs/api/chia.dotnet.FilterItem.html
index 833582d9..35425e32 100644
--- a/docs/api/chia.dotnet.FilterItem.html
+++ b/docs/api/chia.dotnet.FilterItem.html
@@ -90,21 +90,7 @@ <h5>Inherited Members</h5>
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object)">Object.Equals(Object)</a>
     </div>
     <div>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object-system-object)">Object.Equals(Object, Object)</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-      <span class="xref">System.Object.Equals(System.Object, System.Object)</span>
-=======
-      <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object-system-object)">Object.Equals(Object, Object)</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
     </div>
     <div>
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.gethashcode#system-object-gethashcode">Object.GetHashCode()</a>
@@ -132,24 +118,10 @@ <h3 id="properties">Properties
   </h3>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_FilterItem_Key.md&amp;value=---%0Auid%3A%20chia.dotnet.FilterItem.Key%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_FilterItem_Key.md&amp;value=---%0Auid%3A%20chia.dotnet.FilterItem.Key%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_FilterItem_Key.md&amp;value=---%0Auid%3A%20chia.dotnet.FilterItem.Key%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/FilterItem.cs/#L5">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/FilterItem.cs/#L5">View Source</a>
   </span>
   <a id="chia_dotnet_FilterItem_Key_" data-uid="chia.dotnet.FilterItem.Key*"></a>
   <h4 id="chia_dotnet_FilterItem_Key" data-uid="chia.dotnet.FilterItem.Key">Key</h4>
@@ -176,24 +148,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_FilterItem_Value.md&amp;value=---%0Auid%3A%20chia.dotnet.FilterItem.Value%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_FilterItem_Value.md&amp;value=---%0Auid%3A%20chia.dotnet.FilterItem.Value%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_FilterItem_Value.md&amp;value=---%0Auid%3A%20chia.dotnet.FilterItem.Value%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/FilterItem.cs/#L6">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/FilterItem.cs/#L6">View Source</a>
   </span>
   <a id="chia_dotnet_FilterItem_Value_" data-uid="chia.dotnet.FilterItem.Value*"></a>
   <h4 id="chia_dotnet_FilterItem_Value" data-uid="chia.dotnet.FilterItem.Value">Value</h4>
@@ -230,24 +188,10 @@ <h3 id="implements">Implements</h3>
               <div class="contribution">
                 <ul class="nav">
                   <li>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-                    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_FilterItem.md&amp;value=---%0Auid%3A%20chia.dotnet.FilterItem%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-                    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_FilterItem.md&amp;value=---%0Auid%3A%20chia.dotnet.FilterItem%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-=======
                     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_FilterItem.md&amp;value=---%0Auid%3A%20chia.dotnet.FilterItem%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
                   </li>
                   <li>
-                    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/FilterItem.cs/#L3" class="contribution-link">View Source</a>
+                    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/FilterItem.cs/#L3" class="contribution-link">View Source</a>
                   </li>
                 </ul>
               </div>
diff --git a/docs/api/chia.dotnet.FilterMode.html b/docs/api/chia.dotnet.FilterMode.html
index 8fb16419..d5bbe101 100644
--- a/docs/api/chia.dotnet.FilterMode.html
+++ b/docs/api/chia.dotnet.FilterMode.html
@@ -109,24 +109,10 @@ <h3 id="fields">Fields
               <div class="contribution">
                 <ul class="nav">
                   <li>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
                     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_FilterMode.md&amp;value=---%0Auid%3A%20chia.dotnet.FilterMode%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-                    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_FilterMode.md&amp;value=---%0Auid%3A%20chia.dotnet.FilterMode%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-=======
-                    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_FilterMode.md&amp;value=---%0Auid%3A%20chia.dotnet.FilterMode%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
                   </li>
                   <li>
-                    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/FilterMode.cs/#L3" class="contribution-link">View Source</a>
+                    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/FilterMode.cs/#L3" class="contribution-link">View Source</a>
                   </li>
                 </ul>
               </div>
diff --git a/docs/api/chia.dotnet.Foliage.html b/docs/api/chia.dotnet.Foliage.html
index 633ddcce..3373f02d 100644
--- a/docs/api/chia.dotnet.Foliage.html
+++ b/docs/api/chia.dotnet.Foliage.html
@@ -93,21 +93,7 @@ <h5>Inherited Members</h5>
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object)">Object.Equals(Object)</a>
     </div>
     <div>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object-system-object)">Object.Equals(Object, Object)</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-      <span class="xref">System.Object.Equals(System.Object, System.Object)</span>
-=======
-      <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object-system-object)">Object.Equals(Object, Object)</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
     </div>
     <div>
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.gethashcode#system-object-gethashcode">Object.GetHashCode()</a>
@@ -135,24 +121,10 @@ <h3 id="properties">Properties
   </h3>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_Foliage_FoliageBlockData.md&amp;value=---%0Auid%3A%20chia.dotnet.Foliage.FoliageBlockData%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_Foliage_FoliageBlockData.md&amp;value=---%0Auid%3A%20chia.dotnet.Foliage.FoliageBlockData%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_Foliage_FoliageBlockData.md&amp;value=---%0Auid%3A%20chia.dotnet.Foliage.FoliageBlockData%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/Foliage.cs/#L12">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/Foliage.cs/#L12">View Source</a>
   </span>
   <a id="chia_dotnet_Foliage_FoliageBlockData_" data-uid="chia.dotnet.Foliage.FoliageBlockData*"></a>
   <h4 id="chia_dotnet_Foliage_FoliageBlockData" data-uid="chia.dotnet.Foliage.FoliageBlockData">FoliageBlockData</h4>
@@ -179,24 +151,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_Foliage_FoliageBlockDataSignature.md&amp;value=---%0Auid%3A%20chia.dotnet.Foliage.FoliageBlockDataSignature%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_Foliage_FoliageBlockDataSignature.md&amp;value=---%0Auid%3A%20chia.dotnet.Foliage.FoliageBlockDataSignature%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_Foliage_FoliageBlockDataSignature.md&amp;value=---%0Auid%3A%20chia.dotnet.Foliage.FoliageBlockDataSignature%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/Foliage.cs/#L13">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/Foliage.cs/#L13">View Source</a>
   </span>
   <a id="chia_dotnet_Foliage_FoliageBlockDataSignature_" data-uid="chia.dotnet.Foliage.FoliageBlockDataSignature*"></a>
   <h4 id="chia_dotnet_Foliage_FoliageBlockDataSignature" data-uid="chia.dotnet.Foliage.FoliageBlockDataSignature">FoliageBlockDataSignature</h4>
@@ -223,24 +181,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_Foliage_FoliageTransactionBlockHash.md&amp;value=---%0Auid%3A%20chia.dotnet.Foliage.FoliageTransactionBlockHash%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_Foliage_FoliageTransactionBlockHash.md&amp;value=---%0Auid%3A%20chia.dotnet.Foliage.FoliageTransactionBlockHash%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_Foliage_FoliageTransactionBlockHash.md&amp;value=---%0Auid%3A%20chia.dotnet.Foliage.FoliageTransactionBlockHash%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/Foliage.cs/#L14">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/Foliage.cs/#L14">View Source</a>
   </span>
   <a id="chia_dotnet_Foliage_FoliageTransactionBlockHash_" data-uid="chia.dotnet.Foliage.FoliageTransactionBlockHash*"></a>
   <h4 id="chia_dotnet_Foliage_FoliageTransactionBlockHash" data-uid="chia.dotnet.Foliage.FoliageTransactionBlockHash">FoliageTransactionBlockHash</h4>
@@ -267,24 +211,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_Foliage_FoliageTransactionBlockSignature.md&amp;value=---%0Auid%3A%20chia.dotnet.Foliage.FoliageTransactionBlockSignature%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_Foliage_FoliageTransactionBlockSignature.md&amp;value=---%0Auid%3A%20chia.dotnet.Foliage.FoliageTransactionBlockSignature%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_Foliage_FoliageTransactionBlockSignature.md&amp;value=---%0Auid%3A%20chia.dotnet.Foliage.FoliageTransactionBlockSignature%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/Foliage.cs/#L15">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/Foliage.cs/#L15">View Source</a>
   </span>
   <a id="chia_dotnet_Foliage_FoliageTransactionBlockSignature_" data-uid="chia.dotnet.Foliage.FoliageTransactionBlockSignature*"></a>
   <h4 id="chia_dotnet_Foliage_FoliageTransactionBlockSignature" data-uid="chia.dotnet.Foliage.FoliageTransactionBlockSignature">FoliageTransactionBlockSignature</h4>
@@ -311,24 +241,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_Foliage_PrevBlockHash.md&amp;value=---%0Auid%3A%20chia.dotnet.Foliage.PrevBlockHash%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_Foliage_PrevBlockHash.md&amp;value=---%0Auid%3A%20chia.dotnet.Foliage.PrevBlockHash%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_Foliage_PrevBlockHash.md&amp;value=---%0Auid%3A%20chia.dotnet.Foliage.PrevBlockHash%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/Foliage.cs/#L10">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/Foliage.cs/#L10">View Source</a>
   </span>
   <a id="chia_dotnet_Foliage_PrevBlockHash_" data-uid="chia.dotnet.Foliage.PrevBlockHash*"></a>
   <h4 id="chia_dotnet_Foliage_PrevBlockHash" data-uid="chia.dotnet.Foliage.PrevBlockHash">PrevBlockHash</h4>
@@ -355,24 +271,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_Foliage_RewardBlockHash.md&amp;value=---%0Auid%3A%20chia.dotnet.Foliage.RewardBlockHash%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_Foliage_RewardBlockHash.md&amp;value=---%0Auid%3A%20chia.dotnet.Foliage.RewardBlockHash%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_Foliage_RewardBlockHash.md&amp;value=---%0Auid%3A%20chia.dotnet.Foliage.RewardBlockHash%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/Foliage.cs/#L11">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/Foliage.cs/#L11">View Source</a>
   </span>
   <a id="chia_dotnet_Foliage_RewardBlockHash_" data-uid="chia.dotnet.Foliage.RewardBlockHash*"></a>
   <h4 id="chia_dotnet_Foliage_RewardBlockHash" data-uid="chia.dotnet.Foliage.RewardBlockHash">RewardBlockHash</h4>
@@ -409,24 +311,10 @@ <h3 id="implements">Implements</h3>
               <div class="contribution">
                 <ul class="nav">
                   <li>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-                    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_Foliage.md&amp;value=---%0Auid%3A%20chia.dotnet.Foliage%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-                    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_Foliage.md&amp;value=---%0Auid%3A%20chia.dotnet.Foliage%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-=======
                     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_Foliage.md&amp;value=---%0Auid%3A%20chia.dotnet.Foliage%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
                   </li>
                   <li>
-                    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/Foliage.cs/#L8" class="contribution-link">View Source</a>
+                    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/Foliage.cs/#L8" class="contribution-link">View Source</a>
                   </li>
                 </ul>
               </div>
diff --git a/docs/api/chia.dotnet.FoliageBlockData.html b/docs/api/chia.dotnet.FoliageBlockData.html
index d7b8c414..143e02b6 100644
--- a/docs/api/chia.dotnet.FoliageBlockData.html
+++ b/docs/api/chia.dotnet.FoliageBlockData.html
@@ -91,21 +91,7 @@ <h5>Inherited Members</h5>
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object)">Object.Equals(Object)</a>
     </div>
     <div>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object-system-object)">Object.Equals(Object, Object)</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-      <span class="xref">System.Object.Equals(System.Object, System.Object)</span>
-=======
-      <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object-system-object)">Object.Equals(Object, Object)</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
     </div>
     <div>
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.gethashcode#system-object-gethashcode">Object.GetHashCode()</a>
@@ -133,24 +119,10 @@ <h3 id="properties">Properties
   </h3>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_FoliageBlockData_ExtensionData.md&amp;value=---%0Auid%3A%20chia.dotnet.FoliageBlockData.ExtensionData%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_FoliageBlockData_ExtensionData.md&amp;value=---%0Auid%3A%20chia.dotnet.FoliageBlockData.ExtensionData%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_FoliageBlockData_ExtensionData.md&amp;value=---%0Auid%3A%20chia.dotnet.FoliageBlockData.ExtensionData%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/FoliageBlockData.cs/#L18">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/FoliageBlockData.cs/#L18">View Source</a>
   </span>
   <a id="chia_dotnet_FoliageBlockData_ExtensionData_" data-uid="chia.dotnet.FoliageBlockData.ExtensionData*"></a>
   <h4 id="chia_dotnet_FoliageBlockData_ExtensionData" data-uid="chia.dotnet.FoliageBlockData.ExtensionData">ExtensionData</h4>
@@ -178,24 +150,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_FoliageBlockData_FarmerRewardPuzzleHash.md&amp;value=---%0Auid%3A%20chia.dotnet.FoliageBlockData.FarmerRewardPuzzleHash%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_FoliageBlockData_FarmerRewardPuzzleHash.md&amp;value=---%0Auid%3A%20chia.dotnet.FoliageBlockData.FarmerRewardPuzzleHash%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_FoliageBlockData_FarmerRewardPuzzleHash.md&amp;value=---%0Auid%3A%20chia.dotnet.FoliageBlockData.FarmerRewardPuzzleHash%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/FoliageBlockData.cs/#L14">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/FoliageBlockData.cs/#L14">View Source</a>
   </span>
   <a id="chia_dotnet_FoliageBlockData_FarmerRewardPuzzleHash_" data-uid="chia.dotnet.FoliageBlockData.FarmerRewardPuzzleHash*"></a>
   <h4 id="chia_dotnet_FoliageBlockData_FarmerRewardPuzzleHash" data-uid="chia.dotnet.FoliageBlockData.FarmerRewardPuzzleHash">FarmerRewardPuzzleHash</h4>
@@ -222,24 +180,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_FoliageBlockData_PoolSignature.md&amp;value=---%0Auid%3A%20chia.dotnet.FoliageBlockData.PoolSignature%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_FoliageBlockData_PoolSignature.md&amp;value=---%0Auid%3A%20chia.dotnet.FoliageBlockData.PoolSignature%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_FoliageBlockData_PoolSignature.md&amp;value=---%0Auid%3A%20chia.dotnet.FoliageBlockData.PoolSignature%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/FoliageBlockData.cs/#L13">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/FoliageBlockData.cs/#L13">View Source</a>
   </span>
   <a id="chia_dotnet_FoliageBlockData_PoolSignature_" data-uid="chia.dotnet.FoliageBlockData.PoolSignature*"></a>
   <h4 id="chia_dotnet_FoliageBlockData_PoolSignature" data-uid="chia.dotnet.FoliageBlockData.PoolSignature">PoolSignature</h4>
@@ -267,24 +211,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_FoliageBlockData_PoolTarget.md&amp;value=---%0Auid%3A%20chia.dotnet.FoliageBlockData.PoolTarget%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_FoliageBlockData_PoolTarget.md&amp;value=---%0Auid%3A%20chia.dotnet.FoliageBlockData.PoolTarget%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_FoliageBlockData_PoolTarget.md&amp;value=---%0Auid%3A%20chia.dotnet.FoliageBlockData.PoolTarget%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/FoliageBlockData.cs/#L9">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/FoliageBlockData.cs/#L9">View Source</a>
   </span>
   <a id="chia_dotnet_FoliageBlockData_PoolTarget_" data-uid="chia.dotnet.FoliageBlockData.PoolTarget*"></a>
   <h4 id="chia_dotnet_FoliageBlockData_PoolTarget" data-uid="chia.dotnet.FoliageBlockData.PoolTarget">PoolTarget</h4>
@@ -311,24 +241,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_FoliageBlockData_UnfinishedRewardBlockHash.md&amp;value=---%0Auid%3A%20chia.dotnet.FoliageBlockData.UnfinishedRewardBlockHash%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_FoliageBlockData_UnfinishedRewardBlockHash.md&amp;value=---%0Auid%3A%20chia.dotnet.FoliageBlockData.UnfinishedRewardBlockHash%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_FoliageBlockData_UnfinishedRewardBlockHash.md&amp;value=---%0Auid%3A%20chia.dotnet.FoliageBlockData.UnfinishedRewardBlockHash%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/FoliageBlockData.cs/#L8">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/FoliageBlockData.cs/#L8">View Source</a>
   </span>
   <a id="chia_dotnet_FoliageBlockData_UnfinishedRewardBlockHash_" data-uid="chia.dotnet.FoliageBlockData.UnfinishedRewardBlockHash*"></a>
   <h4 id="chia_dotnet_FoliageBlockData_UnfinishedRewardBlockHash" data-uid="chia.dotnet.FoliageBlockData.UnfinishedRewardBlockHash">UnfinishedRewardBlockHash</h4>
@@ -365,24 +281,10 @@ <h3 id="implements">Implements</h3>
               <div class="contribution">
                 <ul class="nav">
                   <li>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-                    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_FoliageBlockData.md&amp;value=---%0Auid%3A%20chia.dotnet.FoliageBlockData%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-                    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_FoliageBlockData.md&amp;value=---%0Auid%3A%20chia.dotnet.FoliageBlockData%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-=======
                     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_FoliageBlockData.md&amp;value=---%0Auid%3A%20chia.dotnet.FoliageBlockData%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
                   </li>
                   <li>
-                    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/FoliageBlockData.cs/#L6" class="contribution-link">View Source</a>
+                    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/FoliageBlockData.cs/#L6" class="contribution-link">View Source</a>
                   </li>
                 </ul>
               </div>
diff --git a/docs/api/chia.dotnet.FoliageTransactionBlock.html b/docs/api/chia.dotnet.FoliageTransactionBlock.html
index aa9a6eee..ec47fbd1 100644
--- a/docs/api/chia.dotnet.FoliageTransactionBlock.html
+++ b/docs/api/chia.dotnet.FoliageTransactionBlock.html
@@ -91,21 +91,7 @@ <h5>Inherited Members</h5>
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object)">Object.Equals(Object)</a>
     </div>
     <div>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object-system-object)">Object.Equals(Object, Object)</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-      <span class="xref">System.Object.Equals(System.Object, System.Object)</span>
-=======
-      <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object-system-object)">Object.Equals(Object, Object)</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
     </div>
     <div>
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.gethashcode#system-object-gethashcode">Object.GetHashCode()</a>
@@ -133,24 +119,10 @@ <h3 id="properties">Properties
   </h3>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_FoliageTransactionBlock_AdditionsRoot.md&amp;value=---%0Auid%3A%20chia.dotnet.FoliageTransactionBlock.AdditionsRoot%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_FoliageTransactionBlock_AdditionsRoot.md&amp;value=---%0Auid%3A%20chia.dotnet.FoliageTransactionBlock.AdditionsRoot%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_FoliageTransactionBlock_AdditionsRoot.md&amp;value=---%0Auid%3A%20chia.dotnet.FoliageTransactionBlock.AdditionsRoot%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/FoliageTransactionBlock.cs/#L15">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/FoliageTransactionBlock.cs/#L15">View Source</a>
   </span>
   <a id="chia_dotnet_FoliageTransactionBlock_AdditionsRoot_" data-uid="chia.dotnet.FoliageTransactionBlock.AdditionsRoot*"></a>
   <h4 id="chia_dotnet_FoliageTransactionBlock_AdditionsRoot" data-uid="chia.dotnet.FoliageTransactionBlock.AdditionsRoot">AdditionsRoot</h4>
@@ -177,24 +149,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_FoliageTransactionBlock_DateTimestamp.md&amp;value=---%0Auid%3A%20chia.dotnet.FoliageTransactionBlock.DateTimestamp%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_FoliageTransactionBlock_DateTimestamp.md&amp;value=---%0Auid%3A%20chia.dotnet.FoliageTransactionBlock.DateTimestamp%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_FoliageTransactionBlock_DateTimestamp.md&amp;value=---%0Auid%3A%20chia.dotnet.FoliageTransactionBlock.DateTimestamp%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/FoliageTransactionBlock.cs/#L18">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/FoliageTransactionBlock.cs/#L18">View Source</a>
   </span>
   <a id="chia_dotnet_FoliageTransactionBlock_DateTimestamp_" data-uid="chia.dotnet.FoliageTransactionBlock.DateTimestamp*"></a>
   <h4 id="chia_dotnet_FoliageTransactionBlock_DateTimestamp" data-uid="chia.dotnet.FoliageTransactionBlock.DateTimestamp">DateTimestamp</h4>
@@ -222,24 +180,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_FoliageTransactionBlock_FilterHash.md&amp;value=---%0Auid%3A%20chia.dotnet.FoliageTransactionBlock.FilterHash%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_FoliageTransactionBlock_FilterHash.md&amp;value=---%0Auid%3A%20chia.dotnet.FoliageTransactionBlock.FilterHash%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_FoliageTransactionBlock_FilterHash.md&amp;value=---%0Auid%3A%20chia.dotnet.FoliageTransactionBlock.FilterHash%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/FoliageTransactionBlock.cs/#L14">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/FoliageTransactionBlock.cs/#L14">View Source</a>
   </span>
   <a id="chia_dotnet_FoliageTransactionBlock_FilterHash_" data-uid="chia.dotnet.FoliageTransactionBlock.FilterHash*"></a>
   <h4 id="chia_dotnet_FoliageTransactionBlock_FilterHash" data-uid="chia.dotnet.FoliageTransactionBlock.FilterHash">FilterHash</h4>
@@ -266,24 +210,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_FoliageTransactionBlock_PrevTransactionBlockHash.md&amp;value=---%0Auid%3A%20chia.dotnet.FoliageTransactionBlock.PrevTransactionBlockHash%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_FoliageTransactionBlock_PrevTransactionBlockHash.md&amp;value=---%0Auid%3A%20chia.dotnet.FoliageTransactionBlock.PrevTransactionBlockHash%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_FoliageTransactionBlock_PrevTransactionBlockHash.md&amp;value=---%0Auid%3A%20chia.dotnet.FoliageTransactionBlock.PrevTransactionBlockHash%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/FoliageTransactionBlock.cs/#L12">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/FoliageTransactionBlock.cs/#L12">View Source</a>
   </span>
   <a id="chia_dotnet_FoliageTransactionBlock_PrevTransactionBlockHash_" data-uid="chia.dotnet.FoliageTransactionBlock.PrevTransactionBlockHash*"></a>
   <h4 id="chia_dotnet_FoliageTransactionBlock_PrevTransactionBlockHash" data-uid="chia.dotnet.FoliageTransactionBlock.PrevTransactionBlockHash">PrevTransactionBlockHash</h4>
@@ -310,24 +240,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_FoliageTransactionBlock_RemovalsRoot.md&amp;value=---%0Auid%3A%20chia.dotnet.FoliageTransactionBlock.RemovalsRoot%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_FoliageTransactionBlock_RemovalsRoot.md&amp;value=---%0Auid%3A%20chia.dotnet.FoliageTransactionBlock.RemovalsRoot%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_FoliageTransactionBlock_RemovalsRoot.md&amp;value=---%0Auid%3A%20chia.dotnet.FoliageTransactionBlock.RemovalsRoot%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/FoliageTransactionBlock.cs/#L16">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/FoliageTransactionBlock.cs/#L16">View Source</a>
   </span>
   <a id="chia_dotnet_FoliageTransactionBlock_RemovalsRoot_" data-uid="chia.dotnet.FoliageTransactionBlock.RemovalsRoot*"></a>
   <h4 id="chia_dotnet_FoliageTransactionBlock_RemovalsRoot" data-uid="chia.dotnet.FoliageTransactionBlock.RemovalsRoot">RemovalsRoot</h4>
@@ -354,24 +270,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_FoliageTransactionBlock_Timestamp.md&amp;value=---%0Auid%3A%20chia.dotnet.FoliageTransactionBlock.Timestamp%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_FoliageTransactionBlock_Timestamp.md&amp;value=---%0Auid%3A%20chia.dotnet.FoliageTransactionBlock.Timestamp%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_FoliageTransactionBlock_Timestamp.md&amp;value=---%0Auid%3A%20chia.dotnet.FoliageTransactionBlock.Timestamp%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/FoliageTransactionBlock.cs/#L13">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/FoliageTransactionBlock.cs/#L13">View Source</a>
   </span>
   <a id="chia_dotnet_FoliageTransactionBlock_Timestamp_" data-uid="chia.dotnet.FoliageTransactionBlock.Timestamp*"></a>
   <h4 id="chia_dotnet_FoliageTransactionBlock_Timestamp" data-uid="chia.dotnet.FoliageTransactionBlock.Timestamp">Timestamp</h4>
@@ -398,24 +300,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_FoliageTransactionBlock_TransactionsInfoHash.md&amp;value=---%0Auid%3A%20chia.dotnet.FoliageTransactionBlock.TransactionsInfoHash%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_FoliageTransactionBlock_TransactionsInfoHash.md&amp;value=---%0Auid%3A%20chia.dotnet.FoliageTransactionBlock.TransactionsInfoHash%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_FoliageTransactionBlock_TransactionsInfoHash.md&amp;value=---%0Auid%3A%20chia.dotnet.FoliageTransactionBlock.TransactionsInfoHash%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/FoliageTransactionBlock.cs/#L17">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/FoliageTransactionBlock.cs/#L17">View Source</a>
   </span>
   <a id="chia_dotnet_FoliageTransactionBlock_TransactionsInfoHash_" data-uid="chia.dotnet.FoliageTransactionBlock.TransactionsInfoHash*"></a>
   <h4 id="chia_dotnet_FoliageTransactionBlock_TransactionsInfoHash" data-uid="chia.dotnet.FoliageTransactionBlock.TransactionsInfoHash">TransactionsInfoHash</h4>
@@ -452,24 +340,10 @@ <h3 id="implements">Implements</h3>
               <div class="contribution">
                 <ul class="nav">
                   <li>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-                    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_FoliageTransactionBlock.md&amp;value=---%0Auid%3A%20chia.dotnet.FoliageTransactionBlock%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-                    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_FoliageTransactionBlock.md&amp;value=---%0Auid%3A%20chia.dotnet.FoliageTransactionBlock%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-=======
                     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_FoliageTransactionBlock.md&amp;value=---%0Auid%3A%20chia.dotnet.FoliageTransactionBlock%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
                   </li>
                   <li>
-                    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/FoliageTransactionBlock.cs/#L10" class="contribution-link">View Source</a>
+                    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/FoliageTransactionBlock.cs/#L10" class="contribution-link">View Source</a>
                   </li>
                 </ul>
               </div>
diff --git a/docs/api/chia.dotnet.FullBlock.html b/docs/api/chia.dotnet.FullBlock.html
index 5deed10c..fed53f16 100644
--- a/docs/api/chia.dotnet.FullBlock.html
+++ b/docs/api/chia.dotnet.FullBlock.html
@@ -91,21 +91,7 @@ <h5>Inherited Members</h5>
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object)">Object.Equals(Object)</a>
     </div>
     <div>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object-system-object)">Object.Equals(Object, Object)</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-      <span class="xref">System.Object.Equals(System.Object, System.Object)</span>
-=======
-      <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object-system-object)">Object.Equals(Object, Object)</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
     </div>
     <div>
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.gethashcode#system-object-gethashcode">Object.GetHashCode()</a>
@@ -133,24 +119,10 @@ <h3 id="properties">Properties
   </h3>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_FullBlock_ChallengeChainIpProof.md&amp;value=---%0Auid%3A%20chia.dotnet.FullBlock.ChallengeChainIpProof%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_FullBlock_ChallengeChainIpProof.md&amp;value=---%0Auid%3A%20chia.dotnet.FullBlock.ChallengeChainIpProof%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_FullBlock_ChallengeChainIpProof.md&amp;value=---%0Auid%3A%20chia.dotnet.FullBlock.ChallengeChainIpProof%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/FullBlock.cs/#L24">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/FullBlock.cs/#L24">View Source</a>
   </span>
   <a id="chia_dotnet_FullBlock_ChallengeChainIpProof_" data-uid="chia.dotnet.FullBlock.ChallengeChainIpProof*"></a>
   <h4 id="chia_dotnet_FullBlock_ChallengeChainIpProof" data-uid="chia.dotnet.FullBlock.ChallengeChainIpProof">ChallengeChainIpProof</h4>
@@ -177,24 +149,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_FullBlock_ChallengeChainSpProof.md&amp;value=---%0Auid%3A%20chia.dotnet.FullBlock.ChallengeChainSpProof%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_FullBlock_ChallengeChainSpProof.md&amp;value=---%0Auid%3A%20chia.dotnet.FullBlock.ChallengeChainSpProof%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_FullBlock_ChallengeChainSpProof.md&amp;value=---%0Auid%3A%20chia.dotnet.FullBlock.ChallengeChainSpProof%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/FullBlock.cs/#L23">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/FullBlock.cs/#L23">View Source</a>
   </span>
   <a id="chia_dotnet_FullBlock_ChallengeChainSpProof_" data-uid="chia.dotnet.FullBlock.ChallengeChainSpProof*"></a>
   <h4 id="chia_dotnet_FullBlock_ChallengeChainSpProof" data-uid="chia.dotnet.FullBlock.ChallengeChainSpProof">ChallengeChainSpProof</h4>
@@ -222,24 +180,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_FullBlock_FinishedSubSlots.md&amp;value=---%0Auid%3A%20chia.dotnet.FullBlock.FinishedSubSlots%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_FullBlock_FinishedSubSlots.md&amp;value=---%0Auid%3A%20chia.dotnet.FullBlock.FinishedSubSlots%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_FullBlock_FinishedSubSlots.md&amp;value=---%0Auid%3A%20chia.dotnet.FullBlock.FinishedSubSlots%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/FullBlock.cs/#L15">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/FullBlock.cs/#L15">View Source</a>
   </span>
   <a id="chia_dotnet_FullBlock_FinishedSubSlots_" data-uid="chia.dotnet.FullBlock.FinishedSubSlots*"></a>
   <h4 id="chia_dotnet_FullBlock_FinishedSubSlots" data-uid="chia.dotnet.FullBlock.FinishedSubSlots">FinishedSubSlots</h4>
@@ -248,21 +192,7 @@ <h4 id="chia_dotnet_FullBlock_FinishedSubSlots" data-uid="chia.dotnet.FullBlock.
   <div class="markdown level1 conceptual"></div>
   <h5 class="decalaration">Declaration</h5>
   <div class="codewrapper">
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <pre><code class="lang-csharp hljs">public IEnumerable&lt;EndOfSubSlotBundle&gt; FinishedSubSlots { get; set; }</code></pre>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <pre><code class="lang-csharp hljs">public ICollection&lt;EndOfSubSlotBundle&gt; FinishedSubSlots { get; set; }</code></pre>
-=======
     <pre><code class="lang-csharp hljs">public IEnumerable&lt;EndOfSubSlotBundle&gt; FinishedSubSlots { get; set; }</code></pre>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </div>
   <h5 class="propertyValue">Property Value</h5>
   <table class="table table-bordered table-striped table-condensed">
@@ -281,24 +211,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_FullBlock_Foliage.md&amp;value=---%0Auid%3A%20chia.dotnet.FullBlock.Foliage%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_FullBlock_Foliage.md&amp;value=---%0Auid%3A%20chia.dotnet.FullBlock.Foliage%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_FullBlock_Foliage.md&amp;value=---%0Auid%3A%20chia.dotnet.FullBlock.Foliage%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/FullBlock.cs/#L37">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/FullBlock.cs/#L37">View Source</a>
   </span>
   <a id="chia_dotnet_FullBlock_Foliage_" data-uid="chia.dotnet.FullBlock.Foliage*"></a>
   <h4 id="chia_dotnet_FullBlock_Foliage" data-uid="chia.dotnet.FullBlock.Foliage">Foliage</h4>
@@ -326,24 +242,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_FullBlock_FoliageTransactionBlock.md&amp;value=---%0Auid%3A%20chia.dotnet.FullBlock.FoliageTransactionBlock%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_FullBlock_FoliageTransactionBlock.md&amp;value=---%0Auid%3A%20chia.dotnet.FullBlock.FoliageTransactionBlock%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_FullBlock_FoliageTransactionBlock.md&amp;value=---%0Auid%3A%20chia.dotnet.FullBlock.FoliageTransactionBlock%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/FullBlock.cs/#L41">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/FullBlock.cs/#L41">View Source</a>
   </span>
   <a id="chia_dotnet_FullBlock_FoliageTransactionBlock_" data-uid="chia.dotnet.FullBlock.FoliageTransactionBlock*"></a>
   <h4 id="chia_dotnet_FullBlock_FoliageTransactionBlock" data-uid="chia.dotnet.FullBlock.FoliageTransactionBlock">FoliageTransactionBlock</h4>
@@ -371,24 +273,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_FullBlock_HeaderHash.md&amp;value=---%0Auid%3A%20chia.dotnet.FullBlock.HeaderHash%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_FullBlock_HeaderHash.md&amp;value=---%0Auid%3A%20chia.dotnet.FullBlock.HeaderHash%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_FullBlock_HeaderHash.md&amp;value=---%0Auid%3A%20chia.dotnet.FullBlock.HeaderHash%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/FullBlock.cs/#L54">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/FullBlock.cs/#L54">View Source</a>
   </span>
   <a id="chia_dotnet_FullBlock_HeaderHash_" data-uid="chia.dotnet.FullBlock.HeaderHash*"></a>
   <h4 id="chia_dotnet_FullBlock_HeaderHash" data-uid="chia.dotnet.FullBlock.HeaderHash">HeaderHash</h4>
@@ -415,24 +303,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_FullBlock_InfusedChallengeChainIpProof.md&amp;value=---%0Auid%3A%20chia.dotnet.FullBlock.InfusedChallengeChainIpProof%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_FullBlock_InfusedChallengeChainIpProof.md&amp;value=---%0Auid%3A%20chia.dotnet.FullBlock.InfusedChallengeChainIpProof%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_FullBlock_InfusedChallengeChainIpProof.md&amp;value=---%0Auid%3A%20chia.dotnet.FullBlock.InfusedChallengeChainIpProof%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/FullBlock.cs/#L33">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/FullBlock.cs/#L33">View Source</a>
   </span>
   <a id="chia_dotnet_FullBlock_InfusedChallengeChainIpProof_" data-uid="chia.dotnet.FullBlock.InfusedChallengeChainIpProof*"></a>
   <h4 id="chia_dotnet_FullBlock_InfusedChallengeChainIpProof" data-uid="chia.dotnet.FullBlock.InfusedChallengeChainIpProof">InfusedChallengeChainIpProof</h4>
@@ -460,24 +334,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_FullBlock_IsTransactionBlock.md&amp;value=---%0Auid%3A%20chia.dotnet.FullBlock.IsTransactionBlock%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_FullBlock_IsTransactionBlock.md&amp;value=---%0Auid%3A%20chia.dotnet.FullBlock.IsTransactionBlock%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_FullBlock_IsTransactionBlock.md&amp;value=---%0Auid%3A%20chia.dotnet.FullBlock.IsTransactionBlock%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/FullBlock.cs/#L58">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/FullBlock.cs/#L58">View Source</a>
   </span>
   <a id="chia_dotnet_FullBlock_IsTransactionBlock_" data-uid="chia.dotnet.FullBlock.IsTransactionBlock*"></a>
   <h4 id="chia_dotnet_FullBlock_IsTransactionBlock" data-uid="chia.dotnet.FullBlock.IsTransactionBlock">IsTransactionBlock</h4>
@@ -506,24 +366,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_FullBlock_RewardChainBlock.md&amp;value=---%0Auid%3A%20chia.dotnet.FullBlock.RewardChainBlock%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_FullBlock_RewardChainBlock.md&amp;value=---%0Auid%3A%20chia.dotnet.FullBlock.RewardChainBlock%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_FullBlock_RewardChainBlock.md&amp;value=---%0Auid%3A%20chia.dotnet.FullBlock.RewardChainBlock%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/FullBlock.cs/#L19">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/FullBlock.cs/#L19">View Source</a>
   </span>
   <a id="chia_dotnet_FullBlock_RewardChainBlock_" data-uid="chia.dotnet.FullBlock.RewardChainBlock*"></a>
   <h4 id="chia_dotnet_FullBlock_RewardChainBlock" data-uid="chia.dotnet.FullBlock.RewardChainBlock">RewardChainBlock</h4>
@@ -551,24 +397,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_FullBlock_RewardChainIpProof.md&amp;value=---%0Auid%3A%20chia.dotnet.FullBlock.RewardChainIpProof%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_FullBlock_RewardChainIpProof.md&amp;value=---%0Auid%3A%20chia.dotnet.FullBlock.RewardChainIpProof%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_FullBlock_RewardChainIpProof.md&amp;value=---%0Auid%3A%20chia.dotnet.FullBlock.RewardChainIpProof%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/FullBlock.cs/#L29">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/FullBlock.cs/#L29">View Source</a>
   </span>
   <a id="chia_dotnet_FullBlock_RewardChainIpProof_" data-uid="chia.dotnet.FullBlock.RewardChainIpProof*"></a>
   <h4 id="chia_dotnet_FullBlock_RewardChainIpProof" data-uid="chia.dotnet.FullBlock.RewardChainIpProof">RewardChainIpProof</h4>
@@ -595,24 +427,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_FullBlock_RewardChainSpProof.md&amp;value=---%0Auid%3A%20chia.dotnet.FullBlock.RewardChainSpProof%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_FullBlock_RewardChainSpProof.md&amp;value=---%0Auid%3A%20chia.dotnet.FullBlock.RewardChainSpProof%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_FullBlock_RewardChainSpProof.md&amp;value=---%0Auid%3A%20chia.dotnet.FullBlock.RewardChainSpProof%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/FullBlock.cs/#L28">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/FullBlock.cs/#L28">View Source</a>
   </span>
   <a id="chia_dotnet_FullBlock_RewardChainSpProof_" data-uid="chia.dotnet.FullBlock.RewardChainSpProof*"></a>
   <h4 id="chia_dotnet_FullBlock_RewardChainSpProof" data-uid="chia.dotnet.FullBlock.RewardChainSpProof">RewardChainSpProof</h4>
@@ -640,24 +458,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_FullBlock_TransactionsGenerator.md&amp;value=---%0Auid%3A%20chia.dotnet.FullBlock.TransactionsGenerator%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_FullBlock_TransactionsGenerator.md&amp;value=---%0Auid%3A%20chia.dotnet.FullBlock.TransactionsGenerator%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_FullBlock_TransactionsGenerator.md&amp;value=---%0Auid%3A%20chia.dotnet.FullBlock.TransactionsGenerator%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/FullBlock.cs/#L49">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/FullBlock.cs/#L49">View Source</a>
   </span>
   <a id="chia_dotnet_FullBlock_TransactionsGenerator_" data-uid="chia.dotnet.FullBlock.TransactionsGenerator*"></a>
   <h4 id="chia_dotnet_FullBlock_TransactionsGenerator" data-uid="chia.dotnet.FullBlock.TransactionsGenerator">TransactionsGenerator</h4>
@@ -685,24 +489,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_FullBlock_TransactionsGeneratorRefList.md&amp;value=---%0Auid%3A%20chia.dotnet.FullBlock.TransactionsGeneratorRefList%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_FullBlock_TransactionsGeneratorRefList.md&amp;value=---%0Auid%3A%20chia.dotnet.FullBlock.TransactionsGeneratorRefList%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_FullBlock_TransactionsGeneratorRefList.md&amp;value=---%0Auid%3A%20chia.dotnet.FullBlock.TransactionsGeneratorRefList%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/FullBlock.cs/#L53">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/FullBlock.cs/#L53">View Source</a>
   </span>
   <a id="chia_dotnet_FullBlock_TransactionsGeneratorRefList_" data-uid="chia.dotnet.FullBlock.TransactionsGeneratorRefList*"></a>
   <h4 id="chia_dotnet_FullBlock_TransactionsGeneratorRefList" data-uid="chia.dotnet.FullBlock.TransactionsGeneratorRefList">TransactionsGeneratorRefList</h4>
@@ -711,21 +501,7 @@ <h4 id="chia_dotnet_FullBlock_TransactionsGeneratorRefList" data-uid="chia.dotne
   <div class="markdown level1 conceptual"></div>
   <h5 class="decalaration">Declaration</h5>
   <div class="codewrapper">
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <pre><code class="lang-csharp hljs">public IEnumerable&lt;uint&gt; TransactionsGeneratorRefList { get; set; }</code></pre>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <pre><code class="lang-csharp hljs">public ICollection&lt;uint&gt; TransactionsGeneratorRefList { get; set; }</code></pre>
-=======
-    <pre><code class="lang-csharp hljs">public IEnumerable&lt;uint&gt; TransactionsGeneratorRefList { get; set; }</code></pre>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </div>
   <h5 class="propertyValue">Property Value</h5>
   <table class="table table-bordered table-striped table-condensed">
@@ -737,45 +513,17 @@ <h5 class="propertyValue">Property Value</h5>
     </thead>
     <tbody>
       <tr>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-        <td><a class="xref" href="https://learn.microsoft.com/dotnet/api/system.collections.generic.ienumerable-1">IEnumerable</a>&lt;<a class="xref" href="https://learn.microsoft.com/dotnet/api/system.uint32">UInt32</a>&gt;</td>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-        <td><a class="xref" href="https://learn.microsoft.com/dotnet/api/system.collections.generic.icollection-1">ICollection</a>&lt;<a class="xref" href="https://learn.microsoft.com/dotnet/api/system.uint32">UInt32</a>&gt;</td>
-=======
         <td><a class="xref" href="https://learn.microsoft.com/dotnet/api/system.collections.generic.ienumerable-1">IEnumerable</a>&lt;<a class="xref" href="https://learn.microsoft.com/dotnet/api/system.uint32">UInt32</a>&gt;</td>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
         <td></td>
       </tr>
     </tbody>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_FullBlock_TransactionsInfo.md&amp;value=---%0Auid%3A%20chia.dotnet.FullBlock.TransactionsInfo%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_FullBlock_TransactionsInfo.md&amp;value=---%0Auid%3A%20chia.dotnet.FullBlock.TransactionsInfo%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_FullBlock_TransactionsInfo.md&amp;value=---%0Auid%3A%20chia.dotnet.FullBlock.TransactionsInfo%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/FullBlock.cs/#L45">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/FullBlock.cs/#L45">View Source</a>
   </span>
   <a id="chia_dotnet_FullBlock_TransactionsInfo_" data-uid="chia.dotnet.FullBlock.TransactionsInfo*"></a>
   <h4 id="chia_dotnet_FullBlock_TransactionsInfo" data-uid="chia.dotnet.FullBlock.TransactionsInfo">TransactionsInfo</h4>
@@ -813,24 +561,10 @@ <h3 id="implements">Implements</h3>
               <div class="contribution">
                 <ul class="nav">
                   <li>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-                    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_FullBlock.md&amp;value=---%0Auid%3A%20chia.dotnet.FullBlock%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-                    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_FullBlock.md&amp;value=---%0Auid%3A%20chia.dotnet.FullBlock%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-=======
                     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_FullBlock.md&amp;value=---%0Auid%3A%20chia.dotnet.FullBlock%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
                   </li>
                   <li>
-                    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/FullBlock.cs/#L10" class="contribution-link">View Source</a>
+                    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/FullBlock.cs/#L10" class="contribution-link">View Source</a>
                   </li>
                 </ul>
               </div>
diff --git a/docs/api/chia.dotnet.FullNodeProxy.html b/docs/api/chia.dotnet.FullNodeProxy.html
index f964a181..f5a732b2 100644
--- a/docs/api/chia.dotnet.FullNodeProxy.html
+++ b/docs/api/chia.dotnet.FullNodeProxy.html
@@ -143,24 +143,10 @@ <h3 id="constructors">Constructors
   </h3>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_FullNodeProxy__ctor_chia_dotnet_IRpcClient_System_String_.md&amp;value=---%0Auid%3A%20chia.dotnet.FullNodeProxy.%23ctor(chia.dotnet.IRpcClient%2CSystem.String)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_FullNodeProxy__ctor_chia_dotnet_IRpcClient_System_String_.md&amp;value=---%0Auid%3A%20chia.dotnet.FullNodeProxy.%23ctor(chia.dotnet.IRpcClient%2CSystem.String)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_FullNodeProxy__ctor_chia_dotnet_IRpcClient_System_String_.md&amp;value=---%0Auid%3A%20chia.dotnet.FullNodeProxy.%23ctor(chia.dotnet.IRpcClient%2CSystem.String)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/FullNodeProxy.cs/#L22">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/FullNodeProxy.cs/#L22">View Source</a>
   </span>
   <a id="chia_dotnet_FullNodeProxy__ctor_" data-uid="chia.dotnet.FullNodeProxy.#ctor*"></a>
   <h4 id="chia_dotnet_FullNodeProxy__ctor_chia_dotnet_IRpcClient_System_String_" data-uid="chia.dotnet.FullNodeProxy.#ctor(chia.dotnet.IRpcClient,System.String)">FullNodeProxy(IRpcClient, String)</h4>
@@ -199,34 +185,10 @@ <h3 id="methods">Methods
   </h3>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_FullNodeProxy_GetAdditionsAndRemovals_System_String_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.FullNodeProxy.GetAdditionsAndRemovals(System.String%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
   </span>
   <span class="small pull-right mobile-hide">
-<<<<<<< HEAD
-    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/FullNodeProxy.cs/#L412">View Source</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_FullNodeProxy_GetAdditionsAndRemovals_System_String_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.FullNodeProxy.GetAdditionsAndRemovals(System.String%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/FullNodeProxy.cs/#L412">View Source</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_FullNodeProxy_GetAdditionsAndRemovals_System_String_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.FullNodeProxy.GetAdditionsAndRemovals(System.String%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/FullNodeProxy.cs/#L412">View Source</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-=======
     <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/FullNodeProxy.cs/#L368">View Source</a>
->>>>>>> main
   </span>
   <a id="chia_dotnet_FullNodeProxy_GetAdditionsAndRemovals_" data-uid="chia.dotnet.FullNodeProxy.GetAdditionsAndRemovals*"></a>
   <h4 id="chia_dotnet_FullNodeProxy_GetAdditionsAndRemovals_System_String_System_Threading_CancellationToken_" data-uid="chia.dotnet.FullNodeProxy.GetAdditionsAndRemovals(System.String,System.Threading.CancellationToken)">GetAdditionsAndRemovals(String, CancellationToken)</h4>
@@ -236,21 +198,7 @@ <h4 id="chia_dotnet_FullNodeProxy_GetAdditionsAndRemovals_System_String_System_T
   <div class="markdown level1 conceptual"></div>
   <h5 class="decalaration">Declaration</h5>
   <div class="codewrapper">
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <pre><code class="lang-csharp hljs">public async Task&lt;(IEnumerable&lt;CoinRecord&gt; Additions, IEnumerable&lt;CoinRecord&gt; Removals)&gt; GetAdditionsAndRemovals(string headerhash, CancellationToken cancellationToken = default(CancellationToken))</code></pre>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <pre><code class="lang-csharp hljs">public async Task&lt;(ICollection&lt;CoinRecord&gt; Additions, ICollection&lt;CoinRecord&gt; Removals)&gt; GetAdditionsAndRemovals(string headerhash, CancellationToken cancellationToken = default(CancellationToken))</code></pre>
-=======
     <pre><code class="lang-csharp hljs">public async Task&lt;(IEnumerable&lt;CoinRecord&gt; Additions, IEnumerable&lt;CoinRecord&gt; Removals)&gt; GetAdditionsAndRemovals(string headerhash, CancellationToken cancellationToken = default(CancellationToken))</code></pre>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </div>
   <h5 class="parameters">Parameters</h5>
   <table class="table table-bordered table-striped table-condensed">
@@ -286,21 +234,7 @@ <h5 class="returns">Returns</h5>
     </thead>
     <tbody>
       <tr>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
         <td><a class="xref" href="https://learn.microsoft.com/dotnet/api/system.threading.tasks.task-1">Task</a>&lt;<a class="xref" href="https://learn.microsoft.com/dotnet/api/system.valuetuple-2">(T1, T2)</a>&lt;<a class="xref" href="https://learn.microsoft.com/dotnet/api/system.collections.generic.ienumerable-1">IEnumerable</a>&lt;<a class="xref" href="chia.dotnet.CoinRecord.html">CoinRecord</a>&gt;, <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.collections.generic.ienumerable-1">IEnumerable</a>&lt;<a class="xref" href="chia.dotnet.CoinRecord.html">CoinRecord</a>&gt;&gt;&gt;</td>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-        <td><a class="xref" href="https://learn.microsoft.com/dotnet/api/system.threading.tasks.task-1">Task</a>&lt;<a class="xref" href="https://learn.microsoft.com/dotnet/api/system.valuetuple-2">(T1, T2)</a>&lt;<a class="xref" href="https://learn.microsoft.com/dotnet/api/system.collections.generic.icollection-1">ICollection</a>&lt;<a class="xref" href="chia.dotnet.CoinRecord.html">CoinRecord</a>&gt;, <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.collections.generic.icollection-1">ICollection</a>&lt;<a class="xref" href="chia.dotnet.CoinRecord.html">CoinRecord</a>&gt;&gt;&gt;</td>
-=======
-        <td><a class="xref" href="https://learn.microsoft.com/dotnet/api/system.threading.tasks.task-1">Task</a>&lt;<a class="xref" href="https://learn.microsoft.com/dotnet/api/system.valuetuple-2">(T1, T2)</a>&lt;<a class="xref" href="https://learn.microsoft.com/dotnet/api/system.collections.generic.ienumerable-1">IEnumerable</a>&lt;<a class="xref" href="chia.dotnet.CoinRecord.html">CoinRecord</a>&gt;, <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.collections.generic.ienumerable-1">IEnumerable</a>&lt;<a class="xref" href="chia.dotnet.CoinRecord.html">CoinRecord</a>&gt;&gt;&gt;</td>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
         <td><p>A list of additions and a list of removals</p>
 </td>
       </tr>
@@ -308,34 +242,10 @@ <h5 class="returns">Returns</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_FullNodeProxy_GetAllMemmpoolTxIds_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.FullNodeProxy.GetAllMemmpoolTxIds(System.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
   </span>
   <span class="small pull-right mobile-hide">
-<<<<<<< HEAD
-    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/FullNodeProxy.cs/#L464">View Source</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_FullNodeProxy_GetAllMemmpoolTxIds_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.FullNodeProxy.GetAllMemmpoolTxIds(System.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/FullNodeProxy.cs/#L464">View Source</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_FullNodeProxy_GetAllMemmpoolTxIds_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.FullNodeProxy.GetAllMemmpoolTxIds(System.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/FullNodeProxy.cs/#L464">View Source</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-=======
     <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/FullNodeProxy.cs/#L420">View Source</a>
->>>>>>> main
   </span>
   <a id="chia_dotnet_FullNodeProxy_GetAllMemmpoolTxIds_" data-uid="chia.dotnet.FullNodeProxy.GetAllMemmpoolTxIds*"></a>
   <h4 id="chia_dotnet_FullNodeProxy_GetAllMemmpoolTxIds_System_Threading_CancellationToken_" data-uid="chia.dotnet.FullNodeProxy.GetAllMemmpoolTxIds(System.Threading.CancellationToken)">GetAllMemmpoolTxIds(CancellationToken)</h4>
@@ -382,34 +292,10 @@ <h5 class="returns">Returns</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_FullNodeProxy_GetAllMempoolItems_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.FullNodeProxy.GetAllMempoolItems(System.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-<<<<<<< HEAD
-    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/FullNodeProxy.cs/#L454">View Source</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_FullNodeProxy_GetAllMempoolItems_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.FullNodeProxy.GetAllMempoolItems(System.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/FullNodeProxy.cs/#L454">View Source</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_FullNodeProxy_GetAllMempoolItems_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.FullNodeProxy.GetAllMempoolItems(System.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/FullNodeProxy.cs/#L454">View Source</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-=======
     <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/FullNodeProxy.cs/#L410">View Source</a>
->>>>>>> main
   </span>
   <a id="chia_dotnet_FullNodeProxy_GetAllMempoolItems_" data-uid="chia.dotnet.FullNodeProxy.GetAllMempoolItems*"></a>
   <h4 id="chia_dotnet_FullNodeProxy_GetAllMempoolItems_System_Threading_CancellationToken_" data-uid="chia.dotnet.FullNodeProxy.GetAllMempoolItems(System.Threading.CancellationToken)">GetAllMempoolItems(CancellationToken)</h4>
@@ -456,34 +342,10 @@ <h5 class="returns">Returns</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_FullNodeProxy_GetAverageBlockTime_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.FullNodeProxy.GetAverageBlockTime(System.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-<<<<<<< HEAD
-    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/FullNodeProxy.cs/#L639">View Source</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_FullNodeProxy_GetAverageBlockTime_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.FullNodeProxy.GetAverageBlockTime(System.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/FullNodeProxy.cs/#L639">View Source</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_FullNodeProxy_GetAverageBlockTime_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.FullNodeProxy.GetAverageBlockTime(System.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/FullNodeProxy.cs/#L639">View Source</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-=======
     <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/FullNodeProxy.cs/#L593">View Source</a>
->>>>>>> main
   </span>
   <a id="chia_dotnet_FullNodeProxy_GetAverageBlockTime_" data-uid="chia.dotnet.FullNodeProxy.GetAverageBlockTime*"></a>
   <h4 id="chia_dotnet_FullNodeProxy_GetAverageBlockTime_System_Threading_CancellationToken_" data-uid="chia.dotnet.FullNodeProxy.GetAverageBlockTime(System.Threading.CancellationToken)">GetAverageBlockTime(CancellationToken)</h4>
@@ -530,24 +392,10 @@ <h5 class="returns">Returns</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_FullNodeProxy_GetBlock_System_String_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.FullNodeProxy.GetBlock(System.String%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_FullNodeProxy_GetBlock_System_String_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.FullNodeProxy.GetBlock(System.String%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_FullNodeProxy_GetBlock_System_String_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.FullNodeProxy.GetBlock(System.String%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/FullNodeProxy.cs/#L53">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/FullNodeProxy.cs/#L53">View Source</a>
   </span>
   <a id="chia_dotnet_FullNodeProxy_GetBlock_" data-uid="chia.dotnet.FullNodeProxy.GetBlock*"></a>
   <h4 id="chia_dotnet_FullNodeProxy_GetBlock_System_String_System_Threading_CancellationToken_" data-uid="chia.dotnet.FullNodeProxy.GetBlock(System.String,System.Threading.CancellationToken)">GetBlock(String, CancellationToken)</h4>
@@ -600,26 +448,10 @@ <h5 class="returns">Returns</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_FullNodeProxy_GetBlockchainState_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.FullNodeProxy.GetBlockchainState(System.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/FullNodeProxy.cs/#L32">View Source</a>
-=======
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_FullNodeProxy_GetBlockchainState_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.FullNodeProxy.GetBlockchainState(System.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
   </span>
   <span class="small pull-right mobile-hide">
     <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/FullNodeProxy.cs/#L32">View Source</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
   </span>
   <a id="chia_dotnet_FullNodeProxy_GetBlockchainState_" data-uid="chia.dotnet.FullNodeProxy.GetBlockchainState*"></a>
   <h4 id="chia_dotnet_FullNodeProxy_GetBlockchainState_System_Threading_CancellationToken_" data-uid="chia.dotnet.FullNodeProxy.GetBlockchainState(System.Threading.CancellationToken)">GetBlockchainState(CancellationToken)</h4>
@@ -666,36 +498,11 @@ <h5 class="returns">Returns</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_FullNodeProxy_GetBlockCountMetrics_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.FullNodeProxy.GetBlockCountMetrics(System.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
   </span>
   <span class="small pull-right mobile-hide">
     <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/FullNodeProxy.cs/#L42">View Source</a>
   </span>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_FullNodeProxy_GetBlockCountMetrics_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.FullNodeProxy.GetBlockCountMetrics(System.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/FullNodeProxy.cs/#L42">View Source</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_FullNodeProxy_GetBlockCountMetrics_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.FullNodeProxy.GetBlockCountMetrics(System.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-<<<<<<< HEAD
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/FullNodeProxy.cs/#L42">View Source</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-=======
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/FullNodeProxy.cs/#L42">View Source</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-  </span>
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
   <a id="chia_dotnet_FullNodeProxy_GetBlockCountMetrics_" data-uid="chia.dotnet.FullNodeProxy.GetBlockCountMetrics*"></a>
   <h4 id="chia_dotnet_FullNodeProxy_GetBlockCountMetrics_System_Threading_CancellationToken_" data-uid="chia.dotnet.FullNodeProxy.GetBlockCountMetrics(System.Threading.CancellationToken)">GetBlockCountMetrics(CancellationToken)</h4>
   <div class="markdown level1 summary"><p>Retrieves aggregate information about blocks.</p>
@@ -741,37 +548,10 @@ <h5 class="returns">Returns</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_FullNodeProxy_GetBlockRecord_System_String_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.FullNodeProxy.GetBlockRecord(System.String%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/FullNodeProxy.cs/#L172">View Source</a>
-=======
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_FullNodeProxy_GetBlockRecord_System_String_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.FullNodeProxy.GetBlockRecord(System.String%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
   </span>
   <span class="small pull-right mobile-hide">
-<<<<<<< HEAD
-    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/FullNodeProxy.cs/#L172">View Source</a>
-<<<<<<< HEAD
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-=======
-<<<<<<< HEAD
-=======
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-=======
     <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/FullNodeProxy.cs/#L165">View Source</a>
->>>>>>> main
   </span>
   <a id="chia_dotnet_FullNodeProxy_GetBlockRecord_" data-uid="chia.dotnet.FullNodeProxy.GetBlockRecord*"></a>
   <h4 id="chia_dotnet_FullNodeProxy_GetBlockRecord_System_String_System_Threading_CancellationToken_" data-uid="chia.dotnet.FullNodeProxy.GetBlockRecord(System.String,System.Threading.CancellationToken)">GetBlockRecord(String, CancellationToken)</h4>
@@ -824,37 +604,10 @@ <h5 class="returns">Returns</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_FullNodeProxy_GetBlockRecordByHeight_System_UInt32_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.FullNodeProxy.GetBlockRecordByHeight(System.UInt32%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/FullNodeProxy.cs/#L191">View Source</a>
-=======
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_FullNodeProxy_GetBlockRecordByHeight_System_UInt32_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.FullNodeProxy.GetBlockRecordByHeight(System.UInt32%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
   </span>
   <span class="small pull-right mobile-hide">
-<<<<<<< HEAD
-    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/FullNodeProxy.cs/#L191">View Source</a>
-<<<<<<< HEAD
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-=======
-<<<<<<< HEAD
-=======
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-=======
     <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/FullNodeProxy.cs/#L184">View Source</a>
->>>>>>> main
   </span>
   <a id="chia_dotnet_FullNodeProxy_GetBlockRecordByHeight_" data-uid="chia.dotnet.FullNodeProxy.GetBlockRecordByHeight*"></a>
   <h4 id="chia_dotnet_FullNodeProxy_GetBlockRecordByHeight_System_UInt32_System_Threading_CancellationToken_" data-uid="chia.dotnet.FullNodeProxy.GetBlockRecordByHeight(System.UInt32,System.Threading.CancellationToken)">GetBlockRecordByHeight(UInt32, CancellationToken)</h4>
@@ -907,37 +660,10 @@ <h5 class="returns">Returns</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_FullNodeProxy_GetBlockRecords_System_UInt32_System_UInt32_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.FullNodeProxy.GetBlockRecords(System.UInt32%2CSystem.UInt32%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/FullNodeProxy.cs/#L206">View Source</a>
-=======
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_FullNodeProxy_GetBlockRecords_System_UInt32_System_UInt32_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.FullNodeProxy.GetBlockRecords(System.UInt32%2CSystem.UInt32%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
   </span>
   <span class="small pull-right mobile-hide">
-<<<<<<< HEAD
-    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/FullNodeProxy.cs/#L206">View Source</a>
-<<<<<<< HEAD
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-=======
-<<<<<<< HEAD
-=======
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-=======
     <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/FullNodeProxy.cs/#L199">View Source</a>
->>>>>>> main
   </span>
   <a id="chia_dotnet_FullNodeProxy_GetBlockRecords_" data-uid="chia.dotnet.FullNodeProxy.GetBlockRecords*"></a>
   <h4 id="chia_dotnet_FullNodeProxy_GetBlockRecords_System_UInt32_System_UInt32_System_Threading_CancellationToken_" data-uid="chia.dotnet.FullNodeProxy.GetBlockRecords(System.UInt32,System.UInt32,System.Threading.CancellationToken)">GetBlockRecords(UInt32, UInt32, CancellationToken)</h4>
@@ -996,33 +722,10 @@ <h5 class="returns">Returns</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_FullNodeProxy_GetBlocks_System_UInt32_System_UInt32_System_Nullable_System_Boolean__System_Nullable_System_Boolean__System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.FullNodeProxy.GetBlocks(System.UInt32%2CSystem.UInt32%2CSystem.Nullable%7BSystem.Boolean%7D%2CSystem.Nullable%7BSystem.Boolean%7D%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/FullNodeProxy.cs/#L74">View Source</a>
-=======
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_FullNodeProxy_GetBlocks_System_UInt32_System_UInt32_System_Nullable_System_Boolean__System_Nullable_System_Boolean__System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.FullNodeProxy.GetBlocks(System.UInt32%2CSystem.UInt32%2CSystem.Nullable%7BSystem.Boolean%7D%2CSystem.Nullable%7BSystem.Boolean%7D%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
   </span>
   <span class="small pull-right mobile-hide">
     <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/FullNodeProxy.cs/#L74">View Source</a>
-<<<<<<< HEAD
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-=======
-<<<<<<< HEAD
-=======
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <a id="chia_dotnet_FullNodeProxy_GetBlocks_" data-uid="chia.dotnet.FullNodeProxy.GetBlocks*"></a>
   <h4 id="chia_dotnet_FullNodeProxy_GetBlocks_System_UInt32_System_UInt32_System_Nullable_System_Boolean__System_Nullable_System_Boolean__System_Threading_CancellationToken_" data-uid="chia.dotnet.FullNodeProxy.GetBlocks(System.UInt32,System.UInt32,System.Nullable{System.Boolean},System.Nullable{System.Boolean},System.Threading.CancellationToken)">GetBlocks(UInt32, UInt32, Nullable&lt;Boolean&gt;, Nullable&lt;Boolean&gt;, CancellationToken)</h4>
@@ -1092,36 +795,11 @@ <h5 class="returns">Returns</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_FullNodeProxy_GetBlockSpends_System_String_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.FullNodeProxy.GetBlockSpends(System.String%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
   </span>
   <span class="small pull-right mobile-hide">
     <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/FullNodeProxy.cs/#L393">View Source</a>
   </span>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_FullNodeProxy_GetBlockSpends_System_String_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.FullNodeProxy.GetBlockSpends(System.String%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/FullNodeProxy.cs/#L437">View Source</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_FullNodeProxy_GetBlockSpends_System_String_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.FullNodeProxy.GetBlockSpends(System.String%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-<<<<<<< HEAD
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/FullNodeProxy.cs/#L437">View Source</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-=======
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/FullNodeProxy.cs/#L437">View Source</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-  </span>
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
   <a id="chia_dotnet_FullNodeProxy_GetBlockSpends_" data-uid="chia.dotnet.FullNodeProxy.GetBlockSpends*"></a>
   <h4 id="chia_dotnet_FullNodeProxy_GetBlockSpends_System_String_System_Threading_CancellationToken_" data-uid="chia.dotnet.FullNodeProxy.GetBlockSpends(System.String,System.Threading.CancellationToken)">GetBlockSpends(String, CancellationToken)</h4>
   <div class="markdown level1 summary"><p>Retrieves every coin that was spent in a block</p>
@@ -1186,37 +864,10 @@ <h5 class="exceptions">Exceptions</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_FullNodeProxy_GetCoinRecordByName_System_String_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.FullNodeProxy.GetCoinRecordByName(System.String%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/FullNodeProxy.cs/#L364">View Source</a>
-=======
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_FullNodeProxy_GetCoinRecordByName_System_String_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.FullNodeProxy.GetCoinRecordByName(System.String%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
   </span>
   <span class="small pull-right mobile-hide">
-<<<<<<< HEAD
-    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/FullNodeProxy.cs/#L364">View Source</a>
-<<<<<<< HEAD
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-=======
-<<<<<<< HEAD
-=======
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-=======
     <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/FullNodeProxy.cs/#L328">View Source</a>
->>>>>>> main
   </span>
   <a id="chia_dotnet_FullNodeProxy_GetCoinRecordByName_" data-uid="chia.dotnet.FullNodeProxy.GetCoinRecordByName*"></a>
   <h4 id="chia_dotnet_FullNodeProxy_GetCoinRecordByName_System_String_System_Threading_CancellationToken_" data-uid="chia.dotnet.FullNodeProxy.GetCoinRecordByName(System.String,System.Threading.CancellationToken)">GetCoinRecordByName(String, CancellationToken)</h4>
@@ -1269,34 +920,10 @@ <h5 class="returns">Returns</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_FullNodeProxy_GetCoinRecordsByHint_System_String_System_Boolean_System_Nullable_System_UInt32__System_Nullable_System_UInt32__System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.FullNodeProxy.GetCoinRecordsByHint(System.String%2CSystem.Boolean%2CSystem.Nullable%7BSystem.UInt32%7D%2CSystem.Nullable%7BSystem.UInt32%7D%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-<<<<<<< HEAD
-    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/FullNodeProxy.cs/#L381">View Source</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_FullNodeProxy_GetCoinRecordsByHint_System_String_System_Boolean_System_Nullable_System_UInt32__System_Nullable_System_UInt32__System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.FullNodeProxy.GetCoinRecordsByHint(System.String%2CSystem.Boolean%2CSystem.Nullable%7BSystem.UInt32%7D%2CSystem.Nullable%7BSystem.UInt32%7D%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/FullNodeProxy.cs/#L381">View Source</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_FullNodeProxy_GetCoinRecordsByHint_System_String_System_Boolean_System_Nullable_System_UInt32__System_Nullable_System_UInt32__System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.FullNodeProxy.GetCoinRecordsByHint(System.String%2CSystem.Boolean%2CSystem.Nullable%7BSystem.UInt32%7D%2CSystem.Nullable%7BSystem.UInt32%7D%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/FullNodeProxy.cs/#L381">View Source</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-=======
     <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/FullNodeProxy.cs/#L345">View Source</a>
->>>>>>> main
   </span>
   <a id="chia_dotnet_FullNodeProxy_GetCoinRecordsByHint_" data-uid="chia.dotnet.FullNodeProxy.GetCoinRecordsByHint*"></a>
   <h4 id="chia_dotnet_FullNodeProxy_GetCoinRecordsByHint_System_String_System_Boolean_System_Nullable_System_UInt32__System_Nullable_System_UInt32__System_Threading_CancellationToken_" data-uid="chia.dotnet.FullNodeProxy.GetCoinRecordsByHint(System.String,System.Boolean,System.Nullable{System.UInt32},System.Nullable{System.UInt32},System.Threading.CancellationToken)">GetCoinRecordsByHint(String, Boolean, Nullable&lt;UInt32&gt;, Nullable&lt;UInt32&gt;, CancellationToken)</h4>
@@ -1367,31 +994,10 @@ <h5 class="returns">Returns</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_FullNodeProxy_GetCoinRecordsByNames_System_Collections_Generic_IEnumerable_System_String__System_Boolean_System_Nullable_System_Int32__System_Nullable_System_Int32__System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.FullNodeProxy.GetCoinRecordsByNames(System.Collections.Generic.IEnumerable%7BSystem.String%7D%2CSystem.Boolean%2CSystem.Nullable%7BSystem.Int32%7D%2CSystem.Nullable%7BSystem.Int32%7D%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_FullNodeProxy_GetCoinRecordsByNames_System_Collections_Generic_IEnumerable_System_String__System_Boolean_System_Nullable_System_Int32__System_Nullable_System_Int32__System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.FullNodeProxy.GetCoinRecordsByNames(System.Collections.Generic.IEnumerable%7BSystem.String%7D%2CSystem.Boolean%2CSystem.Nullable%7BSystem.Int32%7D%2CSystem.Nullable%7BSystem.Int32%7D%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_FullNodeProxy_GetCoinRecordsByNames_System_Collections_Generic_IEnumerable_System_String__System_Boolean_System_Nullable_System_Int32__System_Nullable_System_Int32__System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.FullNodeProxy.GetCoinRecordsByNames(System.Collections.Generic.IEnumerable%7BSystem.String%7D%2CSystem.Boolean%2CSystem.Nullable%7BSystem.Int32%7D%2CSystem.Nullable%7BSystem.Int32%7D%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/FullNodeProxy.cs/#L267">View Source</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_FullNodeProxy_GetCoinRecordsByNames_System_Collections_Generic_IEnumerable_System_String__System_Boolean_System_Nullable_System_UInt32__System_Nullable_System_UInt32__System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.FullNodeProxy.GetCoinRecordsByNames(System.Collections.Generic.IEnumerable%7BSystem.String%7D%2CSystem.Boolean%2CSystem.Nullable%7BSystem.UInt32%7D%2CSystem.Nullable%7BSystem.UInt32%7D%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
   </span>
   <span class="small pull-right mobile-hide">
     <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/FullNodeProxy.cs/#L252">View Source</a>
->>>>>>> main
   </span>
   <a id="chia_dotnet_FullNodeProxy_GetCoinRecordsByNames_" data-uid="chia.dotnet.FullNodeProxy.GetCoinRecordsByNames*"></a>
   <h4 id="chia_dotnet_FullNodeProxy_GetCoinRecordsByNames_System_Collections_Generic_IEnumerable_System_String__System_Boolean_System_Nullable_System_UInt32__System_Nullable_System_UInt32__System_Threading_CancellationToken_" data-uid="chia.dotnet.FullNodeProxy.GetCoinRecordsByNames(System.Collections.Generic.IEnumerable{System.String},System.Boolean,System.Nullable{System.UInt32},System.Nullable{System.UInt32},System.Threading.CancellationToken)">GetCoinRecordsByNames(IEnumerable&lt;String&gt;, Boolean, Nullable&lt;UInt32&gt;, Nullable&lt;UInt32&gt;, CancellationToken)</h4>
@@ -1462,31 +1068,10 @@ <h5 class="returns">Returns</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_FullNodeProxy_GetCoinRecordsByParentIds_System_Collections_Generic_IEnumerable_System_String__System_Boolean_System_Nullable_System_Int32__System_Nullable_System_Int32__System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.FullNodeProxy.GetCoinRecordsByParentIds(System.Collections.Generic.IEnumerable%7BSystem.String%7D%2CSystem.Boolean%2CSystem.Nullable%7BSystem.Int32%7D%2CSystem.Nullable%7BSystem.Int32%7D%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_FullNodeProxy_GetCoinRecordsByParentIds_System_Collections_Generic_IEnumerable_System_String__System_Boolean_System_Nullable_System_Int32__System_Nullable_System_Int32__System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.FullNodeProxy.GetCoinRecordsByParentIds(System.Collections.Generic.IEnumerable%7BSystem.String%7D%2CSystem.Boolean%2CSystem.Nullable%7BSystem.Int32%7D%2CSystem.Nullable%7BSystem.Int32%7D%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_FullNodeProxy_GetCoinRecordsByParentIds_System_Collections_Generic_IEnumerable_System_String__System_Boolean_System_Nullable_System_Int32__System_Nullable_System_Int32__System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.FullNodeProxy.GetCoinRecordsByParentIds(System.Collections.Generic.IEnumerable%7BSystem.String%7D%2CSystem.Boolean%2CSystem.Nullable%7BSystem.Int32%7D%2CSystem.Nullable%7BSystem.Int32%7D%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/FullNodeProxy.cs/#L334">View Source</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_FullNodeProxy_GetCoinRecordsByParentIds_System_Collections_Generic_IEnumerable_System_String__System_Boolean_System_Nullable_System_UInt32__System_Nullable_System_UInt32__System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.FullNodeProxy.GetCoinRecordsByParentIds(System.Collections.Generic.IEnumerable%7BSystem.String%7D%2CSystem.Boolean%2CSystem.Nullable%7BSystem.UInt32%7D%2CSystem.Nullable%7BSystem.UInt32%7D%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
   </span>
   <span class="small pull-right mobile-hide">
     <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/FullNodeProxy.cs/#L305">View Source</a>
->>>>>>> main
   </span>
   <a id="chia_dotnet_FullNodeProxy_GetCoinRecordsByParentIds_" data-uid="chia.dotnet.FullNodeProxy.GetCoinRecordsByParentIds*"></a>
   <h4 id="chia_dotnet_FullNodeProxy_GetCoinRecordsByParentIds_System_Collections_Generic_IEnumerable_System_String__System_Boolean_System_Nullable_System_UInt32__System_Nullable_System_UInt32__System_Threading_CancellationToken_" data-uid="chia.dotnet.FullNodeProxy.GetCoinRecordsByParentIds(System.Collections.Generic.IEnumerable{System.String},System.Boolean,System.Nullable{System.UInt32},System.Nullable{System.UInt32},System.Threading.CancellationToken)">GetCoinRecordsByParentIds(IEnumerable&lt;String&gt;, Boolean, Nullable&lt;UInt32&gt;, Nullable&lt;UInt32&gt;, CancellationToken)</h4>
@@ -1557,28 +1142,10 @@ <h5 class="returns">Returns</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_FullNodeProxy_GetCoinRecordsByPuzzleHash_System_String_System_Boolean_System_Nullable_System_UInt32__System_Nullable_System_UInt32__System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.FullNodeProxy.GetCoinRecordsByPuzzleHash(System.String%2CSystem.Boolean%2CSystem.Nullable%7BSystem.UInt32%7D%2CSystem.Nullable%7BSystem.UInt32%7D%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_FullNodeProxy_GetCoinRecordsByPuzzleHash_System_String_System_Boolean_System_Nullable_System_UInt32__System_Nullable_System_UInt32__System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.FullNodeProxy.GetCoinRecordsByPuzzleHash(System.String%2CSystem.Boolean%2CSystem.Nullable%7BSystem.UInt32%7D%2CSystem.Nullable%7BSystem.UInt32%7D%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_FullNodeProxy_GetCoinRecordsByPuzzleHash_System_String_System_Boolean_System_Nullable_System_UInt32__System_Nullable_System_UInt32__System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.FullNodeProxy.GetCoinRecordsByPuzzleHash(System.String%2CSystem.Boolean%2CSystem.Nullable%7BSystem.UInt32%7D%2CSystem.Nullable%7BSystem.UInt32%7D%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-<<<<<<< HEAD
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/FullNodeProxy.cs/#L234">View Source</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/FullNodeProxy.cs/#L227">View Source</a>
->>>>>>> main
   </span>
   <a id="chia_dotnet_FullNodeProxy_GetCoinRecordsByPuzzleHash_" data-uid="chia.dotnet.FullNodeProxy.GetCoinRecordsByPuzzleHash*"></a>
   <h4 id="chia_dotnet_FullNodeProxy_GetCoinRecordsByPuzzleHash_System_String_System_Boolean_System_Nullable_System_UInt32__System_Nullable_System_UInt32__System_Threading_CancellationToken_" data-uid="chia.dotnet.FullNodeProxy.GetCoinRecordsByPuzzleHash(System.String,System.Boolean,System.Nullable{System.UInt32},System.Nullable{System.UInt32},System.Threading.CancellationToken)">GetCoinRecordsByPuzzleHash(String, Boolean, Nullable&lt;UInt32&gt;, Nullable&lt;UInt32&gt;, CancellationToken)</h4>
@@ -1649,31 +1216,10 @@ <h5 class="returns">Returns</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_FullNodeProxy_GetCoinRecordsByPuzzleHashes_System_Collections_Generic_IEnumerable_System_String__System_Boolean_System_Nullable_System_Int32__System_Nullable_System_Int32__System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.FullNodeProxy.GetCoinRecordsByPuzzleHashes(System.Collections.Generic.IEnumerable%7BSystem.String%7D%2CSystem.Boolean%2CSystem.Nullable%7BSystem.Int32%7D%2CSystem.Nullable%7BSystem.Int32%7D%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_FullNodeProxy_GetCoinRecordsByPuzzleHashes_System_Collections_Generic_IEnumerable_System_String__System_Boolean_System_Nullable_System_Int32__System_Nullable_System_Int32__System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.FullNodeProxy.GetCoinRecordsByPuzzleHashes(System.Collections.Generic.IEnumerable%7BSystem.String%7D%2CSystem.Boolean%2CSystem.Nullable%7BSystem.Int32%7D%2CSystem.Nullable%7BSystem.Int32%7D%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_FullNodeProxy_GetCoinRecordsByPuzzleHashes_System_Collections_Generic_IEnumerable_System_String__System_Boolean_System_Nullable_System_Int32__System_Nullable_System_Int32__System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.FullNodeProxy.GetCoinRecordsByPuzzleHashes(System.Collections.Generic.IEnumerable%7BSystem.String%7D%2CSystem.Boolean%2CSystem.Nullable%7BSystem.Int32%7D%2CSystem.Nullable%7BSystem.Int32%7D%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/FullNodeProxy.cs/#L300">View Source</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_FullNodeProxy_GetCoinRecordsByPuzzleHashes_System_Collections_Generic_IEnumerable_System_String__System_Boolean_System_Nullable_System_UInt32__System_Nullable_System_UInt32__System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.FullNodeProxy.GetCoinRecordsByPuzzleHashes(System.Collections.Generic.IEnumerable%7BSystem.String%7D%2CSystem.Boolean%2CSystem.Nullable%7BSystem.UInt32%7D%2CSystem.Nullable%7BSystem.UInt32%7D%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
   </span>
   <span class="small pull-right mobile-hide">
     <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/FullNodeProxy.cs/#L278">View Source</a>
->>>>>>> main
   </span>
   <a id="chia_dotnet_FullNodeProxy_GetCoinRecordsByPuzzleHashes_" data-uid="chia.dotnet.FullNodeProxy.GetCoinRecordsByPuzzleHashes*"></a>
   <h4 id="chia_dotnet_FullNodeProxy_GetCoinRecordsByPuzzleHashes_System_Collections_Generic_IEnumerable_System_String__System_Boolean_System_Nullable_System_UInt32__System_Nullable_System_UInt32__System_Threading_CancellationToken_" data-uid="chia.dotnet.FullNodeProxy.GetCoinRecordsByPuzzleHashes(System.Collections.Generic.IEnumerable{System.String},System.Boolean,System.Nullable{System.UInt32},System.Nullable{System.UInt32},System.Threading.CancellationToken)">GetCoinRecordsByPuzzleHashes(IEnumerable&lt;String&gt;, Boolean, Nullable&lt;UInt32&gt;, Nullable&lt;UInt32&gt;, CancellationToken)</h4>
@@ -1744,30 +1290,10 @@ <h5 class="returns">Returns</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_FullNodeProxy_GetFeeEstimate_chia_dotnet_SpendBundle_System_Collections_Generic_IEnumerable_System_Int32__System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.FullNodeProxy.GetFeeEstimate(chia.dotnet.SpendBundle%2CSystem.Collections.Generic.IEnumerable%7BSystem.Int32%7D%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/FullNodeProxy.cs/#L99">View Source</a>
-=======
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_FullNodeProxy_GetFeeEstimate_chia_dotnet_SpendBundle_System_Collections_Generic_IEnumerable_System_Int32__System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.FullNodeProxy.GetFeeEstimate(chia.dotnet.SpendBundle%2CSystem.Collections.Generic.IEnumerable%7BSystem.Int32%7D%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
   </span>
   <span class="small pull-right mobile-hide">
-<<<<<<< HEAD
-    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/FullNodeProxy.cs/#L99">View Source</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-=======
     <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/FullNodeProxy.cs/#L92">View Source</a>
->>>>>>> main
   </span>
   <a id="chia_dotnet_FullNodeProxy_GetFeeEstimate_" data-uid="chia.dotnet.FullNodeProxy.GetFeeEstimate*"></a>
   <h4 id="chia_dotnet_FullNodeProxy_GetFeeEstimate_chia_dotnet_SpendBundle_System_Collections_Generic_IEnumerable_System_Int32__System_Threading_CancellationToken_" data-uid="chia.dotnet.FullNodeProxy.GetFeeEstimate(chia.dotnet.SpendBundle,System.Collections.Generic.IEnumerable{System.Int32},System.Threading.CancellationToken)">GetFeeEstimate(SpendBundle, IEnumerable&lt;Int32&gt;, CancellationToken)</h4>
@@ -1826,36 +1352,11 @@ <h5 class="returns">Returns</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_FullNodeProxy_GetFeeEstimate_System_UInt64_System_Collections_Generic_IEnumerable_System_Int32__System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.FullNodeProxy.GetFeeEstimate(System.UInt64%2CSystem.Collections.Generic.IEnumerable%7BSystem.Int32%7D%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
   </span>
   <span class="small pull-right mobile-hide">
     <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/FullNodeProxy.cs/#L129">View Source</a>
   </span>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_FullNodeProxy_GetFeeEstimate_System_UInt64_System_Collections_Generic_IEnumerable_System_Int32__System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.FullNodeProxy.GetFeeEstimate(System.UInt64%2CSystem.Collections.Generic.IEnumerable%7BSystem.Int32%7D%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/FullNodeProxy.cs/#L136">View Source</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_FullNodeProxy_GetFeeEstimate_System_UInt64_System_Collections_Generic_IEnumerable_System_Int32__System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.FullNodeProxy.GetFeeEstimate(System.UInt64%2CSystem.Collections.Generic.IEnumerable%7BSystem.Int32%7D%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-<<<<<<< HEAD
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/FullNodeProxy.cs/#L136">View Source</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-=======
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/FullNodeProxy.cs/#L136">View Source</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-  </span>
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
   <a id="chia_dotnet_FullNodeProxy_GetFeeEstimate_" data-uid="chia.dotnet.FullNodeProxy.GetFeeEstimate*"></a>
   <h4 id="chia_dotnet_FullNodeProxy_GetFeeEstimate_System_UInt64_System_Collections_Generic_IEnumerable_System_Int32__System_Threading_CancellationToken_" data-uid="chia.dotnet.FullNodeProxy.GetFeeEstimate(System.UInt64,System.Collections.Generic.IEnumerable{System.Int32},System.Threading.CancellationToken)">GetFeeEstimate(UInt64, IEnumerable&lt;Int32&gt;, CancellationToken)</h4>
   <div class="markdown level1 summary"><p>Estimate a spend fee</p>
@@ -1912,37 +1413,10 @@ <h5 class="returns">Returns</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_FullNodeProxy_GetMemmpooItemByTxId_System_String_System_Boolean_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.FullNodeProxy.GetMemmpooItemByTxId(System.String%2CSystem.Boolean%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/FullNodeProxy.cs/#L478">View Source</a>
-=======
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_FullNodeProxy_GetMemmpooItemByTxId_System_String_System_Boolean_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.FullNodeProxy.GetMemmpooItemByTxId(System.String%2CSystem.Boolean%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
   </span>
   <span class="small pull-right mobile-hide">
-<<<<<<< HEAD
-    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/FullNodeProxy.cs/#L478">View Source</a>
-<<<<<<< HEAD
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-=======
-<<<<<<< HEAD
-=======
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-=======
     <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/FullNodeProxy.cs/#L432">View Source</a>
->>>>>>> main
   </span>
   <a id="chia_dotnet_FullNodeProxy_GetMemmpooItemByTxId_" data-uid="chia.dotnet.FullNodeProxy.GetMemmpooItemByTxId*"></a>
   <h4 id="chia_dotnet_FullNodeProxy_GetMemmpooItemByTxId_System_String_System_Boolean_System_Threading_CancellationToken_" data-uid="chia.dotnet.FullNodeProxy.GetMemmpooItemByTxId(System.String,System.Boolean,System.Threading.CancellationToken)">GetMemmpooItemByTxId(String, Boolean, CancellationToken)</h4>
@@ -2001,34 +1475,10 @@ <h5 class="returns">Returns</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_FullNodeProxy_GetNetworkInfo_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.FullNodeProxy.GetNetworkInfo(System.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-<<<<<<< HEAD
-    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/FullNodeProxy.cs/#L525">View Source</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_FullNodeProxy_GetNetworkInfo_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.FullNodeProxy.GetNetworkInfo(System.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/FullNodeProxy.cs/#L525">View Source</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_FullNodeProxy_GetNetworkInfo_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.FullNodeProxy.GetNetworkInfo(System.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/FullNodeProxy.cs/#L525">View Source</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-=======
     <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/FullNodeProxy.cs/#L479">View Source</a>
->>>>>>> main
   </span>
   <a id="chia_dotnet_FullNodeProxy_GetNetworkInfo_" data-uid="chia.dotnet.FullNodeProxy.GetNetworkInfo*"></a>
   <h4 id="chia_dotnet_FullNodeProxy_GetNetworkInfo_System_Threading_CancellationToken_" data-uid="chia.dotnet.FullNodeProxy.GetNetworkInfo(System.Threading.CancellationToken)">GetNetworkInfo(CancellationToken)</h4>
@@ -2075,34 +1525,10 @@ <h5 class="returns">Returns</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_FullNodeProxy_GetNetworkSpace_System_String_System_String_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.FullNodeProxy.GetNetworkSpace(System.String%2CSystem.String%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
   </span>
   <span class="small pull-right mobile-hide">
-<<<<<<< HEAD
-    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/FullNodeProxy.cs/#L499">View Source</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_FullNodeProxy_GetNetworkSpace_System_String_System_String_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.FullNodeProxy.GetNetworkSpace(System.String%2CSystem.String%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/FullNodeProxy.cs/#L499">View Source</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_FullNodeProxy_GetNetworkSpace_System_String_System_String_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.FullNodeProxy.GetNetworkSpace(System.String%2CSystem.String%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/FullNodeProxy.cs/#L499">View Source</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-=======
     <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/FullNodeProxy.cs/#L453">View Source</a>
->>>>>>> main
   </span>
   <a id="chia_dotnet_FullNodeProxy_GetNetworkSpace_" data-uid="chia.dotnet.FullNodeProxy.GetNetworkSpace*"></a>
   <h4 id="chia_dotnet_FullNodeProxy_GetNetworkSpace_System_String_System_String_System_Threading_CancellationToken_" data-uid="chia.dotnet.FullNodeProxy.GetNetworkSpace(System.String,System.String,System.Threading.CancellationToken)">GetNetworkSpace(String, String, CancellationToken)</h4>
@@ -2159,34 +1585,10 @@ <h5 class="returns">Returns</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_FullNodeProxy_GetPuzzleAndSolution_System_String_System_UInt32_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.FullNodeProxy.GetPuzzleAndSolution(System.String%2CSystem.UInt32%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-<<<<<<< HEAD
-    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/FullNodeProxy.cs/#L620">View Source</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_FullNodeProxy_GetPuzzleAndSolution_System_String_System_UInt32_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.FullNodeProxy.GetPuzzleAndSolution(System.String%2CSystem.UInt32%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/FullNodeProxy.cs/#L620">View Source</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_FullNodeProxy_GetPuzzleAndSolution_System_String_System_UInt32_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.FullNodeProxy.GetPuzzleAndSolution(System.String%2CSystem.UInt32%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/FullNodeProxy.cs/#L620">View Source</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-=======
     <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/FullNodeProxy.cs/#L574">View Source</a>
->>>>>>> main
   </span>
   <a id="chia_dotnet_FullNodeProxy_GetPuzzleAndSolution_" data-uid="chia.dotnet.FullNodeProxy.GetPuzzleAndSolution*"></a>
   <h4 id="chia_dotnet_FullNodeProxy_GetPuzzleAndSolution_System_String_System_UInt32_System_Threading_CancellationToken_" data-uid="chia.dotnet.FullNodeProxy.GetPuzzleAndSolution(System.String,System.UInt32,System.Threading.CancellationToken)">GetPuzzleAndSolution(String, UInt32, CancellationToken)</h4>
@@ -2248,34 +1650,10 @@ <h5 id="chia_dotnet_FullNodeProxy_GetPuzzleAndSolution_System_String_System_UInt
 </div>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_FullNodeProxy_GetRecentEOS_System_String_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.FullNodeProxy.GetRecentEOS(System.String%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
   </span>
   <span class="small pull-right mobile-hide">
-<<<<<<< HEAD
-    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/FullNodeProxy.cs/#L592">View Source</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_FullNodeProxy_GetRecentEOS_System_String_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.FullNodeProxy.GetRecentEOS(System.String%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/FullNodeProxy.cs/#L592">View Source</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_FullNodeProxy_GetRecentEOS_System_String_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.FullNodeProxy.GetRecentEOS(System.String%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/FullNodeProxy.cs/#L592">View Source</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-=======
     <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/FullNodeProxy.cs/#L546">View Source</a>
->>>>>>> main
   </span>
   <a id="chia_dotnet_FullNodeProxy_GetRecentEOS_" data-uid="chia.dotnet.FullNodeProxy.GetRecentEOS*"></a>
   <h4 id="chia_dotnet_FullNodeProxy_GetRecentEOS_System_String_System_Threading_CancellationToken_" data-uid="chia.dotnet.FullNodeProxy.GetRecentEOS(System.String,System.Threading.CancellationToken)">GetRecentEOS(String, CancellationToken)</h4>
@@ -2328,34 +1706,10 @@ <h5 class="returns">Returns</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_FullNodeProxy_GetRecentSignagePoint_System_String_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.FullNodeProxy.GetRecentSignagePoint(System.String%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
   </span>
   <span class="small pull-right mobile-hide">
-<<<<<<< HEAD
-    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/FullNodeProxy.cs/#L566">View Source</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_FullNodeProxy_GetRecentSignagePoint_System_String_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.FullNodeProxy.GetRecentSignagePoint(System.String%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/FullNodeProxy.cs/#L566">View Source</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_FullNodeProxy_GetRecentSignagePoint_System_String_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.FullNodeProxy.GetRecentSignagePoint(System.String%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/FullNodeProxy.cs/#L566">View Source</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-=======
     <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/FullNodeProxy.cs/#L520">View Source</a>
->>>>>>> main
   </span>
   <a id="chia_dotnet_FullNodeProxy_GetRecentSignagePoint_" data-uid="chia.dotnet.FullNodeProxy.GetRecentSignagePoint*"></a>
   <h4 id="chia_dotnet_FullNodeProxy_GetRecentSignagePoint_System_String_System_Threading_CancellationToken_" data-uid="chia.dotnet.FullNodeProxy.GetRecentSignagePoint(System.String,System.Threading.CancellationToken)">GetRecentSignagePoint(String, CancellationToken)</h4>
@@ -2408,28 +1762,10 @@ <h5 class="returns">Returns</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_FullNodeProxy_GetUnfinishedBlockHeaders_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.FullNodeProxy.GetUnfinishedBlockHeaders(System.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_FullNodeProxy_GetUnfinishedBlockHeaders_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.FullNodeProxy.GetUnfinishedBlockHeaders(System.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_FullNodeProxy_GetUnfinishedBlockHeaders_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.FullNodeProxy.GetUnfinishedBlockHeaders(System.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-<<<<<<< HEAD
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/FullNodeProxy.cs/#L220">View Source</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/FullNodeProxy.cs/#L213">View Source</a>
->>>>>>> main
   </span>
   <a id="chia_dotnet_FullNodeProxy_GetUnfinishedBlockHeaders_" data-uid="chia.dotnet.FullNodeProxy.GetUnfinishedBlockHeaders*"></a>
   <h4 id="chia_dotnet_FullNodeProxy_GetUnfinishedBlockHeaders_System_Threading_CancellationToken_" data-uid="chia.dotnet.FullNodeProxy.GetUnfinishedBlockHeaders(System.Threading.CancellationToken)">GetUnfinishedBlockHeaders(CancellationToken)</h4>
@@ -2476,34 +1812,10 @@ <h5 class="returns">Returns</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_FullNodeProxy_PushTx_chia_dotnet_SpendBundle_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.FullNodeProxy.PushTx(chia.dotnet.SpendBundle%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
   </span>
   <span class="small pull-right mobile-hide">
-<<<<<<< HEAD
-    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/FullNodeProxy.cs/#L539">View Source</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_FullNodeProxy_PushTx_chia_dotnet_SpendBundle_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.FullNodeProxy.PushTx(chia.dotnet.SpendBundle%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/FullNodeProxy.cs/#L539">View Source</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_FullNodeProxy_PushTx_chia_dotnet_SpendBundle_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.FullNodeProxy.PushTx(chia.dotnet.SpendBundle%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/FullNodeProxy.cs/#L539">View Source</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-=======
     <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/FullNodeProxy.cs/#L493">View Source</a>
->>>>>>> main
   </span>
   <a id="chia_dotnet_FullNodeProxy_PushTx_" data-uid="chia.dotnet.FullNodeProxy.PushTx*"></a>
   <h4 id="chia_dotnet_FullNodeProxy_PushTx_chia_dotnet_SpendBundle_System_Threading_CancellationToken_" data-uid="chia.dotnet.FullNodeProxy.PushTx(chia.dotnet.SpendBundle,System.Threading.CancellationToken)">PushTx(SpendBundle, CancellationToken)</h4>
@@ -2562,24 +1874,10 @@ <h5 class="returns">Returns</h5>
               <div class="contribution">
                 <ul class="nav">
                   <li>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-                    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_FullNodeProxy.md&amp;value=---%0Auid%3A%20chia.dotnet.FullNodeProxy%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-                    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_FullNodeProxy.md&amp;value=---%0Auid%3A%20chia.dotnet.FullNodeProxy%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-=======
                     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_FullNodeProxy.md&amp;value=---%0Auid%3A%20chia.dotnet.FullNodeProxy%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
                   </li>
                   <li>
-                    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/FullNodeProxy.cs/#L15" class="contribution-link">View Source</a>
+                    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/FullNodeProxy.cs/#L15" class="contribution-link">View Source</a>
                   </li>
                 </ul>
               </div>
diff --git a/docs/api/chia.dotnet.FungibleAsset.html b/docs/api/chia.dotnet.FungibleAsset.html
index 59e5a86d..fe8333e6 100644
--- a/docs/api/chia.dotnet.FungibleAsset.html
+++ b/docs/api/chia.dotnet.FungibleAsset.html
@@ -90,21 +90,7 @@ <h5>Inherited Members</h5>
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object)">Object.Equals(Object)</a>
     </div>
     <div>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object-system-object)">Object.Equals(Object, Object)</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-      <span class="xref">System.Object.Equals(System.Object, System.Object)</span>
-=======
-      <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object-system-object)">Object.Equals(Object, Object)</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
     </div>
     <div>
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.gethashcode#system-object-gethashcode">Object.GetHashCode()</a>
@@ -132,24 +118,10 @@ <h3 id="properties">Properties
   </h3>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_FungibleAsset_Amount.md&amp;value=---%0Auid%3A%20chia.dotnet.FungibleAsset.Amount%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_FungibleAsset_Amount.md&amp;value=---%0Auid%3A%20chia.dotnet.FungibleAsset.Amount%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_FungibleAsset_Amount.md&amp;value=---%0Auid%3A%20chia.dotnet.FungibleAsset.Amount%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/Asset.cs/#L13">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/Asset.cs/#L13">View Source</a>
   </span>
   <a id="chia_dotnet_FungibleAsset_Amount_" data-uid="chia.dotnet.FungibleAsset.Amount*"></a>
   <h4 id="chia_dotnet_FungibleAsset_Amount" data-uid="chia.dotnet.FungibleAsset.Amount">Amount</h4>
@@ -176,24 +148,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_FungibleAsset_Asset.md&amp;value=---%0Auid%3A%20chia.dotnet.FungibleAsset.Asset%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_FungibleAsset_Asset.md&amp;value=---%0Auid%3A%20chia.dotnet.FungibleAsset.Asset%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_FungibleAsset_Asset.md&amp;value=---%0Auid%3A%20chia.dotnet.FungibleAsset.Asset%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/Asset.cs/#L12">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/Asset.cs/#L12">View Source</a>
   </span>
   <a id="chia_dotnet_FungibleAsset_Asset_" data-uid="chia.dotnet.FungibleAsset.Asset*"></a>
   <h4 id="chia_dotnet_FungibleAsset_Asset" data-uid="chia.dotnet.FungibleAsset.Asset">Asset</h4>
@@ -230,24 +188,10 @@ <h3 id="implements">Implements</h3>
               <div class="contribution">
                 <ul class="nav">
                   <li>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-                    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_FungibleAsset.md&amp;value=---%0Auid%3A%20chia.dotnet.FungibleAsset%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-                    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_FungibleAsset.md&amp;value=---%0Auid%3A%20chia.dotnet.FungibleAsset%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-=======
                     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_FungibleAsset.md&amp;value=---%0Auid%3A%20chia.dotnet.FungibleAsset%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
                   </li>
                   <li>
-                    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/Asset.cs/#L10" class="contribution-link">View Source</a>
+                    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/Asset.cs/#L10" class="contribution-link">View Source</a>
                   </li>
                 </ul>
               </div>
diff --git a/docs/api/chia.dotnet.HarvesterConnection.html b/docs/api/chia.dotnet.HarvesterConnection.html
index 93cc2d2f..aee41e61 100644
--- a/docs/api/chia.dotnet.HarvesterConnection.html
+++ b/docs/api/chia.dotnet.HarvesterConnection.html
@@ -90,21 +90,7 @@ <h5>Inherited Members</h5>
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object)">Object.Equals(Object)</a>
     </div>
     <div>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object-system-object)">Object.Equals(Object, Object)</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-      <span class="xref">System.Object.Equals(System.Object, System.Object)</span>
-=======
-      <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object-system-object)">Object.Equals(Object, Object)</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
     </div>
     <div>
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.gethashcode#system-object-gethashcode">Object.GetHashCode()</a>
@@ -132,24 +118,10 @@ <h3 id="properties">Properties
   </h3>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_HarvesterConnection_Host.md&amp;value=---%0Auid%3A%20chia.dotnet.HarvesterConnection.Host%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_HarvesterConnection_Host.md&amp;value=---%0Auid%3A%20chia.dotnet.HarvesterConnection.Host%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_HarvesterConnection_Host.md&amp;value=---%0Auid%3A%20chia.dotnet.HarvesterConnection.Host%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/HarvesterConnection.cs/#L7">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/HarvesterConnection.cs/#L7">View Source</a>
   </span>
   <a id="chia_dotnet_HarvesterConnection_Host_" data-uid="chia.dotnet.HarvesterConnection.Host*"></a>
   <h4 id="chia_dotnet_HarvesterConnection_Host" data-uid="chia.dotnet.HarvesterConnection.Host">Host</h4>
@@ -176,24 +148,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_HarvesterConnection_IsLocal.md&amp;value=---%0Auid%3A%20chia.dotnet.HarvesterConnection.IsLocal%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_HarvesterConnection_IsLocal.md&amp;value=---%0Auid%3A%20chia.dotnet.HarvesterConnection.IsLocal%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_HarvesterConnection_IsLocal.md&amp;value=---%0Auid%3A%20chia.dotnet.HarvesterConnection.IsLocal%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/HarvesterConnection.cs/#L13">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/HarvesterConnection.cs/#L13">View Source</a>
   </span>
   <a id="chia_dotnet_HarvesterConnection_IsLocal_" data-uid="chia.dotnet.HarvesterConnection.IsLocal*"></a>
   <h4 id="chia_dotnet_HarvesterConnection_IsLocal" data-uid="chia.dotnet.HarvesterConnection.IsLocal">IsLocal</h4>
@@ -222,24 +180,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_HarvesterConnection_NodeId.md&amp;value=---%0Auid%3A%20chia.dotnet.HarvesterConnection.NodeId%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_HarvesterConnection_NodeId.md&amp;value=---%0Auid%3A%20chia.dotnet.HarvesterConnection.NodeId%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_HarvesterConnection_NodeId.md&amp;value=---%0Auid%3A%20chia.dotnet.HarvesterConnection.NodeId%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/HarvesterConnection.cs/#L8">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/HarvesterConnection.cs/#L8">View Source</a>
   </span>
   <a id="chia_dotnet_HarvesterConnection_NodeId_" data-uid="chia.dotnet.HarvesterConnection.NodeId*"></a>
   <h4 id="chia_dotnet_HarvesterConnection_NodeId" data-uid="chia.dotnet.HarvesterConnection.NodeId">NodeId</h4>
@@ -266,24 +210,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_HarvesterConnection_Port.md&amp;value=---%0Auid%3A%20chia.dotnet.HarvesterConnection.Port%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_HarvesterConnection_Port.md&amp;value=---%0Auid%3A%20chia.dotnet.HarvesterConnection.Port%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_HarvesterConnection_Port.md&amp;value=---%0Auid%3A%20chia.dotnet.HarvesterConnection.Port%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/HarvesterConnection.cs/#L9">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/HarvesterConnection.cs/#L9">View Source</a>
   </span>
   <a id="chia_dotnet_HarvesterConnection_Port_" data-uid="chia.dotnet.HarvesterConnection.Port*"></a>
   <h4 id="chia_dotnet_HarvesterConnection_Port" data-uid="chia.dotnet.HarvesterConnection.Port">Port</h4>
@@ -320,24 +250,10 @@ <h3 id="implements">Implements</h3>
               <div class="contribution">
                 <ul class="nav">
                   <li>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-                    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_HarvesterConnection.md&amp;value=---%0Auid%3A%20chia.dotnet.HarvesterConnection%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-                    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_HarvesterConnection.md&amp;value=---%0Auid%3A%20chia.dotnet.HarvesterConnection%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-=======
                     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_HarvesterConnection.md&amp;value=---%0Auid%3A%20chia.dotnet.HarvesterConnection%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
                   </li>
                   <li>
-                    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/HarvesterConnection.cs/#L5" class="contribution-link">View Source</a>
+                    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/HarvesterConnection.cs/#L5" class="contribution-link">View Source</a>
                   </li>
                 </ul>
               </div>
diff --git a/docs/api/chia.dotnet.HarvesterInfo.html b/docs/api/chia.dotnet.HarvesterInfo.html
index 88ef2e24..9b6f1732 100644
--- a/docs/api/chia.dotnet.HarvesterInfo.html
+++ b/docs/api/chia.dotnet.HarvesterInfo.html
@@ -90,21 +90,7 @@ <h5>Inherited Members</h5>
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object)">Object.Equals(Object)</a>
     </div>
     <div>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object-system-object)">Object.Equals(Object, Object)</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-      <span class="xref">System.Object.Equals(System.Object, System.Object)</span>
-=======
-      <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object-system-object)">Object.Equals(Object, Object)</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
     </div>
     <div>
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.gethashcode#system-object-gethashcode">Object.GetHashCode()</a>
@@ -132,24 +118,10 @@ <h3 id="properties">Properties
   </h3>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_HarvesterInfo_Connection.md&amp;value=---%0Auid%3A%20chia.dotnet.HarvesterInfo.Connection%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_HarvesterInfo_Connection.md&amp;value=---%0Auid%3A%20chia.dotnet.HarvesterInfo.Connection%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_HarvesterInfo_Connection.md&amp;value=---%0Auid%3A%20chia.dotnet.HarvesterInfo.Connection%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/HarvesterInfo.cs/#L10">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/HarvesterInfo.cs/#L10">View Source</a>
   </span>
   <a id="chia_dotnet_HarvesterInfo_Connection_" data-uid="chia.dotnet.HarvesterInfo.Connection*"></a>
   <h4 id="chia_dotnet_HarvesterInfo_Connection" data-uid="chia.dotnet.HarvesterInfo.Connection">Connection</h4>
@@ -176,24 +148,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_HarvesterInfo_Duplicates.md&amp;value=---%0Auid%3A%20chia.dotnet.HarvesterInfo.Duplicates%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_HarvesterInfo_Duplicates.md&amp;value=---%0Auid%3A%20chia.dotnet.HarvesterInfo.Duplicates%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_HarvesterInfo_Duplicates.md&amp;value=---%0Auid%3A%20chia.dotnet.HarvesterInfo.Duplicates%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/HarvesterInfo.cs/#L14">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/HarvesterInfo.cs/#L14">View Source</a>
   </span>
   <a id="chia_dotnet_HarvesterInfo_Duplicates_" data-uid="chia.dotnet.HarvesterInfo.Duplicates*"></a>
   <h4 id="chia_dotnet_HarvesterInfo_Duplicates" data-uid="chia.dotnet.HarvesterInfo.Duplicates">Duplicates</h4>
@@ -220,24 +178,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_HarvesterInfo_FailedToOpenFileNames.md&amp;value=---%0Auid%3A%20chia.dotnet.HarvesterInfo.FailedToOpenFileNames%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_HarvesterInfo_FailedToOpenFileNames.md&amp;value=---%0Auid%3A%20chia.dotnet.HarvesterInfo.FailedToOpenFileNames%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_HarvesterInfo_FailedToOpenFileNames.md&amp;value=---%0Auid%3A%20chia.dotnet.HarvesterInfo.FailedToOpenFileNames%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/HarvesterInfo.cs/#L11">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/HarvesterInfo.cs/#L11">View Source</a>
   </span>
   <a id="chia_dotnet_HarvesterInfo_FailedToOpenFileNames_" data-uid="chia.dotnet.HarvesterInfo.FailedToOpenFileNames*"></a>
   <h4 id="chia_dotnet_HarvesterInfo_FailedToOpenFileNames" data-uid="chia.dotnet.HarvesterInfo.FailedToOpenFileNames">FailedToOpenFileNames</h4>
@@ -264,24 +208,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_HarvesterInfo_LastSyncDateTime.md&amp;value=---%0Auid%3A%20chia.dotnet.HarvesterInfo.LastSyncDateTime%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_HarvesterInfo_LastSyncDateTime.md&amp;value=---%0Auid%3A%20chia.dotnet.HarvesterInfo.LastSyncDateTime%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_HarvesterInfo_LastSyncDateTime.md&amp;value=---%0Auid%3A%20chia.dotnet.HarvesterInfo.LastSyncDateTime%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/HarvesterInfo.cs/#L18">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/HarvesterInfo.cs/#L18">View Source</a>
   </span>
   <a id="chia_dotnet_HarvesterInfo_LastSyncDateTime_" data-uid="chia.dotnet.HarvesterInfo.LastSyncDateTime*"></a>
   <h4 id="chia_dotnet_HarvesterInfo_LastSyncDateTime" data-uid="chia.dotnet.HarvesterInfo.LastSyncDateTime">LastSyncDateTime</h4>
@@ -309,24 +239,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_HarvesterInfo_LastSyncTime.md&amp;value=---%0Auid%3A%20chia.dotnet.HarvesterInfo.LastSyncTime%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_HarvesterInfo_LastSyncTime.md&amp;value=---%0Auid%3A%20chia.dotnet.HarvesterInfo.LastSyncTime%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_HarvesterInfo_LastSyncTime.md&amp;value=---%0Auid%3A%20chia.dotnet.HarvesterInfo.LastSyncTime%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/HarvesterInfo.cs/#L17">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/HarvesterInfo.cs/#L17">View Source</a>
   </span>
   <a id="chia_dotnet_HarvesterInfo_LastSyncTime_" data-uid="chia.dotnet.HarvesterInfo.LastSyncTime*"></a>
   <h4 id="chia_dotnet_HarvesterInfo_LastSyncTime" data-uid="chia.dotnet.HarvesterInfo.LastSyncTime">LastSyncTime</h4>
@@ -353,24 +269,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_HarvesterInfo_NoKeyFilenames.md&amp;value=---%0Auid%3A%20chia.dotnet.HarvesterInfo.NoKeyFilenames%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_HarvesterInfo_NoKeyFilenames.md&amp;value=---%0Auid%3A%20chia.dotnet.HarvesterInfo.NoKeyFilenames%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_HarvesterInfo_NoKeyFilenames.md&amp;value=---%0Auid%3A%20chia.dotnet.HarvesterInfo.NoKeyFilenames%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/HarvesterInfo.cs/#L12">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/HarvesterInfo.cs/#L12">View Source</a>
   </span>
   <a id="chia_dotnet_HarvesterInfo_NoKeyFilenames_" data-uid="chia.dotnet.HarvesterInfo.NoKeyFilenames*"></a>
   <h4 id="chia_dotnet_HarvesterInfo_NoKeyFilenames" data-uid="chia.dotnet.HarvesterInfo.NoKeyFilenames">NoKeyFilenames</h4>
@@ -397,24 +299,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_HarvesterInfo_Plots.md&amp;value=---%0Auid%3A%20chia.dotnet.HarvesterInfo.Plots%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_HarvesterInfo_Plots.md&amp;value=---%0Auid%3A%20chia.dotnet.HarvesterInfo.Plots%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_HarvesterInfo_Plots.md&amp;value=---%0Auid%3A%20chia.dotnet.HarvesterInfo.Plots%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/HarvesterInfo.cs/#L13">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/HarvesterInfo.cs/#L13">View Source</a>
   </span>
   <a id="chia_dotnet_HarvesterInfo_Plots_" data-uid="chia.dotnet.HarvesterInfo.Plots*"></a>
   <h4 id="chia_dotnet_HarvesterInfo_Plots" data-uid="chia.dotnet.HarvesterInfo.Plots">Plots</h4>
@@ -441,24 +329,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_HarvesterInfo_Syncing.md&amp;value=---%0Auid%3A%20chia.dotnet.HarvesterInfo.Syncing%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_HarvesterInfo_Syncing.md&amp;value=---%0Auid%3A%20chia.dotnet.HarvesterInfo.Syncing%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_HarvesterInfo_Syncing.md&amp;value=---%0Auid%3A%20chia.dotnet.HarvesterInfo.Syncing%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/HarvesterInfo.cs/#L16">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/HarvesterInfo.cs/#L16">View Source</a>
   </span>
   <a id="chia_dotnet_HarvesterInfo_Syncing_" data-uid="chia.dotnet.HarvesterInfo.Syncing*"></a>
   <h4 id="chia_dotnet_HarvesterInfo_Syncing" data-uid="chia.dotnet.HarvesterInfo.Syncing">Syncing</h4>
@@ -485,24 +359,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_HarvesterInfo_TotalPlotSize.md&amp;value=---%0Auid%3A%20chia.dotnet.HarvesterInfo.TotalPlotSize%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_HarvesterInfo_TotalPlotSize.md&amp;value=---%0Auid%3A%20chia.dotnet.HarvesterInfo.TotalPlotSize%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_HarvesterInfo_TotalPlotSize.md&amp;value=---%0Auid%3A%20chia.dotnet.HarvesterInfo.TotalPlotSize%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/HarvesterInfo.cs/#L15">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/HarvesterInfo.cs/#L15">View Source</a>
   </span>
   <a id="chia_dotnet_HarvesterInfo_TotalPlotSize_" data-uid="chia.dotnet.HarvesterInfo.TotalPlotSize*"></a>
   <h4 id="chia_dotnet_HarvesterInfo_TotalPlotSize" data-uid="chia.dotnet.HarvesterInfo.TotalPlotSize">TotalPlotSize</h4>
@@ -539,24 +399,10 @@ <h3 id="implements">Implements</h3>
               <div class="contribution">
                 <ul class="nav">
                   <li>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-                    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_HarvesterInfo.md&amp;value=---%0Auid%3A%20chia.dotnet.HarvesterInfo%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-                    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_HarvesterInfo.md&amp;value=---%0Auid%3A%20chia.dotnet.HarvesterInfo%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-=======
                     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_HarvesterInfo.md&amp;value=---%0Auid%3A%20chia.dotnet.HarvesterInfo%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
                   </li>
                   <li>
-                    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/HarvesterInfo.cs/#L8" class="contribution-link">View Source</a>
+                    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/HarvesterInfo.cs/#L8" class="contribution-link">View Source</a>
                   </li>
                 </ul>
               </div>
diff --git a/docs/api/chia.dotnet.HarvesterProxy.html b/docs/api/chia.dotnet.HarvesterProxy.html
index 97bc475d..7eb450cc 100644
--- a/docs/api/chia.dotnet.HarvesterProxy.html
+++ b/docs/api/chia.dotnet.HarvesterProxy.html
@@ -143,24 +143,10 @@ <h3 id="constructors">Constructors
   </h3>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_HarvesterProxy__ctor_chia_dotnet_IRpcClient_System_String_.md&amp;value=---%0Auid%3A%20chia.dotnet.HarvesterProxy.%23ctor(chia.dotnet.IRpcClient%2CSystem.String)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_HarvesterProxy__ctor_chia_dotnet_IRpcClient_System_String_.md&amp;value=---%0Auid%3A%20chia.dotnet.HarvesterProxy.%23ctor(chia.dotnet.IRpcClient%2CSystem.String)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_HarvesterProxy__ctor_chia_dotnet_IRpcClient_System_String_.md&amp;value=---%0Auid%3A%20chia.dotnet.HarvesterProxy.%23ctor(chia.dotnet.IRpcClient%2CSystem.String)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/HarvesterProxy.cs/#L19">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/HarvesterProxy.cs/#L19">View Source</a>
   </span>
   <a id="chia_dotnet_HarvesterProxy__ctor_" data-uid="chia.dotnet.HarvesterProxy.#ctor*"></a>
   <h4 id="chia_dotnet_HarvesterProxy__ctor_chia_dotnet_IRpcClient_System_String_" data-uid="chia.dotnet.HarvesterProxy.#ctor(chia.dotnet.IRpcClient,System.String)">HarvesterProxy(IRpcClient, String)</h4>
@@ -199,28 +185,10 @@ <h3 id="methods">Methods
   </h3>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_HarvesterProxy_AddPlotDirectory_System_String_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.HarvesterProxy.AddPlotDirectory(System.String%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_HarvesterProxy_AddPlotDirectory_System_String_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.HarvesterProxy.AddPlotDirectory(System.String%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_HarvesterProxy_AddPlotDirectory_System_String_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.HarvesterProxy.AddPlotDirectory(System.String%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-<<<<<<< HEAD
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/HarvesterProxy.cs/#L78">View Source</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/HarvesterProxy.cs/#L76">View Source</a>
->>>>>>> main
   </span>
   <a id="chia_dotnet_HarvesterProxy_AddPlotDirectory_" data-uid="chia.dotnet.HarvesterProxy.AddPlotDirectory*"></a>
   <h4 id="chia_dotnet_HarvesterProxy_AddPlotDirectory_System_String_System_Threading_CancellationToken_" data-uid="chia.dotnet.HarvesterProxy.AddPlotDirectory(System.String,System.Threading.CancellationToken)">AddPlotDirectory(String, CancellationToken)</h4>
@@ -273,24 +241,10 @@ <h5 class="returns">Returns</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_HarvesterProxy_DeletePlot_System_String_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.HarvesterProxy.DeletePlot(System.String%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_HarvesterProxy_DeletePlot_System_String_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.HarvesterProxy.DeletePlot(System.String%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_HarvesterProxy_DeletePlot_System_String_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.HarvesterProxy.DeletePlot(System.String%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/HarvesterProxy.cs/#L47">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/HarvesterProxy.cs/#L47">View Source</a>
   </span>
   <a id="chia_dotnet_HarvesterProxy_DeletePlot_" data-uid="chia.dotnet.HarvesterProxy.DeletePlot*"></a>
   <h4 id="chia_dotnet_HarvesterProxy_DeletePlot_System_String_System_Threading_CancellationToken_" data-uid="chia.dotnet.HarvesterProxy.DeletePlot(System.String,System.Threading.CancellationToken)">DeletePlot(String, CancellationToken)</h4>
@@ -346,24 +300,10 @@ <h5 id="chia_dotnet_HarvesterProxy_DeletePlot_System_String_System_Threading_Can
 </div>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_HarvesterProxy_GetPlotDirectories_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.HarvesterProxy.GetPlotDirectories(System.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_HarvesterProxy_GetPlotDirectories_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.HarvesterProxy.GetPlotDirectories(System.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_HarvesterProxy_GetPlotDirectories_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.HarvesterProxy.GetPlotDirectories(System.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/HarvesterProxy.cs/#L65">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/HarvesterProxy.cs/#L65">View Source</a>
   </span>
   <a id="chia_dotnet_HarvesterProxy_GetPlotDirectories_" data-uid="chia.dotnet.HarvesterProxy.GetPlotDirectories*"></a>
   <h4 id="chia_dotnet_HarvesterProxy_GetPlotDirectories_System_Threading_CancellationToken_" data-uid="chia.dotnet.HarvesterProxy.GetPlotDirectories(System.Threading.CancellationToken)">GetPlotDirectories(CancellationToken)</h4>
@@ -410,24 +350,10 @@ <h5 class="returns">Returns</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_HarvesterProxy_GetPlots_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.HarvesterProxy.GetPlots(System.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_HarvesterProxy_GetPlots_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.HarvesterProxy.GetPlots(System.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_HarvesterProxy_GetPlots_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.HarvesterProxy.GetPlots(System.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/HarvesterProxy.cs/#L29">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/HarvesterProxy.cs/#L29">View Source</a>
   </span>
   <a id="chia_dotnet_HarvesterProxy_GetPlots_" data-uid="chia.dotnet.HarvesterProxy.GetPlots*"></a>
   <h4 id="chia_dotnet_HarvesterProxy_GetPlots_System_Threading_CancellationToken_" data-uid="chia.dotnet.HarvesterProxy.GetPlots(System.Threading.CancellationToken)">GetPlots(CancellationToken)</h4>
@@ -474,28 +400,10 @@ <h5 class="returns">Returns</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_HarvesterProxy_RefreshPlots_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.HarvesterProxy.RefreshPlots(System.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_HarvesterProxy_RefreshPlots_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.HarvesterProxy.RefreshPlots(System.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_HarvesterProxy_RefreshPlots_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.HarvesterProxy.RefreshPlots(System.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-<<<<<<< HEAD
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/HarvesterProxy.cs/#L115">View Source</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/HarvesterProxy.cs/#L113">View Source</a>
->>>>>>> main
   </span>
   <a id="chia_dotnet_HarvesterProxy_RefreshPlots_" data-uid="chia.dotnet.HarvesterProxy.RefreshPlots*"></a>
   <h4 id="chia_dotnet_HarvesterProxy_RefreshPlots_System_Threading_CancellationToken_" data-uid="chia.dotnet.HarvesterProxy.RefreshPlots(System.Threading.CancellationToken)">RefreshPlots(CancellationToken)</h4>
@@ -542,28 +450,10 @@ <h5 class="returns">Returns</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_HarvesterProxy_RemovePlotDirectory_System_String_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.HarvesterProxy.RemovePlotDirectory(System.String%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_HarvesterProxy_RemovePlotDirectory_System_String_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.HarvesterProxy.RemovePlotDirectory(System.String%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_HarvesterProxy_RemovePlotDirectory_System_String_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.HarvesterProxy.RemovePlotDirectory(System.String%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-<<<<<<< HEAD
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/HarvesterProxy.cs/#L97">View Source</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/HarvesterProxy.cs/#L95">View Source</a>
->>>>>>> main
   </span>
   <a id="chia_dotnet_HarvesterProxy_RemovePlotDirectory_" data-uid="chia.dotnet.HarvesterProxy.RemovePlotDirectory*"></a>
   <h4 id="chia_dotnet_HarvesterProxy_RemovePlotDirectory_System_String_System_Threading_CancellationToken_" data-uid="chia.dotnet.HarvesterProxy.RemovePlotDirectory(System.String,System.Threading.CancellationToken)">RemovePlotDirectory(String, CancellationToken)</h4>
@@ -622,24 +512,10 @@ <h5 class="returns">Returns</h5>
               <div class="contribution">
                 <ul class="nav">
                   <li>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-                    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_HarvesterProxy.md&amp;value=---%0Auid%3A%20chia.dotnet.HarvesterProxy%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-                    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_HarvesterProxy.md&amp;value=---%0Auid%3A%20chia.dotnet.HarvesterProxy%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-=======
                     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_HarvesterProxy.md&amp;value=---%0Auid%3A%20chia.dotnet.HarvesterProxy%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
                   </li>
                   <li>
-                    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/HarvesterProxy.cs/#L12" class="contribution-link">View Source</a>
+                    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/HarvesterProxy.cs/#L12" class="contribution-link">View Source</a>
                   </li>
                 </ul>
               </div>
diff --git a/docs/api/chia.dotnet.HarvesterSummary.html b/docs/api/chia.dotnet.HarvesterSummary.html
index 054ceb31..9496b0d2 100644
--- a/docs/api/chia.dotnet.HarvesterSummary.html
+++ b/docs/api/chia.dotnet.HarvesterSummary.html
@@ -90,21 +90,7 @@ <h5>Inherited Members</h5>
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object)">Object.Equals(Object)</a>
     </div>
     <div>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object-system-object)">Object.Equals(Object, Object)</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-      <span class="xref">System.Object.Equals(System.Object, System.Object)</span>
-=======
-      <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object-system-object)">Object.Equals(Object, Object)</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
     </div>
     <div>
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.gethashcode#system-object-gethashcode">Object.GetHashCode()</a>
@@ -132,24 +118,10 @@ <h3 id="properties">Properties
   </h3>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_HarvesterSummary_Connection.md&amp;value=---%0Auid%3A%20chia.dotnet.HarvesterSummary.Connection%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_HarvesterSummary_Connection.md&amp;value=---%0Auid%3A%20chia.dotnet.HarvesterSummary.Connection%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_HarvesterSummary_Connection.md&amp;value=---%0Auid%3A%20chia.dotnet.HarvesterSummary.Connection%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/HarvesterSummary.cs/#L9">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/HarvesterSummary.cs/#L9">View Source</a>
   </span>
   <a id="chia_dotnet_HarvesterSummary_Connection_" data-uid="chia.dotnet.HarvesterSummary.Connection*"></a>
   <h4 id="chia_dotnet_HarvesterSummary_Connection" data-uid="chia.dotnet.HarvesterSummary.Connection">Connection</h4>
@@ -176,24 +148,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_HarvesterSummary_Duplicates.md&amp;value=---%0Auid%3A%20chia.dotnet.HarvesterSummary.Duplicates%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_HarvesterSummary_Duplicates.md&amp;value=---%0Auid%3A%20chia.dotnet.HarvesterSummary.Duplicates%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_HarvesterSummary_Duplicates.md&amp;value=---%0Auid%3A%20chia.dotnet.HarvesterSummary.Duplicates%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/HarvesterSummary.cs/#L13">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/HarvesterSummary.cs/#L13">View Source</a>
   </span>
   <a id="chia_dotnet_HarvesterSummary_Duplicates_" data-uid="chia.dotnet.HarvesterSummary.Duplicates*"></a>
   <h4 id="chia_dotnet_HarvesterSummary_Duplicates" data-uid="chia.dotnet.HarvesterSummary.Duplicates">Duplicates</h4>
@@ -220,24 +178,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_HarvesterSummary_FailedToOpenFileNames.md&amp;value=---%0Auid%3A%20chia.dotnet.HarvesterSummary.FailedToOpenFileNames%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_HarvesterSummary_FailedToOpenFileNames.md&amp;value=---%0Auid%3A%20chia.dotnet.HarvesterSummary.FailedToOpenFileNames%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_HarvesterSummary_FailedToOpenFileNames.md&amp;value=---%0Auid%3A%20chia.dotnet.HarvesterSummary.FailedToOpenFileNames%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/HarvesterSummary.cs/#L10">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/HarvesterSummary.cs/#L10">View Source</a>
   </span>
   <a id="chia_dotnet_HarvesterSummary_FailedToOpenFileNames_" data-uid="chia.dotnet.HarvesterSummary.FailedToOpenFileNames*"></a>
   <h4 id="chia_dotnet_HarvesterSummary_FailedToOpenFileNames" data-uid="chia.dotnet.HarvesterSummary.FailedToOpenFileNames">FailedToOpenFileNames</h4>
@@ -264,24 +208,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_HarvesterSummary_LastSyncDateTime.md&amp;value=---%0Auid%3A%20chia.dotnet.HarvesterSummary.LastSyncDateTime%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_HarvesterSummary_LastSyncDateTime.md&amp;value=---%0Auid%3A%20chia.dotnet.HarvesterSummary.LastSyncDateTime%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_HarvesterSummary_LastSyncDateTime.md&amp;value=---%0Auid%3A%20chia.dotnet.HarvesterSummary.LastSyncDateTime%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/HarvesterSummary.cs/#L18">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/HarvesterSummary.cs/#L18">View Source</a>
   </span>
   <a id="chia_dotnet_HarvesterSummary_LastSyncDateTime_" data-uid="chia.dotnet.HarvesterSummary.LastSyncDateTime*"></a>
   <h4 id="chia_dotnet_HarvesterSummary_LastSyncDateTime" data-uid="chia.dotnet.HarvesterSummary.LastSyncDateTime">LastSyncDateTime</h4>
@@ -309,24 +239,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_HarvesterSummary_LastSyncTime.md&amp;value=---%0Auid%3A%20chia.dotnet.HarvesterSummary.LastSyncTime%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_HarvesterSummary_LastSyncTime.md&amp;value=---%0Auid%3A%20chia.dotnet.HarvesterSummary.LastSyncTime%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_HarvesterSummary_LastSyncTime.md&amp;value=---%0Auid%3A%20chia.dotnet.HarvesterSummary.LastSyncTime%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/HarvesterSummary.cs/#L17">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/HarvesterSummary.cs/#L17">View Source</a>
   </span>
   <a id="chia_dotnet_HarvesterSummary_LastSyncTime_" data-uid="chia.dotnet.HarvesterSummary.LastSyncTime*"></a>
   <h4 id="chia_dotnet_HarvesterSummary_LastSyncTime" data-uid="chia.dotnet.HarvesterSummary.LastSyncTime">LastSyncTime</h4>
@@ -353,24 +269,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_HarvesterSummary_NoKeyFilenames.md&amp;value=---%0Auid%3A%20chia.dotnet.HarvesterSummary.NoKeyFilenames%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_HarvesterSummary_NoKeyFilenames.md&amp;value=---%0Auid%3A%20chia.dotnet.HarvesterSummary.NoKeyFilenames%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_HarvesterSummary_NoKeyFilenames.md&amp;value=---%0Auid%3A%20chia.dotnet.HarvesterSummary.NoKeyFilenames%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/HarvesterSummary.cs/#L12">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/HarvesterSummary.cs/#L12">View Source</a>
   </span>
   <a id="chia_dotnet_HarvesterSummary_NoKeyFilenames_" data-uid="chia.dotnet.HarvesterSummary.NoKeyFilenames*"></a>
   <h4 id="chia_dotnet_HarvesterSummary_NoKeyFilenames" data-uid="chia.dotnet.HarvesterSummary.NoKeyFilenames">NoKeyFilenames</h4>
@@ -397,24 +299,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_HarvesterSummary_NotFoundFileNames.md&amp;value=---%0Auid%3A%20chia.dotnet.HarvesterSummary.NotFoundFileNames%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_HarvesterSummary_NotFoundFileNames.md&amp;value=---%0Auid%3A%20chia.dotnet.HarvesterSummary.NotFoundFileNames%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_HarvesterSummary_NotFoundFileNames.md&amp;value=---%0Auid%3A%20chia.dotnet.HarvesterSummary.NotFoundFileNames%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/HarvesterSummary.cs/#L11">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/HarvesterSummary.cs/#L11">View Source</a>
   </span>
   <a id="chia_dotnet_HarvesterSummary_NotFoundFileNames_" data-uid="chia.dotnet.HarvesterSummary.NotFoundFileNames*"></a>
   <h4 id="chia_dotnet_HarvesterSummary_NotFoundFileNames" data-uid="chia.dotnet.HarvesterSummary.NotFoundFileNames">NotFoundFileNames</h4>
@@ -441,24 +329,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_HarvesterSummary_Plots.md&amp;value=---%0Auid%3A%20chia.dotnet.HarvesterSummary.Plots%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_HarvesterSummary_Plots.md&amp;value=---%0Auid%3A%20chia.dotnet.HarvesterSummary.Plots%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_HarvesterSummary_Plots.md&amp;value=---%0Auid%3A%20chia.dotnet.HarvesterSummary.Plots%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/HarvesterSummary.cs/#L14">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/HarvesterSummary.cs/#L14">View Source</a>
   </span>
   <a id="chia_dotnet_HarvesterSummary_Plots_" data-uid="chia.dotnet.HarvesterSummary.Plots*"></a>
   <h4 id="chia_dotnet_HarvesterSummary_Plots" data-uid="chia.dotnet.HarvesterSummary.Plots">Plots</h4>
@@ -485,24 +359,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_HarvesterSummary_Syncing.md&amp;value=---%0Auid%3A%20chia.dotnet.HarvesterSummary.Syncing%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_HarvesterSummary_Syncing.md&amp;value=---%0Auid%3A%20chia.dotnet.HarvesterSummary.Syncing%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_HarvesterSummary_Syncing.md&amp;value=---%0Auid%3A%20chia.dotnet.HarvesterSummary.Syncing%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/HarvesterSummary.cs/#L16">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/HarvesterSummary.cs/#L16">View Source</a>
   </span>
   <a id="chia_dotnet_HarvesterSummary_Syncing_" data-uid="chia.dotnet.HarvesterSummary.Syncing*"></a>
   <h4 id="chia_dotnet_HarvesterSummary_Syncing" data-uid="chia.dotnet.HarvesterSummary.Syncing">Syncing</h4>
@@ -529,24 +389,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_HarvesterSummary_TotalPlotSize.md&amp;value=---%0Auid%3A%20chia.dotnet.HarvesterSummary.TotalPlotSize%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_HarvesterSummary_TotalPlotSize.md&amp;value=---%0Auid%3A%20chia.dotnet.HarvesterSummary.TotalPlotSize%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_HarvesterSummary_TotalPlotSize.md&amp;value=---%0Auid%3A%20chia.dotnet.HarvesterSummary.TotalPlotSize%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/HarvesterSummary.cs/#L15">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/HarvesterSummary.cs/#L15">View Source</a>
   </span>
   <a id="chia_dotnet_HarvesterSummary_TotalPlotSize_" data-uid="chia.dotnet.HarvesterSummary.TotalPlotSize*"></a>
   <h4 id="chia_dotnet_HarvesterSummary_TotalPlotSize" data-uid="chia.dotnet.HarvesterSummary.TotalPlotSize">TotalPlotSize</h4>
@@ -583,24 +429,10 @@ <h3 id="implements">Implements</h3>
               <div class="contribution">
                 <ul class="nav">
                   <li>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-                    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_HarvesterSummary.md&amp;value=---%0Auid%3A%20chia.dotnet.HarvesterSummary%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-                    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_HarvesterSummary.md&amp;value=---%0Auid%3A%20chia.dotnet.HarvesterSummary%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-=======
                     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_HarvesterSummary.md&amp;value=---%0Auid%3A%20chia.dotnet.HarvesterSummary%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
                   </li>
                   <li>
-                    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/HarvesterSummary.cs/#L7" class="contribution-link">View Source</a>
+                    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/HarvesterSummary.cs/#L7" class="contribution-link">View Source</a>
                   </li>
                 </ul>
               </div>
diff --git a/docs/api/chia.dotnet.HarvesterSync.html b/docs/api/chia.dotnet.HarvesterSync.html
index 99c23296..a8286580 100644
--- a/docs/api/chia.dotnet.HarvesterSync.html
+++ b/docs/api/chia.dotnet.HarvesterSync.html
@@ -90,21 +90,7 @@ <h5>Inherited Members</h5>
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object)">Object.Equals(Object)</a>
     </div>
     <div>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object-system-object)">Object.Equals(Object, Object)</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-      <span class="xref">System.Object.Equals(System.Object, System.Object)</span>
-=======
-      <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object-system-object)">Object.Equals(Object, Object)</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
     </div>
     <div>
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.gethashcode#system-object-gethashcode">Object.GetHashCode()</a>
@@ -132,24 +118,10 @@ <h3 id="properties">Properties
   </h3>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_HarvesterSync_Initial.md&amp;value=---%0Auid%3A%20chia.dotnet.HarvesterSync.Initial%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_HarvesterSync_Initial.md&amp;value=---%0Auid%3A%20chia.dotnet.HarvesterSync.Initial%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_HarvesterSync_Initial.md&amp;value=---%0Auid%3A%20chia.dotnet.HarvesterSync.Initial%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/HarvesterSync.cs/#L5">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/HarvesterSync.cs/#L5">View Source</a>
   </span>
   <a id="chia_dotnet_HarvesterSync_Initial_" data-uid="chia.dotnet.HarvesterSync.Initial*"></a>
   <h4 id="chia_dotnet_HarvesterSync_Initial" data-uid="chia.dotnet.HarvesterSync.Initial">Initial</h4>
@@ -176,24 +148,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_HarvesterSync_PlotFilesProcessed.md&amp;value=---%0Auid%3A%20chia.dotnet.HarvesterSync.PlotFilesProcessed%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_HarvesterSync_PlotFilesProcessed.md&amp;value=---%0Auid%3A%20chia.dotnet.HarvesterSync.PlotFilesProcessed%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_HarvesterSync_PlotFilesProcessed.md&amp;value=---%0Auid%3A%20chia.dotnet.HarvesterSync.PlotFilesProcessed%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/HarvesterSync.cs/#L6">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/HarvesterSync.cs/#L6">View Source</a>
   </span>
   <a id="chia_dotnet_HarvesterSync_PlotFilesProcessed_" data-uid="chia.dotnet.HarvesterSync.PlotFilesProcessed*"></a>
   <h4 id="chia_dotnet_HarvesterSync_PlotFilesProcessed" data-uid="chia.dotnet.HarvesterSync.PlotFilesProcessed">PlotFilesProcessed</h4>
@@ -220,24 +178,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_HarvesterSync_PlotFilesTotal.md&amp;value=---%0Auid%3A%20chia.dotnet.HarvesterSync.PlotFilesTotal%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_HarvesterSync_PlotFilesTotal.md&amp;value=---%0Auid%3A%20chia.dotnet.HarvesterSync.PlotFilesTotal%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_HarvesterSync_PlotFilesTotal.md&amp;value=---%0Auid%3A%20chia.dotnet.HarvesterSync.PlotFilesTotal%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/HarvesterSync.cs/#L7">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/HarvesterSync.cs/#L7">View Source</a>
   </span>
   <a id="chia_dotnet_HarvesterSync_PlotFilesTotal_" data-uid="chia.dotnet.HarvesterSync.PlotFilesTotal*"></a>
   <h4 id="chia_dotnet_HarvesterSync_PlotFilesTotal" data-uid="chia.dotnet.HarvesterSync.PlotFilesTotal">PlotFilesTotal</h4>
@@ -274,24 +218,10 @@ <h3 id="implements">Implements</h3>
               <div class="contribution">
                 <ul class="nav">
                   <li>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-                    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_HarvesterSync.md&amp;value=---%0Auid%3A%20chia.dotnet.HarvesterSync%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-                    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_HarvesterSync.md&amp;value=---%0Auid%3A%20chia.dotnet.HarvesterSync%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-=======
                     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_HarvesterSync.md&amp;value=---%0Auid%3A%20chia.dotnet.HarvesterSync%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
                   </li>
                   <li>
-                    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/HarvesterSync.cs/#L3" class="contribution-link">View Source</a>
+                    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/HarvesterSync.cs/#L3" class="contribution-link">View Source</a>
                   </li>
                 </ul>
               </div>
diff --git a/docs/api/chia.dotnet.HashFilter.html b/docs/api/chia.dotnet.HashFilter.html
index 7a668568..aaf6198e 100644
--- a/docs/api/chia.dotnet.HashFilter.html
+++ b/docs/api/chia.dotnet.HashFilter.html
@@ -90,21 +90,7 @@ <h5>Inherited Members</h5>
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object)">Object.Equals(Object)</a>
     </div>
     <div>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object-system-object)">Object.Equals(Object, Object)</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-      <span class="xref">System.Object.Equals(System.Object, System.Object)</span>
-=======
-      <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object-system-object)">Object.Equals(Object, Object)</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
     </div>
     <div>
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.gethashcode#system-object-gethashcode">Object.GetHashCode()</a>
@@ -132,24 +118,10 @@ <h3 id="properties">Properties
   </h3>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_HashFilter_Mode.md&amp;value=---%0Auid%3A%20chia.dotnet.HashFilter.Mode%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_HashFilter_Mode.md&amp;value=---%0Auid%3A%20chia.dotnet.HashFilter.Mode%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_HashFilter_Mode.md&amp;value=---%0Auid%3A%20chia.dotnet.HashFilter.Mode%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/HashFilter.cs/#L9">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/HashFilter.cs/#L9">View Source</a>
   </span>
   <a id="chia_dotnet_HashFilter_Mode_" data-uid="chia.dotnet.HashFilter.Mode*"></a>
   <h4 id="chia_dotnet_HashFilter_Mode" data-uid="chia.dotnet.HashFilter.Mode">Mode</h4>
@@ -176,24 +148,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_HashFilter_Values.md&amp;value=---%0Auid%3A%20chia.dotnet.HashFilter.Values%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_HashFilter_Values.md&amp;value=---%0Auid%3A%20chia.dotnet.HashFilter.Values%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_HashFilter_Values.md&amp;value=---%0Auid%3A%20chia.dotnet.HashFilter.Values%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/HashFilter.cs/#L7">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/HashFilter.cs/#L7">View Source</a>
   </span>
   <a id="chia_dotnet_HashFilter_Values_" data-uid="chia.dotnet.HashFilter.Values*"></a>
   <h4 id="chia_dotnet_HashFilter_Values" data-uid="chia.dotnet.HashFilter.Values">Values</h4>
@@ -230,24 +188,10 @@ <h3 id="implements">Implements</h3>
               <div class="contribution">
                 <ul class="nav">
                   <li>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-                    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_HashFilter.md&amp;value=---%0Auid%3A%20chia.dotnet.HashFilter%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-                    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_HashFilter.md&amp;value=---%0Auid%3A%20chia.dotnet.HashFilter%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-=======
                     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_HashFilter.md&amp;value=---%0Auid%3A%20chia.dotnet.HashFilter%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
                   </li>
                   <li>
-                    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/HashFilter.cs/#L5" class="contribution-link">View Source</a>
+                    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/HashFilter.cs/#L5" class="contribution-link">View Source</a>
                   </li>
                 </ul>
               </div>
diff --git a/docs/api/chia.dotnet.HttpRpcClient.html b/docs/api/chia.dotnet.HttpRpcClient.html
index bf0f5c42..26cb191f 100644
--- a/docs/api/chia.dotnet.HttpRpcClient.html
+++ b/docs/api/chia.dotnet.HttpRpcClient.html
@@ -92,21 +92,7 @@ <h5>Inherited Members</h5>
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object)">Object.Equals(Object)</a>
     </div>
     <div>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object-system-object)">Object.Equals(Object, Object)</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-      <span class="xref">System.Object.Equals(System.Object, System.Object)</span>
-=======
-      <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object-system-object)">Object.Equals(Object, Object)</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
     </div>
     <div>
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.gethashcode#system-object-gethashcode">Object.GetHashCode()</a>
@@ -134,24 +120,10 @@ <h3 id="constructors">Constructors
   </h3>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_HttpRpcClient__ctor_chia_dotnet_EndpointInfo_.md&amp;value=---%0Auid%3A%20chia.dotnet.HttpRpcClient.%23ctor(chia.dotnet.EndpointInfo)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_HttpRpcClient__ctor_chia_dotnet_EndpointInfo_.md&amp;value=---%0Auid%3A%20chia.dotnet.HttpRpcClient.%23ctor(chia.dotnet.EndpointInfo)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_HttpRpcClient__ctor_chia_dotnet_EndpointInfo_.md&amp;value=---%0Auid%3A%20chia.dotnet.HttpRpcClient.%23ctor(chia.dotnet.EndpointInfo)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/HttpRpcClient.cs/#L25">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/HttpRpcClient.cs/#L25">View Source</a>
   </span>
   <a id="chia_dotnet_HttpRpcClient__ctor_" data-uid="chia.dotnet.HttpRpcClient.#ctor*"></a>
   <h4 id="chia_dotnet_HttpRpcClient__ctor_chia_dotnet_EndpointInfo_" data-uid="chia.dotnet.HttpRpcClient.#ctor(chia.dotnet.EndpointInfo)">HttpRpcClient(EndpointInfo)</h4>
@@ -184,24 +156,10 @@ <h3 id="properties">Properties
   </h3>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_HttpRpcClient_Endpoint.md&amp;value=---%0Auid%3A%20chia.dotnet.HttpRpcClient.Endpoint%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_HttpRpcClient_Endpoint.md&amp;value=---%0Auid%3A%20chia.dotnet.HttpRpcClient.Endpoint%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_HttpRpcClient_Endpoint.md&amp;value=---%0Auid%3A%20chia.dotnet.HttpRpcClient.Endpoint%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/HttpRpcClient.cs/#L42">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/HttpRpcClient.cs/#L42">View Source</a>
   </span>
   <a id="chia_dotnet_HttpRpcClient_Endpoint_" data-uid="chia.dotnet.HttpRpcClient.Endpoint*"></a>
   <h4 id="chia_dotnet_HttpRpcClient_Endpoint" data-uid="chia.dotnet.HttpRpcClient.Endpoint">Endpoint</h4>
@@ -231,24 +189,10 @@ <h3 id="methods">Methods
   </h3>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_HttpRpcClient_Dispose.md&amp;value=---%0Auid%3A%20chia.dotnet.HttpRpcClient.Dispose%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_HttpRpcClient_Dispose.md&amp;value=---%0Auid%3A%20chia.dotnet.HttpRpcClient.Dispose%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_HttpRpcClient_Dispose.md&amp;value=---%0Auid%3A%20chia.dotnet.HttpRpcClient.Dispose%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/HttpRpcClient.cs/#L138">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/HttpRpcClient.cs/#L138">View Source</a>
   </span>
   <a id="chia_dotnet_HttpRpcClient_Dispose_" data-uid="chia.dotnet.HttpRpcClient.Dispose*"></a>
   <h4 id="chia_dotnet_HttpRpcClient_Dispose" data-uid="chia.dotnet.HttpRpcClient.Dispose">Dispose()</h4>
@@ -261,24 +205,10 @@ <h5 class="decalaration">Declaration</h5>
   </div>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_HttpRpcClient_Dispose_System_Boolean_.md&amp;value=---%0Auid%3A%20chia.dotnet.HttpRpcClient.Dispose(System.Boolean)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_HttpRpcClient_Dispose_System_Boolean_.md&amp;value=---%0Auid%3A%20chia.dotnet.HttpRpcClient.Dispose(System.Boolean)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_HttpRpcClient_Dispose_System_Boolean_.md&amp;value=---%0Auid%3A%20chia.dotnet.HttpRpcClient.Dispose(System.Boolean)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/HttpRpcClient.cs/#L122">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/HttpRpcClient.cs/#L122">View Source</a>
   </span>
   <a id="chia_dotnet_HttpRpcClient_Dispose_" data-uid="chia.dotnet.HttpRpcClient.Dispose*"></a>
   <h4 id="chia_dotnet_HttpRpcClient_Dispose_System_Boolean_" data-uid="chia.dotnet.HttpRpcClient.Dispose(System.Boolean)">Dispose(Boolean)</h4>
@@ -309,24 +239,10 @@ <h5 class="parameters">Parameters</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_HttpRpcClient_PostMessage_chia_dotnet_Message_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.HttpRpcClient.PostMessage(chia.dotnet.Message%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_HttpRpcClient_PostMessage_chia_dotnet_Message_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.HttpRpcClient.PostMessage(chia.dotnet.Message%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_HttpRpcClient_PostMessage_chia_dotnet_Message_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.HttpRpcClient.PostMessage(chia.dotnet.Message%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/HttpRpcClient.cs/#L51">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/HttpRpcClient.cs/#L51">View Source</a>
   </span>
   <a id="chia_dotnet_HttpRpcClient_PostMessage_" data-uid="chia.dotnet.HttpRpcClient.PostMessage*"></a>
   <h4 id="chia_dotnet_HttpRpcClient_PostMessage_chia_dotnet_Message_System_Threading_CancellationToken_" data-uid="chia.dotnet.HttpRpcClient.PostMessage(chia.dotnet.Message,System.Threading.CancellationToken)">PostMessage(Message, CancellationToken)</h4>
@@ -382,24 +298,10 @@ <h5 id="chia_dotnet_HttpRpcClient_PostMessage_chia_dotnet_Message_System_Threadi
 </div>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_HttpRpcClient_SendMessage_chia_dotnet_Message_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.HttpRpcClient.SendMessage(chia.dotnet.Message%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_HttpRpcClient_SendMessage_chia_dotnet_Message_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.HttpRpcClient.SendMessage(chia.dotnet.Message%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_HttpRpcClient_SendMessage_chia_dotnet_Message_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.HttpRpcClient.SendMessage(chia.dotnet.Message%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/HttpRpcClient.cs/#L75">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/HttpRpcClient.cs/#L75">View Source</a>
   </span>
   <a id="chia_dotnet_HttpRpcClient_SendMessage_" data-uid="chia.dotnet.HttpRpcClient.SendMessage*"></a>
   <h4 id="chia_dotnet_HttpRpcClient_SendMessage_chia_dotnet_Message_System_Threading_CancellationToken_" data-uid="chia.dotnet.HttpRpcClient.SendMessage(chia.dotnet.Message,System.Threading.CancellationToken)">SendMessage(Message, CancellationToken)</h4>
@@ -484,24 +386,10 @@ <h3 id="implements">Implements</h3>
               <div class="contribution">
                 <ul class="nav">
                   <li>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-                    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_HttpRpcClient.md&amp;value=---%0Auid%3A%20chia.dotnet.HttpRpcClient%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-                    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_HttpRpcClient.md&amp;value=---%0Auid%3A%20chia.dotnet.HttpRpcClient%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-=======
                     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_HttpRpcClient.md&amp;value=---%0Auid%3A%20chia.dotnet.HttpRpcClient%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
                   </li>
                   <li>
-                    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/HttpRpcClient.cs/#L15" class="contribution-link">View Source</a>
+                    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/HttpRpcClient.cs/#L15" class="contribution-link">View Source</a>
                   </li>
                 </ul>
               </div>
diff --git a/docs/api/chia.dotnet.IRpcClient.html b/docs/api/chia.dotnet.IRpcClient.html
index 08d03a80..27cb2452 100644
--- a/docs/api/chia.dotnet.IRpcClient.html
+++ b/docs/api/chia.dotnet.IRpcClient.html
@@ -92,24 +92,10 @@ <h3 id="properties">Properties
   </h3>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_IRpcClient_Endpoint.md&amp;value=---%0Auid%3A%20chia.dotnet.IRpcClient.Endpoint%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_IRpcClient_Endpoint.md&amp;value=---%0Auid%3A%20chia.dotnet.IRpcClient.Endpoint%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_IRpcClient_Endpoint.md&amp;value=---%0Auid%3A%20chia.dotnet.IRpcClient.Endpoint%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/IRpcClient.cs/#L15">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/IRpcClient.cs/#L15">View Source</a>
   </span>
   <a id="chia_dotnet_IRpcClient_Endpoint_" data-uid="chia.dotnet.IRpcClient.Endpoint*"></a>
   <h4 id="chia_dotnet_IRpcClient_Endpoint" data-uid="chia.dotnet.IRpcClient.Endpoint">Endpoint</h4>
@@ -139,24 +125,10 @@ <h3 id="methods">Methods
   </h3>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_IRpcClient_PostMessage_chia_dotnet_Message_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.IRpcClient.PostMessage(chia.dotnet.Message%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_IRpcClient_PostMessage_chia_dotnet_Message_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.IRpcClient.PostMessage(chia.dotnet.Message%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_IRpcClient_PostMessage_chia_dotnet_Message_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.IRpcClient.PostMessage(chia.dotnet.Message%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/IRpcClient.cs/#L24">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/IRpcClient.cs/#L24">View Source</a>
   </span>
   <a id="chia_dotnet_IRpcClient_PostMessage_" data-uid="chia.dotnet.IRpcClient.PostMessage*"></a>
   <h4 id="chia_dotnet_IRpcClient_PostMessage_chia_dotnet_Message_System_Threading_CancellationToken_" data-uid="chia.dotnet.IRpcClient.PostMessage(chia.dotnet.Message,System.Threading.CancellationToken)">PostMessage(Message, CancellationToken)</h4>
@@ -212,24 +184,10 @@ <h5 id="chia_dotnet_IRpcClient_PostMessage_chia_dotnet_Message_System_Threading_
 </div>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_IRpcClient_SendMessage_chia_dotnet_Message_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.IRpcClient.SendMessage(chia.dotnet.Message%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_IRpcClient_SendMessage_chia_dotnet_Message_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.IRpcClient.SendMessage(chia.dotnet.Message%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_IRpcClient_SendMessage_chia_dotnet_Message_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.IRpcClient.SendMessage(chia.dotnet.Message%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/IRpcClient.cs/#L34">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/IRpcClient.cs/#L34">View Source</a>
   </span>
   <a id="chia_dotnet_IRpcClient_SendMessage_" data-uid="chia.dotnet.IRpcClient.SendMessage*"></a>
   <h4 id="chia_dotnet_IRpcClient_SendMessage_chia_dotnet_Message_System_Threading_CancellationToken_" data-uid="chia.dotnet.IRpcClient.SendMessage(chia.dotnet.Message,System.Threading.CancellationToken)">SendMessage(Message, CancellationToken)</h4>
@@ -307,24 +265,10 @@ <h5 class="exceptions">Exceptions</h5>
               <div class="contribution">
                 <ul class="nav">
                   <li>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-                    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_IRpcClient.md&amp;value=---%0Auid%3A%20chia.dotnet.IRpcClient%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-                    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_IRpcClient.md&amp;value=---%0Auid%3A%20chia.dotnet.IRpcClient%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-=======
                     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_IRpcClient.md&amp;value=---%0Auid%3A%20chia.dotnet.IRpcClient%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
                   </li>
                   <li>
-                    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/IRpcClient.cs/#L10" class="contribution-link">View Source</a>
+                    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/IRpcClient.cs/#L10" class="contribution-link">View Source</a>
                   </li>
                 </ul>
               </div>
diff --git a/docs/api/chia.dotnet.InfusedChallengeChainSubSlot.html b/docs/api/chia.dotnet.InfusedChallengeChainSubSlot.html
index dcbf748d..d4fc219d 100644
--- a/docs/api/chia.dotnet.InfusedChallengeChainSubSlot.html
+++ b/docs/api/chia.dotnet.InfusedChallengeChainSubSlot.html
@@ -90,21 +90,7 @@ <h5>Inherited Members</h5>
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object)">Object.Equals(Object)</a>
     </div>
     <div>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object-system-object)">Object.Equals(Object, Object)</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-      <span class="xref">System.Object.Equals(System.Object, System.Object)</span>
-=======
-      <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object-system-object)">Object.Equals(Object, Object)</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
     </div>
     <div>
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.gethashcode#system-object-gethashcode">Object.GetHashCode()</a>
@@ -132,24 +118,10 @@ <h3 id="properties">Properties
   </h3>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_InfusedChallengeChainSubSlot_InfusedChallengeChainEndOfSlotVdf.md&amp;value=---%0Auid%3A%20chia.dotnet.InfusedChallengeChainSubSlot.InfusedChallengeChainEndOfSlotVdf%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_InfusedChallengeChainSubSlot_InfusedChallengeChainEndOfSlotVdf.md&amp;value=---%0Auid%3A%20chia.dotnet.InfusedChallengeChainSubSlot.InfusedChallengeChainEndOfSlotVdf%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_InfusedChallengeChainSubSlot_InfusedChallengeChainEndOfSlotVdf.md&amp;value=---%0Auid%3A%20chia.dotnet.InfusedChallengeChainSubSlot.InfusedChallengeChainEndOfSlotVdf%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/InfusedChallengeChainSubSlot.cs/#L5">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/InfusedChallengeChainSubSlot.cs/#L5">View Source</a>
   </span>
   <a id="chia_dotnet_InfusedChallengeChainSubSlot_InfusedChallengeChainEndOfSlotVdf_" data-uid="chia.dotnet.InfusedChallengeChainSubSlot.InfusedChallengeChainEndOfSlotVdf*"></a>
   <h4 id="chia_dotnet_InfusedChallengeChainSubSlot_InfusedChallengeChainEndOfSlotVdf" data-uid="chia.dotnet.InfusedChallengeChainSubSlot.InfusedChallengeChainEndOfSlotVdf">InfusedChallengeChainEndOfSlotVdf</h4>
@@ -186,24 +158,10 @@ <h3 id="implements">Implements</h3>
               <div class="contribution">
                 <ul class="nav">
                   <li>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-                    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_InfusedChallengeChainSubSlot.md&amp;value=---%0Auid%3A%20chia.dotnet.InfusedChallengeChainSubSlot%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-                    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_InfusedChallengeChainSubSlot.md&amp;value=---%0Auid%3A%20chia.dotnet.InfusedChallengeChainSubSlot%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-=======
                     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_InfusedChallengeChainSubSlot.md&amp;value=---%0Auid%3A%20chia.dotnet.InfusedChallengeChainSubSlot%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
                   </li>
                   <li>
-                    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/InfusedChallengeChainSubSlot.cs/#L3" class="contribution-link">View Source</a>
+                    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/InfusedChallengeChainSubSlot.cs/#L3" class="contribution-link">View Source</a>
                   </li>
                 </ul>
               </div>
diff --git a/docs/api/chia.dotnet.InternalNode.html b/docs/api/chia.dotnet.InternalNode.html
index e2b420fc..b629449e 100644
--- a/docs/api/chia.dotnet.InternalNode.html
+++ b/docs/api/chia.dotnet.InternalNode.html
@@ -90,21 +90,7 @@ <h5>Inherited Members</h5>
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object)">Object.Equals(Object)</a>
     </div>
     <div>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object-system-object)">Object.Equals(Object, Object)</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-      <span class="xref">System.Object.Equals(System.Object, System.Object)</span>
-=======
-      <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object-system-object)">Object.Equals(Object, Object)</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
     </div>
     <div>
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.gethashcode#system-object-gethashcode">Object.GetHashCode()</a>
@@ -132,24 +118,10 @@ <h3 id="properties">Properties
   </h3>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_InternalNode_Atom.md&amp;value=---%0Auid%3A%20chia.dotnet.InternalNode.Atom%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_InternalNode_Atom.md&amp;value=---%0Auid%3A%20chia.dotnet.InternalNode.Atom%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_InternalNode_Atom.md&amp;value=---%0Auid%3A%20chia.dotnet.InternalNode.Atom%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/InternalNode.cs/#L10">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/InternalNode.cs/#L10">View Source</a>
   </span>
   <a id="chia_dotnet_InternalNode_Atom_" data-uid="chia.dotnet.InternalNode.Atom*"></a>
   <h4 id="chia_dotnet_InternalNode_Atom" data-uid="chia.dotnet.InternalNode.Atom">Atom</h4>
@@ -176,24 +148,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_InternalNode_Hash.md&amp;value=---%0Auid%3A%20chia.dotnet.InternalNode.Hash%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_InternalNode_Hash.md&amp;value=---%0Auid%3A%20chia.dotnet.InternalNode.Hash%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_InternalNode_Hash.md&amp;value=---%0Auid%3A%20chia.dotnet.InternalNode.Hash%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/InternalNode.cs/#L5">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/InternalNode.cs/#L5">View Source</a>
   </span>
   <a id="chia_dotnet_InternalNode_Hash_" data-uid="chia.dotnet.InternalNode.Hash*"></a>
   <h4 id="chia_dotnet_InternalNode_Hash" data-uid="chia.dotnet.InternalNode.Hash">Hash</h4>
@@ -220,24 +178,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_InternalNode_LeftHash.md&amp;value=---%0Auid%3A%20chia.dotnet.InternalNode.LeftHash%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_InternalNode_LeftHash.md&amp;value=---%0Auid%3A%20chia.dotnet.InternalNode.LeftHash%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_InternalNode_LeftHash.md&amp;value=---%0Auid%3A%20chia.dotnet.InternalNode.LeftHash%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/InternalNode.cs/#L6">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/InternalNode.cs/#L6">View Source</a>
   </span>
   <a id="chia_dotnet_InternalNode_LeftHash_" data-uid="chia.dotnet.InternalNode.LeftHash*"></a>
   <h4 id="chia_dotnet_InternalNode_LeftHash" data-uid="chia.dotnet.InternalNode.LeftHash">LeftHash</h4>
@@ -264,24 +208,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_InternalNode_Pair.md&amp;value=---%0Auid%3A%20chia.dotnet.InternalNode.Pair%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_InternalNode_Pair.md&amp;value=---%0Auid%3A%20chia.dotnet.InternalNode.Pair%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_InternalNode_Pair.md&amp;value=---%0Auid%3A%20chia.dotnet.InternalNode.Pair%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/InternalNode.cs/#L9">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/InternalNode.cs/#L9">View Source</a>
   </span>
   <a id="chia_dotnet_InternalNode_Pair_" data-uid="chia.dotnet.InternalNode.Pair*"></a>
   <h4 id="chia_dotnet_InternalNode_Pair" data-uid="chia.dotnet.InternalNode.Pair">Pair</h4>
@@ -308,24 +238,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_InternalNode_RightHash.md&amp;value=---%0Auid%3A%20chia.dotnet.InternalNode.RightHash%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_InternalNode_RightHash.md&amp;value=---%0Auid%3A%20chia.dotnet.InternalNode.RightHash%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_InternalNode_RightHash.md&amp;value=---%0Auid%3A%20chia.dotnet.InternalNode.RightHash%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/InternalNode.cs/#L7">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/InternalNode.cs/#L7">View Source</a>
   </span>
   <a id="chia_dotnet_InternalNode_RightHash_" data-uid="chia.dotnet.InternalNode.RightHash*"></a>
   <h4 id="chia_dotnet_InternalNode_RightHash" data-uid="chia.dotnet.InternalNode.RightHash">RightHash</h4>
@@ -362,24 +278,10 @@ <h3 id="implements">Implements</h3>
               <div class="contribution">
                 <ul class="nav">
                   <li>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-                    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_InternalNode.md&amp;value=---%0Auid%3A%20chia.dotnet.InternalNode%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-                    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_InternalNode.md&amp;value=---%0Auid%3A%20chia.dotnet.InternalNode%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-=======
                     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_InternalNode.md&amp;value=---%0Auid%3A%20chia.dotnet.InternalNode%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
                   </li>
                   <li>
-                    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/InternalNode.cs/#L3" class="contribution-link">View Source</a>
+                    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/InternalNode.cs/#L3" class="contribution-link">View Source</a>
                   </li>
                 </ul>
               </div>
diff --git a/docs/api/chia.dotnet.KSize.html b/docs/api/chia.dotnet.KSize.html
index c2376fd9..bbcc910f 100644
--- a/docs/api/chia.dotnet.KSize.html
+++ b/docs/api/chia.dotnet.KSize.html
@@ -124,24 +124,10 @@ <h3 id="fields">Fields
               <div class="contribution">
                 <ul class="nav">
                   <li>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
                     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_KSize.md&amp;value=---%0Auid%3A%20chia.dotnet.KSize%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-                    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_KSize.md&amp;value=---%0Auid%3A%20chia.dotnet.KSize%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-=======
-                    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_KSize.md&amp;value=---%0Auid%3A%20chia.dotnet.KSize%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
                   </li>
                   <li>
-                    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/KSize.cs/#L7" class="contribution-link">View Source</a>
+                    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/KSize.cs/#L7" class="contribution-link">View Source</a>
                   </li>
                 </ul>
               </div>
diff --git a/docs/api/chia.dotnet.KVDiff.html b/docs/api/chia.dotnet.KVDiff.html
index 9f941289..846f303b 100644
--- a/docs/api/chia.dotnet.KVDiff.html
+++ b/docs/api/chia.dotnet.KVDiff.html
@@ -90,21 +90,7 @@ <h5>Inherited Members</h5>
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object)">Object.Equals(Object)</a>
     </div>
     <div>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object-system-object)">Object.Equals(Object, Object)</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-      <span class="xref">System.Object.Equals(System.Object, System.Object)</span>
-=======
-      <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object-system-object)">Object.Equals(Object, Object)</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
     </div>
     <div>
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.gethashcode#system-object-gethashcode">Object.GetHashCode()</a>
@@ -132,24 +118,10 @@ <h3 id="properties">Properties
   </h3>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_KVDiff_Key.md&amp;value=---%0Auid%3A%20chia.dotnet.KVDiff.Key%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_KVDiff_Key.md&amp;value=---%0Auid%3A%20chia.dotnet.KVDiff.Key%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_KVDiff_Key.md&amp;value=---%0Auid%3A%20chia.dotnet.KVDiff.Key%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/KVDiff.cs/#L6">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/KVDiff.cs/#L6">View Source</a>
   </span>
   <a id="chia_dotnet_KVDiff_Key_" data-uid="chia.dotnet.KVDiff.Key*"></a>
   <h4 id="chia_dotnet_KVDiff_Key" data-uid="chia.dotnet.KVDiff.Key">Key</h4>
@@ -176,24 +148,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_KVDiff_Type.md&amp;value=---%0Auid%3A%20chia.dotnet.KVDiff.Type%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_KVDiff_Type.md&amp;value=---%0Auid%3A%20chia.dotnet.KVDiff.Type%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_KVDiff_Type.md&amp;value=---%0Auid%3A%20chia.dotnet.KVDiff.Type%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/KVDiff.cs/#L5">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/KVDiff.cs/#L5">View Source</a>
   </span>
   <a id="chia_dotnet_KVDiff_Type_" data-uid="chia.dotnet.KVDiff.Type*"></a>
   <h4 id="chia_dotnet_KVDiff_Type" data-uid="chia.dotnet.KVDiff.Type">Type</h4>
@@ -220,24 +178,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_KVDiff_Value.md&amp;value=---%0Auid%3A%20chia.dotnet.KVDiff.Value%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_KVDiff_Value.md&amp;value=---%0Auid%3A%20chia.dotnet.KVDiff.Value%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_KVDiff_Value.md&amp;value=---%0Auid%3A%20chia.dotnet.KVDiff.Value%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/KVDiff.cs/#L7">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/KVDiff.cs/#L7">View Source</a>
   </span>
   <a id="chia_dotnet_KVDiff_Value_" data-uid="chia.dotnet.KVDiff.Value*"></a>
   <h4 id="chia_dotnet_KVDiff_Value" data-uid="chia.dotnet.KVDiff.Value">Value</h4>
@@ -274,24 +218,10 @@ <h3 id="implements">Implements</h3>
               <div class="contribution">
                 <ul class="nav">
                   <li>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-                    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_KVDiff.md&amp;value=---%0Auid%3A%20chia.dotnet.KVDiff%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-                    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_KVDiff.md&amp;value=---%0Auid%3A%20chia.dotnet.KVDiff%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-=======
                     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_KVDiff.md&amp;value=---%0Auid%3A%20chia.dotnet.KVDiff%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
                   </li>
                   <li>
-                    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/KVDiff.cs/#L3" class="contribution-link">View Source</a>
+                    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/KVDiff.cs/#L3" class="contribution-link">View Source</a>
                   </li>
                 </ul>
               </div>
diff --git a/docs/api/chia.dotnet.KeyData.html b/docs/api/chia.dotnet.KeyData.html
index 2b2e9f7f..c9e242aa 100644
--- a/docs/api/chia.dotnet.KeyData.html
+++ b/docs/api/chia.dotnet.KeyData.html
@@ -90,21 +90,7 @@ <h5>Inherited Members</h5>
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object)">Object.Equals(Object)</a>
     </div>
     <div>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object-system-object)">Object.Equals(Object, Object)</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-      <span class="xref">System.Object.Equals(System.Object, System.Object)</span>
-=======
-      <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object-system-object)">Object.Equals(Object, Object)</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
     </div>
     <div>
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.gethashcode#system-object-gethashcode">Object.GetHashCode()</a>
@@ -132,24 +118,10 @@ <h3 id="properties">Properties
   </h3>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_KeyData_Fingerprint.md&amp;value=---%0Auid%3A%20chia.dotnet.KeyData.Fingerprint%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_KeyData_Fingerprint.md&amp;value=---%0Auid%3A%20chia.dotnet.KeyData.Fingerprint%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_KeyData_Fingerprint.md&amp;value=---%0Auid%3A%20chia.dotnet.KeyData.Fingerprint%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/KeyData.cs/#L5">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/KeyData.cs/#L5">View Source</a>
   </span>
   <a id="chia_dotnet_KeyData_Fingerprint_" data-uid="chia.dotnet.KeyData.Fingerprint*"></a>
   <h4 id="chia_dotnet_KeyData_Fingerprint" data-uid="chia.dotnet.KeyData.Fingerprint">Fingerprint</h4>
@@ -176,24 +148,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_KeyData_Label.md&amp;value=---%0Auid%3A%20chia.dotnet.KeyData.Label%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_KeyData_Label.md&amp;value=---%0Auid%3A%20chia.dotnet.KeyData.Label%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_KeyData_Label.md&amp;value=---%0Auid%3A%20chia.dotnet.KeyData.Label%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/KeyData.cs/#L7">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/KeyData.cs/#L7">View Source</a>
   </span>
   <a id="chia_dotnet_KeyData_Label_" data-uid="chia.dotnet.KeyData.Label*"></a>
   <h4 id="chia_dotnet_KeyData_Label" data-uid="chia.dotnet.KeyData.Label">Label</h4>
@@ -220,24 +178,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_KeyData_PublicKey.md&amp;value=---%0Auid%3A%20chia.dotnet.KeyData.PublicKey%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_KeyData_PublicKey.md&amp;value=---%0Auid%3A%20chia.dotnet.KeyData.PublicKey%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_KeyData_PublicKey.md&amp;value=---%0Auid%3A%20chia.dotnet.KeyData.PublicKey%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/KeyData.cs/#L6">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/KeyData.cs/#L6">View Source</a>
   </span>
   <a id="chia_dotnet_KeyData_PublicKey_" data-uid="chia.dotnet.KeyData.PublicKey*"></a>
   <h4 id="chia_dotnet_KeyData_PublicKey" data-uid="chia.dotnet.KeyData.PublicKey">PublicKey</h4>
@@ -264,24 +208,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_KeyData_Secrets.md&amp;value=---%0Auid%3A%20chia.dotnet.KeyData.Secrets%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_KeyData_Secrets.md&amp;value=---%0Auid%3A%20chia.dotnet.KeyData.Secrets%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_KeyData_Secrets.md&amp;value=---%0Auid%3A%20chia.dotnet.KeyData.Secrets%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/KeyData.cs/#L8">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/KeyData.cs/#L8">View Source</a>
   </span>
   <a id="chia_dotnet_KeyData_Secrets_" data-uid="chia.dotnet.KeyData.Secrets*"></a>
   <h4 id="chia_dotnet_KeyData_Secrets" data-uid="chia.dotnet.KeyData.Secrets">Secrets</h4>
@@ -318,24 +248,10 @@ <h3 id="implements">Implements</h3>
               <div class="contribution">
                 <ul class="nav">
                   <li>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-                    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_KeyData.md&amp;value=---%0Auid%3A%20chia.dotnet.KeyData%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-                    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_KeyData.md&amp;value=---%0Auid%3A%20chia.dotnet.KeyData%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-=======
                     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_KeyData.md&amp;value=---%0Auid%3A%20chia.dotnet.KeyData%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
                   </li>
                   <li>
-                    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/KeyData.cs/#L3" class="contribution-link">View Source</a>
+                    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/KeyData.cs/#L3" class="contribution-link">View Source</a>
                   </li>
                 </ul>
               </div>
diff --git a/docs/api/chia.dotnet.KeyDataSecrets.html b/docs/api/chia.dotnet.KeyDataSecrets.html
index 5211728d..f0d6f936 100644
--- a/docs/api/chia.dotnet.KeyDataSecrets.html
+++ b/docs/api/chia.dotnet.KeyDataSecrets.html
@@ -90,21 +90,7 @@ <h5>Inherited Members</h5>
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object)">Object.Equals(Object)</a>
     </div>
     <div>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object-system-object)">Object.Equals(Object, Object)</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-      <span class="xref">System.Object.Equals(System.Object, System.Object)</span>
-=======
-      <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object-system-object)">Object.Equals(Object, Object)</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
     </div>
     <div>
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.gethashcode#system-object-gethashcode">Object.GetHashCode()</a>
@@ -132,24 +118,10 @@ <h3 id="properties">Properties
   </h3>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_KeyDataSecrets_Bytes.md&amp;value=---%0Auid%3A%20chia.dotnet.KeyDataSecrets.Bytes%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_KeyDataSecrets_Bytes.md&amp;value=---%0Auid%3A%20chia.dotnet.KeyDataSecrets.Bytes%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_KeyDataSecrets_Bytes.md&amp;value=---%0Auid%3A%20chia.dotnet.KeyDataSecrets.Bytes%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/KeyDataSecrets.cs/#L8">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/KeyDataSecrets.cs/#L8">View Source</a>
   </span>
   <a id="chia_dotnet_KeyDataSecrets_Bytes_" data-uid="chia.dotnet.KeyDataSecrets.Bytes*"></a>
   <h4 id="chia_dotnet_KeyDataSecrets_Bytes" data-uid="chia.dotnet.KeyDataSecrets.Bytes">Bytes</h4>
@@ -176,24 +148,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_KeyDataSecrets_Mnemonic.md&amp;value=---%0Auid%3A%20chia.dotnet.KeyDataSecrets.Mnemonic%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_KeyDataSecrets_Mnemonic.md&amp;value=---%0Auid%3A%20chia.dotnet.KeyDataSecrets.Mnemonic%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_KeyDataSecrets_Mnemonic.md&amp;value=---%0Auid%3A%20chia.dotnet.KeyDataSecrets.Mnemonic%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/KeyDataSecrets.cs/#L7">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/KeyDataSecrets.cs/#L7">View Source</a>
   </span>
   <a id="chia_dotnet_KeyDataSecrets_Mnemonic_" data-uid="chia.dotnet.KeyDataSecrets.Mnemonic*"></a>
   <h4 id="chia_dotnet_KeyDataSecrets_Mnemonic" data-uid="chia.dotnet.KeyDataSecrets.Mnemonic">Mnemonic</h4>
@@ -220,24 +178,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_KeyDataSecrets_PrivateKey.md&amp;value=---%0Auid%3A%20chia.dotnet.KeyDataSecrets.PrivateKey%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_KeyDataSecrets_PrivateKey.md&amp;value=---%0Auid%3A%20chia.dotnet.KeyDataSecrets.PrivateKey%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_KeyDataSecrets_PrivateKey.md&amp;value=---%0Auid%3A%20chia.dotnet.KeyDataSecrets.PrivateKey%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/KeyDataSecrets.cs/#L9">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/KeyDataSecrets.cs/#L9">View Source</a>
   </span>
   <a id="chia_dotnet_KeyDataSecrets_PrivateKey_" data-uid="chia.dotnet.KeyDataSecrets.PrivateKey*"></a>
   <h4 id="chia_dotnet_KeyDataSecrets_PrivateKey" data-uid="chia.dotnet.KeyDataSecrets.PrivateKey">PrivateKey</h4>
@@ -274,24 +218,10 @@ <h3 id="implements">Implements</h3>
               <div class="contribution">
                 <ul class="nav">
                   <li>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-                    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_KeyDataSecrets.md&amp;value=---%0Auid%3A%20chia.dotnet.KeyDataSecrets%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-                    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_KeyDataSecrets.md&amp;value=---%0Auid%3A%20chia.dotnet.KeyDataSecrets%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-=======
                     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_KeyDataSecrets.md&amp;value=---%0Auid%3A%20chia.dotnet.KeyDataSecrets%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
                   </li>
                   <li>
-                    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/KeyDataSecrets.cs/#L5" class="contribution-link">View Source</a>
+                    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/KeyDataSecrets.cs/#L5" class="contribution-link">View Source</a>
                   </li>
                 </ul>
               </div>
diff --git a/docs/api/chia.dotnet.KeyringStatus.html b/docs/api/chia.dotnet.KeyringStatus.html
index cdd143ca..3ea299ce 100644
--- a/docs/api/chia.dotnet.KeyringStatus.html
+++ b/docs/api/chia.dotnet.KeyringStatus.html
@@ -90,21 +90,7 @@ <h5>Inherited Members</h5>
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object)">Object.Equals(Object)</a>
     </div>
     <div>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object-system-object)">Object.Equals(Object, Object)</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-      <span class="xref">System.Object.Equals(System.Object, System.Object)</span>
-=======
-      <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object-system-object)">Object.Equals(Object, Object)</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
     </div>
     <div>
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.gethashcode#system-object-gethashcode">Object.GetHashCode()</a>
@@ -132,24 +118,10 @@ <h3 id="properties">Properties
   </h3>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_KeyringStatus_CanRemoveLegacyKeys.md&amp;value=---%0Auid%3A%20chia.dotnet.KeyringStatus.CanRemoveLegacyKeys%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_KeyringStatus_CanRemoveLegacyKeys.md&amp;value=---%0Auid%3A%20chia.dotnet.KeyringStatus.CanRemoveLegacyKeys%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_KeyringStatus_CanRemoveLegacyKeys.md&amp;value=---%0Auid%3A%20chia.dotnet.KeyringStatus.CanRemoveLegacyKeys%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/KeyringStatus.cs/#L10">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/KeyringStatus.cs/#L10">View Source</a>
   </span>
   <a id="chia_dotnet_KeyringStatus_CanRemoveLegacyKeys_" data-uid="chia.dotnet.KeyringStatus.CanRemoveLegacyKeys*"></a>
   <h4 id="chia_dotnet_KeyringStatus_CanRemoveLegacyKeys" data-uid="chia.dotnet.KeyringStatus.CanRemoveLegacyKeys">CanRemoveLegacyKeys</h4>
@@ -176,24 +148,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_KeyringStatus_CanSavePassphrase.md&amp;value=---%0Auid%3A%20chia.dotnet.KeyringStatus.CanSavePassphrase%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_KeyringStatus_CanSavePassphrase.md&amp;value=---%0Auid%3A%20chia.dotnet.KeyringStatus.CanSavePassphrase%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_KeyringStatus_CanSavePassphrase.md&amp;value=---%0Auid%3A%20chia.dotnet.KeyringStatus.CanSavePassphrase%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/KeyringStatus.cs/#L7">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/KeyringStatus.cs/#L7">View Source</a>
   </span>
   <a id="chia_dotnet_KeyringStatus_CanSavePassphrase_" data-uid="chia.dotnet.KeyringStatus.CanSavePassphrase*"></a>
   <h4 id="chia_dotnet_KeyringStatus_CanSavePassphrase" data-uid="chia.dotnet.KeyringStatus.CanSavePassphrase">CanSavePassphrase</h4>
@@ -220,24 +178,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_KeyringStatus_CanSetPassphraseHint.md&amp;value=---%0Auid%3A%20chia.dotnet.KeyringStatus.CanSetPassphraseHint%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_KeyringStatus_CanSetPassphraseHint.md&amp;value=---%0Auid%3A%20chia.dotnet.KeyringStatus.CanSetPassphraseHint%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_KeyringStatus_CanSetPassphraseHint.md&amp;value=---%0Auid%3A%20chia.dotnet.KeyringStatus.CanSetPassphraseHint%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/KeyringStatus.cs/#L11">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/KeyringStatus.cs/#L11">View Source</a>
   </span>
   <a id="chia_dotnet_KeyringStatus_CanSetPassphraseHint_" data-uid="chia.dotnet.KeyringStatus.CanSetPassphraseHint*"></a>
   <h4 id="chia_dotnet_KeyringStatus_CanSetPassphraseHint" data-uid="chia.dotnet.KeyringStatus.CanSetPassphraseHint">CanSetPassphraseHint</h4>
@@ -264,24 +208,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_KeyringStatus_IsKeyringLocked.md&amp;value=---%0Auid%3A%20chia.dotnet.KeyringStatus.IsKeyringLocked%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_KeyringStatus_IsKeyringLocked.md&amp;value=---%0Auid%3A%20chia.dotnet.KeyringStatus.IsKeyringLocked%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_KeyringStatus_IsKeyringLocked.md&amp;value=---%0Auid%3A%20chia.dotnet.KeyringStatus.IsKeyringLocked%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/KeyringStatus.cs/#L5">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/KeyringStatus.cs/#L5">View Source</a>
   </span>
   <a id="chia_dotnet_KeyringStatus_IsKeyringLocked_" data-uid="chia.dotnet.KeyringStatus.IsKeyringLocked*"></a>
   <h4 id="chia_dotnet_KeyringStatus_IsKeyringLocked" data-uid="chia.dotnet.KeyringStatus.IsKeyringLocked">IsKeyringLocked</h4>
@@ -308,24 +238,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_KeyringStatus_NeedsMigration.md&amp;value=---%0Auid%3A%20chia.dotnet.KeyringStatus.NeedsMigration%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_KeyringStatus_NeedsMigration.md&amp;value=---%0Auid%3A%20chia.dotnet.KeyringStatus.NeedsMigration%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_KeyringStatus_NeedsMigration.md&amp;value=---%0Auid%3A%20chia.dotnet.KeyringStatus.NeedsMigration%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/KeyringStatus.cs/#L9">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/KeyringStatus.cs/#L9">View Source</a>
   </span>
   <a id="chia_dotnet_KeyringStatus_NeedsMigration_" data-uid="chia.dotnet.KeyringStatus.NeedsMigration*"></a>
   <h4 id="chia_dotnet_KeyringStatus_NeedsMigration" data-uid="chia.dotnet.KeyringStatus.NeedsMigration">NeedsMigration</h4>
@@ -352,24 +268,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_KeyringStatus_PassphraseHint.md&amp;value=---%0Auid%3A%20chia.dotnet.KeyringStatus.PassphraseHint%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_KeyringStatus_PassphraseHint.md&amp;value=---%0Auid%3A%20chia.dotnet.KeyringStatus.PassphraseHint%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_KeyringStatus_PassphraseHint.md&amp;value=---%0Auid%3A%20chia.dotnet.KeyringStatus.PassphraseHint%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/KeyringStatus.cs/#L12">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/KeyringStatus.cs/#L12">View Source</a>
   </span>
   <a id="chia_dotnet_KeyringStatus_PassphraseHint_" data-uid="chia.dotnet.KeyringStatus.PassphraseHint*"></a>
   <h4 id="chia_dotnet_KeyringStatus_PassphraseHint" data-uid="chia.dotnet.KeyringStatus.PassphraseHint">PassphraseHint</h4>
@@ -396,24 +298,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_KeyringStatus_PassphraseRequirements.md&amp;value=---%0Auid%3A%20chia.dotnet.KeyringStatus.PassphraseRequirements%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_KeyringStatus_PassphraseRequirements.md&amp;value=---%0Auid%3A%20chia.dotnet.KeyringStatus.PassphraseRequirements%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_KeyringStatus_PassphraseRequirements.md&amp;value=---%0Auid%3A%20chia.dotnet.KeyringStatus.PassphraseRequirements%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/KeyringStatus.cs/#L13">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/KeyringStatus.cs/#L13">View Source</a>
   </span>
   <a id="chia_dotnet_KeyringStatus_PassphraseRequirements_" data-uid="chia.dotnet.KeyringStatus.PassphraseRequirements*"></a>
   <h4 id="chia_dotnet_KeyringStatus_PassphraseRequirements" data-uid="chia.dotnet.KeyringStatus.PassphraseRequirements">PassphraseRequirements</h4>
@@ -440,24 +328,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_KeyringStatus_PassphreaseSupportEnabled.md&amp;value=---%0Auid%3A%20chia.dotnet.KeyringStatus.PassphreaseSupportEnabled%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_KeyringStatus_PassphreaseSupportEnabled.md&amp;value=---%0Auid%3A%20chia.dotnet.KeyringStatus.PassphreaseSupportEnabled%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_KeyringStatus_PassphreaseSupportEnabled.md&amp;value=---%0Auid%3A%20chia.dotnet.KeyringStatus.PassphreaseSupportEnabled%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/KeyringStatus.cs/#L6">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/KeyringStatus.cs/#L6">View Source</a>
   </span>
   <a id="chia_dotnet_KeyringStatus_PassphreaseSupportEnabled_" data-uid="chia.dotnet.KeyringStatus.PassphreaseSupportEnabled*"></a>
   <h4 id="chia_dotnet_KeyringStatus_PassphreaseSupportEnabled" data-uid="chia.dotnet.KeyringStatus.PassphreaseSupportEnabled">PassphreaseSupportEnabled</h4>
@@ -484,24 +358,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_KeyringStatus_UserPassphraseIsSet.md&amp;value=---%0Auid%3A%20chia.dotnet.KeyringStatus.UserPassphraseIsSet%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_KeyringStatus_UserPassphraseIsSet.md&amp;value=---%0Auid%3A%20chia.dotnet.KeyringStatus.UserPassphraseIsSet%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_KeyringStatus_UserPassphraseIsSet.md&amp;value=---%0Auid%3A%20chia.dotnet.KeyringStatus.UserPassphraseIsSet%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/KeyringStatus.cs/#L8">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/KeyringStatus.cs/#L8">View Source</a>
   </span>
   <a id="chia_dotnet_KeyringStatus_UserPassphraseIsSet_" data-uid="chia.dotnet.KeyringStatus.UserPassphraseIsSet*"></a>
   <h4 id="chia_dotnet_KeyringStatus_UserPassphraseIsSet" data-uid="chia.dotnet.KeyringStatus.UserPassphraseIsSet">UserPassphraseIsSet</h4>
@@ -538,24 +398,10 @@ <h3 id="implements">Implements</h3>
               <div class="contribution">
                 <ul class="nav">
                   <li>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-                    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_KeyringStatus.md&amp;value=---%0Auid%3A%20chia.dotnet.KeyringStatus%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-                    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_KeyringStatus.md&amp;value=---%0Auid%3A%20chia.dotnet.KeyringStatus%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-=======
                     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_KeyringStatus.md&amp;value=---%0Auid%3A%20chia.dotnet.KeyringStatus%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
                   </li>
                   <li>
-                    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/KeyringStatus.cs/#L3" class="contribution-link">View Source</a>
+                    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/KeyringStatus.cs/#L3" class="contribution-link">View Source</a>
                   </li>
                 </ul>
               </div>
diff --git a/docs/api/chia.dotnet.Layer.html b/docs/api/chia.dotnet.Layer.html
index 9c91dd13..ea86733d 100644
--- a/docs/api/chia.dotnet.Layer.html
+++ b/docs/api/chia.dotnet.Layer.html
@@ -90,21 +90,7 @@ <h5>Inherited Members</h5>
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object)">Object.Equals(Object)</a>
     </div>
     <div>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object-system-object)">Object.Equals(Object, Object)</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-      <span class="xref">System.Object.Equals(System.Object, System.Object)</span>
-=======
-      <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object-system-object)">Object.Equals(Object, Object)</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
     </div>
     <div>
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.gethashcode#system-object-gethashcode">Object.GetHashCode()</a>
@@ -132,24 +118,10 @@ <h3 id="properties">Properties
   </h3>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_Layer_CombinedHash.md&amp;value=---%0Auid%3A%20chia.dotnet.Layer.CombinedHash%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_Layer_CombinedHash.md&amp;value=---%0Auid%3A%20chia.dotnet.Layer.CombinedHash%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_Layer_CombinedHash.md&amp;value=---%0Auid%3A%20chia.dotnet.Layer.CombinedHash%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/Layer.cs/#L7">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/Layer.cs/#L7">View Source</a>
   </span>
   <a id="chia_dotnet_Layer_CombinedHash_" data-uid="chia.dotnet.Layer.CombinedHash*"></a>
   <h4 id="chia_dotnet_Layer_CombinedHash" data-uid="chia.dotnet.Layer.CombinedHash">CombinedHash</h4>
@@ -176,24 +148,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_Layer_OtherHash.md&amp;value=---%0Auid%3A%20chia.dotnet.Layer.OtherHash%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_Layer_OtherHash.md&amp;value=---%0Auid%3A%20chia.dotnet.Layer.OtherHash%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_Layer_OtherHash.md&amp;value=---%0Auid%3A%20chia.dotnet.Layer.OtherHash%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/Layer.cs/#L6">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/Layer.cs/#L6">View Source</a>
   </span>
   <a id="chia_dotnet_Layer_OtherHash_" data-uid="chia.dotnet.Layer.OtherHash*"></a>
   <h4 id="chia_dotnet_Layer_OtherHash" data-uid="chia.dotnet.Layer.OtherHash">OtherHash</h4>
@@ -220,24 +178,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_Layer_OtherHashSide.md&amp;value=---%0Auid%3A%20chia.dotnet.Layer.OtherHashSide%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_Layer_OtherHashSide.md&amp;value=---%0Auid%3A%20chia.dotnet.Layer.OtherHashSide%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_Layer_OtherHashSide.md&amp;value=---%0Auid%3A%20chia.dotnet.Layer.OtherHashSide%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/Layer.cs/#L5">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/Layer.cs/#L5">View Source</a>
   </span>
   <a id="chia_dotnet_Layer_OtherHashSide_" data-uid="chia.dotnet.Layer.OtherHashSide*"></a>
   <h4 id="chia_dotnet_Layer_OtherHashSide" data-uid="chia.dotnet.Layer.OtherHashSide">OtherHashSide</h4>
@@ -274,24 +218,10 @@ <h3 id="implements">Implements</h3>
               <div class="contribution">
                 <ul class="nav">
                   <li>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-                    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_Layer.md&amp;value=---%0Auid%3A%20chia.dotnet.Layer%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-                    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_Layer.md&amp;value=---%0Auid%3A%20chia.dotnet.Layer%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-=======
                     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_Layer.md&amp;value=---%0Auid%3A%20chia.dotnet.Layer%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
                   </li>
                   <li>
-                    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/Layer.cs/#L3" class="contribution-link">View Source</a>
+                    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/Layer.cs/#L3" class="contribution-link">View Source</a>
                   </li>
                 </ul>
               </div>
diff --git a/docs/api/chia.dotnet.LineageProof.html b/docs/api/chia.dotnet.LineageProof.html
index 89a033a7..e05b46ff 100644
--- a/docs/api/chia.dotnet.LineageProof.html
+++ b/docs/api/chia.dotnet.LineageProof.html
@@ -91,21 +91,7 @@ <h5>Inherited Members</h5>
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object)">Object.Equals(Object)</a>
     </div>
     <div>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object-system-object)">Object.Equals(Object, Object)</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-      <span class="xref">System.Object.Equals(System.Object, System.Object)</span>
-=======
-      <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object-system-object)">Object.Equals(Object, Object)</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
     </div>
     <div>
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.gethashcode#system-object-gethashcode">Object.GetHashCode()</a>
@@ -133,24 +119,10 @@ <h3 id="properties">Properties
   </h3>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_LineageProof_Amount.md&amp;value=---%0Auid%3A%20chia.dotnet.LineageProof.Amount%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_LineageProof_Amount.md&amp;value=---%0Auid%3A%20chia.dotnet.LineageProof.Amount%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_LineageProof_Amount.md&amp;value=---%0Auid%3A%20chia.dotnet.LineageProof.Amount%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/LineageProof.cs/#L7">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/LineageProof.cs/#L7">View Source</a>
   </span>
   <a id="chia_dotnet_LineageProof_Amount_" data-uid="chia.dotnet.LineageProof.Amount*"></a>
   <h4 id="chia_dotnet_LineageProof_Amount" data-uid="chia.dotnet.LineageProof.Amount">Amount</h4>
@@ -177,24 +149,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_LineageProof_InnerPuzzleHash.md&amp;value=---%0Auid%3A%20chia.dotnet.LineageProof.InnerPuzzleHash%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_LineageProof_InnerPuzzleHash.md&amp;value=---%0Auid%3A%20chia.dotnet.LineageProof.InnerPuzzleHash%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_LineageProof_InnerPuzzleHash.md&amp;value=---%0Auid%3A%20chia.dotnet.LineageProof.InnerPuzzleHash%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/LineageProof.cs/#L6">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/LineageProof.cs/#L6">View Source</a>
   </span>
   <a id="chia_dotnet_LineageProof_InnerPuzzleHash_" data-uid="chia.dotnet.LineageProof.InnerPuzzleHash*"></a>
   <h4 id="chia_dotnet_LineageProof_InnerPuzzleHash" data-uid="chia.dotnet.LineageProof.InnerPuzzleHash">InnerPuzzleHash</h4>
@@ -221,24 +179,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_LineageProof_ParentName.md&amp;value=---%0Auid%3A%20chia.dotnet.LineageProof.ParentName%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_LineageProof_ParentName.md&amp;value=---%0Auid%3A%20chia.dotnet.LineageProof.ParentName%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_LineageProof_ParentName.md&amp;value=---%0Auid%3A%20chia.dotnet.LineageProof.ParentName%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/LineageProof.cs/#L5">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/LineageProof.cs/#L5">View Source</a>
   </span>
   <a id="chia_dotnet_LineageProof_ParentName_" data-uid="chia.dotnet.LineageProof.ParentName*"></a>
   <h4 id="chia_dotnet_LineageProof_ParentName" data-uid="chia.dotnet.LineageProof.ParentName">ParentName</h4>
@@ -275,24 +219,10 @@ <h3 id="implements">Implements</h3>
               <div class="contribution">
                 <ul class="nav">
                   <li>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-                    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_LineageProof.md&amp;value=---%0Auid%3A%20chia.dotnet.LineageProof%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-                    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_LineageProof.md&amp;value=---%0Auid%3A%20chia.dotnet.LineageProof%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-=======
                     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_LineageProof.md&amp;value=---%0Auid%3A%20chia.dotnet.LineageProof%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
                   </li>
                   <li>
-                    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/LineageProof.cs/#L3" class="contribution-link">View Source</a>
+                    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/LineageProof.cs/#L3" class="contribution-link">View Source</a>
                   </li>
                 </ul>
               </div>
diff --git a/docs/api/chia.dotnet.MempoolInclusionStatus.html b/docs/api/chia.dotnet.MempoolInclusionStatus.html
index 08852135..e5e0d590 100644
--- a/docs/api/chia.dotnet.MempoolInclusionStatus.html
+++ b/docs/api/chia.dotnet.MempoolInclusionStatus.html
@@ -116,24 +116,10 @@ <h3 id="fields">Fields
               <div class="contribution">
                 <ul class="nav">
                   <li>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
                     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_MempoolInclusionStatus.md&amp;value=---%0Auid%3A%20chia.dotnet.MempoolInclusionStatus%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-                    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_MempoolInclusionStatus.md&amp;value=---%0Auid%3A%20chia.dotnet.MempoolInclusionStatus%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-=======
-                    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_MempoolInclusionStatus.md&amp;value=---%0Auid%3A%20chia.dotnet.MempoolInclusionStatus%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
                   </li>
                   <li>
-                    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/MempoolInclusionStatus.cs/#L3" class="contribution-link">View Source</a>
+                    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/MempoolInclusionStatus.cs/#L3" class="contribution-link">View Source</a>
                   </li>
                 </ul>
               </div>
diff --git a/docs/api/chia.dotnet.MempoolItem.html b/docs/api/chia.dotnet.MempoolItem.html
index 19a53ee2..8c100c82 100644
--- a/docs/api/chia.dotnet.MempoolItem.html
+++ b/docs/api/chia.dotnet.MempoolItem.html
@@ -90,21 +90,7 @@ <h5>Inherited Members</h5>
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object)">Object.Equals(Object)</a>
     </div>
     <div>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object-system-object)">Object.Equals(Object, Object)</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-      <span class="xref">System.Object.Equals(System.Object, System.Object)</span>
-=======
-      <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object-system-object)">Object.Equals(Object, Object)</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
     </div>
     <div>
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.gethashcode#system-object-gethashcode">Object.GetHashCode()</a>
@@ -132,24 +118,10 @@ <h3 id="properties">Properties
   </h3>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_MempoolItem_Additions.md&amp;value=---%0Auid%3A%20chia.dotnet.MempoolItem.Additions%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_MempoolItem_Additions.md&amp;value=---%0Auid%3A%20chia.dotnet.MempoolItem.Additions%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_MempoolItem_Additions.md&amp;value=---%0Auid%3A%20chia.dotnet.MempoolItem.Additions%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/MempoolItem.cs/#L12">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/MempoolItem.cs/#L12">View Source</a>
   </span>
   <a id="chia_dotnet_MempoolItem_Additions_" data-uid="chia.dotnet.MempoolItem.Additions*"></a>
   <h4 id="chia_dotnet_MempoolItem_Additions" data-uid="chia.dotnet.MempoolItem.Additions">Additions</h4>
@@ -157,21 +129,7 @@ <h4 id="chia_dotnet_MempoolItem_Additions" data-uid="chia.dotnet.MempoolItem.Add
   <div class="markdown level1 conceptual"></div>
   <h5 class="decalaration">Declaration</h5>
   <div class="codewrapper">
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <pre><code class="lang-csharp hljs">public IEnumerable&lt;Coin&gt; Additions { get; set; }</code></pre>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <pre><code class="lang-csharp hljs">public ICollection&lt;Coin&gt; Additions { get; set; }</code></pre>
-=======
     <pre><code class="lang-csharp hljs">public IEnumerable&lt;Coin&gt; Additions { get; set; }</code></pre>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </div>
   <h5 class="propertyValue">Property Value</h5>
   <table class="table table-bordered table-striped table-condensed">
@@ -190,24 +148,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_MempoolItem_Cost.md&amp;value=---%0Auid%3A%20chia.dotnet.MempoolItem.Cost%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_MempoolItem_Cost.md&amp;value=---%0Auid%3A%20chia.dotnet.MempoolItem.Cost%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_MempoolItem_Cost.md&amp;value=---%0Auid%3A%20chia.dotnet.MempoolItem.Cost%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/MempoolItem.cs/#L10">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/MempoolItem.cs/#L10">View Source</a>
   </span>
   <a id="chia_dotnet_MempoolItem_Cost_" data-uid="chia.dotnet.MempoolItem.Cost*"></a>
   <h4 id="chia_dotnet_MempoolItem_Cost" data-uid="chia.dotnet.MempoolItem.Cost">Cost</h4>
@@ -234,24 +178,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_MempoolItem_Fee.md&amp;value=---%0Auid%3A%20chia.dotnet.MempoolItem.Fee%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_MempoolItem_Fee.md&amp;value=---%0Auid%3A%20chia.dotnet.MempoolItem.Fee%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_MempoolItem_Fee.md&amp;value=---%0Auid%3A%20chia.dotnet.MempoolItem.Fee%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/MempoolItem.cs/#L8">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/MempoolItem.cs/#L8">View Source</a>
   </span>
   <a id="chia_dotnet_MempoolItem_Fee_" data-uid="chia.dotnet.MempoolItem.Fee*"></a>
   <h4 id="chia_dotnet_MempoolItem_Fee" data-uid="chia.dotnet.MempoolItem.Fee">Fee</h4>
@@ -278,24 +208,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_MempoolItem_NPCResult.md&amp;value=---%0Auid%3A%20chia.dotnet.MempoolItem.NPCResult%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_MempoolItem_NPCResult.md&amp;value=---%0Auid%3A%20chia.dotnet.MempoolItem.NPCResult%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_MempoolItem_NPCResult.md&amp;value=---%0Auid%3A%20chia.dotnet.MempoolItem.NPCResult%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/MempoolItem.cs/#L9">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/MempoolItem.cs/#L9">View Source</a>
   </span>
   <a id="chia_dotnet_MempoolItem_NPCResult_" data-uid="chia.dotnet.MempoolItem.NPCResult*"></a>
   <h4 id="chia_dotnet_MempoolItem_NPCResult" data-uid="chia.dotnet.MempoolItem.NPCResult">NPCResult</h4>
@@ -322,24 +238,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_MempoolItem_Program.md&amp;value=---%0Auid%3A%20chia.dotnet.MempoolItem.Program%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_MempoolItem_Program.md&amp;value=---%0Auid%3A%20chia.dotnet.MempoolItem.Program%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_MempoolItem_Program.md&amp;value=---%0Auid%3A%20chia.dotnet.MempoolItem.Program%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/MempoolItem.cs/#L14">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/MempoolItem.cs/#L14">View Source</a>
   </span>
   <a id="chia_dotnet_MempoolItem_Program_" data-uid="chia.dotnet.MempoolItem.Program*"></a>
   <h4 id="chia_dotnet_MempoolItem_Program" data-uid="chia.dotnet.MempoolItem.Program">Program</h4>
@@ -366,24 +268,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_MempoolItem_Removals.md&amp;value=---%0Auid%3A%20chia.dotnet.MempoolItem.Removals%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_MempoolItem_Removals.md&amp;value=---%0Auid%3A%20chia.dotnet.MempoolItem.Removals%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_MempoolItem_Removals.md&amp;value=---%0Auid%3A%20chia.dotnet.MempoolItem.Removals%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/MempoolItem.cs/#L13">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/MempoolItem.cs/#L13">View Source</a>
   </span>
   <a id="chia_dotnet_MempoolItem_Removals_" data-uid="chia.dotnet.MempoolItem.Removals*"></a>
   <h4 id="chia_dotnet_MempoolItem_Removals" data-uid="chia.dotnet.MempoolItem.Removals">Removals</h4>
@@ -391,21 +279,7 @@ <h4 id="chia_dotnet_MempoolItem_Removals" data-uid="chia.dotnet.MempoolItem.Remo
   <div class="markdown level1 conceptual"></div>
   <h5 class="decalaration">Declaration</h5>
   <div class="codewrapper">
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <pre><code class="lang-csharp hljs">public IEnumerable&lt;Coin&gt; Removals { get; set; }</code></pre>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <pre><code class="lang-csharp hljs">public ICollection&lt;Coin&gt; Removals { get; set; }</code></pre>
-=======
     <pre><code class="lang-csharp hljs">public IEnumerable&lt;Coin&gt; Removals { get; set; }</code></pre>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </div>
   <h5 class="propertyValue">Property Value</h5>
   <table class="table table-bordered table-striped table-condensed">
@@ -424,24 +298,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_MempoolItem_SpendBudndleName.md&amp;value=---%0Auid%3A%20chia.dotnet.MempoolItem.SpendBudndleName%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_MempoolItem_SpendBudndleName.md&amp;value=---%0Auid%3A%20chia.dotnet.MempoolItem.SpendBudndleName%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_MempoolItem_SpendBudndleName.md&amp;value=---%0Auid%3A%20chia.dotnet.MempoolItem.SpendBudndleName%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/MempoolItem.cs/#L11">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/MempoolItem.cs/#L11">View Source</a>
   </span>
   <a id="chia_dotnet_MempoolItem_SpendBudndleName_" data-uid="chia.dotnet.MempoolItem.SpendBudndleName*"></a>
   <h4 id="chia_dotnet_MempoolItem_SpendBudndleName" data-uid="chia.dotnet.MempoolItem.SpendBudndleName">SpendBudndleName</h4>
@@ -468,24 +328,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_MempoolItem_SpendBundle.md&amp;value=---%0Auid%3A%20chia.dotnet.MempoolItem.SpendBundle%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_MempoolItem_SpendBundle.md&amp;value=---%0Auid%3A%20chia.dotnet.MempoolItem.SpendBundle%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_MempoolItem_SpendBundle.md&amp;value=---%0Auid%3A%20chia.dotnet.MempoolItem.SpendBundle%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/MempoolItem.cs/#L7">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/MempoolItem.cs/#L7">View Source</a>
   </span>
   <a id="chia_dotnet_MempoolItem_SpendBundle_" data-uid="chia.dotnet.MempoolItem.SpendBundle*"></a>
   <h4 id="chia_dotnet_MempoolItem_SpendBundle" data-uid="chia.dotnet.MempoolItem.SpendBundle">SpendBundle</h4>
@@ -522,24 +368,10 @@ <h3 id="implements">Implements</h3>
               <div class="contribution">
                 <ul class="nav">
                   <li>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-                    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_MempoolItem.md&amp;value=---%0Auid%3A%20chia.dotnet.MempoolItem%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-                    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_MempoolItem.md&amp;value=---%0Auid%3A%20chia.dotnet.MempoolItem%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-=======
                     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_MempoolItem.md&amp;value=---%0Auid%3A%20chia.dotnet.MempoolItem%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
                   </li>
                   <li>
-                    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/MempoolItem.cs/#L5" class="contribution-link">View Source</a>
+                    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/MempoolItem.cs/#L5" class="contribution-link">View Source</a>
                   </li>
                 </ul>
               </div>
diff --git a/docs/api/chia.dotnet.MempoolMinFees.html b/docs/api/chia.dotnet.MempoolMinFees.html
index 1e100c24..30b26282 100644
--- a/docs/api/chia.dotnet.MempoolMinFees.html
+++ b/docs/api/chia.dotnet.MempoolMinFees.html
@@ -90,21 +90,7 @@ <h5>Inherited Members</h5>
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object)">Object.Equals(Object)</a>
     </div>
     <div>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object-system-object)">Object.Equals(Object, Object)</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-      <span class="xref">System.Object.Equals(System.Object, System.Object)</span>
-=======
-      <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object-system-object)">Object.Equals(Object, Object)</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
     </div>
     <div>
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.gethashcode#system-object-gethashcode">Object.GetHashCode()</a>
@@ -132,30 +118,10 @@ <h3 id="properties">Properties
   </h3>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_MempoolMinFees_Cost5000000.md&amp;value=---%0Auid%3A%20chia.dotnet.MempoolMinFees.Cost5000000%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/BlockchainState.cs/#L28">View Source</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_MempoolMinFees_Cost5000000.md&amp;value=---%0Auid%3A%20chia.dotnet.MempoolMinFees.Cost5000000%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/BlockchainState.cs/#L28">View Source</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_MempoolMinFees_Cost5000000.md&amp;value=---%0Auid%3A%20chia.dotnet.MempoolMinFees.Cost5000000%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
   </span>
   <span class="small pull-right mobile-hide">
     <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/BlockchainState.cs/#L28">View Source</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <a id="chia_dotnet_MempoolMinFees_Cost5000000_" data-uid="chia.dotnet.MempoolMinFees.Cost5000000*"></a>
   <h4 id="chia_dotnet_MempoolMinFees_Cost5000000" data-uid="chia.dotnet.MempoolMinFees.Cost5000000">Cost5000000</h4>
@@ -192,30 +158,10 @@ <h3 id="implements">Implements</h3>
               <div class="contribution">
                 <ul class="nav">
                   <li>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-                    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_MempoolMinFees.md&amp;value=---%0Auid%3A%20chia.dotnet.MempoolMinFees%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-                  </li>
-                  <li>
-                    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/BlockchainState.cs/#L26" class="contribution-link">View Source</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-                    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_MempoolMinFees.md&amp;value=---%0Auid%3A%20chia.dotnet.MempoolMinFees%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-                  </li>
-                  <li>
-                    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/BlockchainState.cs/#L26" class="contribution-link">View Source</a>
-=======
                     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_MempoolMinFees.md&amp;value=---%0Auid%3A%20chia.dotnet.MempoolMinFees%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
                   </li>
                   <li>
                     <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/BlockchainState.cs/#L26" class="contribution-link">View Source</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
                   </li>
                 </ul>
               </div>
diff --git a/docs/api/chia.dotnet.Message.html b/docs/api/chia.dotnet.Message.html
index 181cd1d9..0fd66f0c 100644
--- a/docs/api/chia.dotnet.Message.html
+++ b/docs/api/chia.dotnet.Message.html
@@ -91,21 +91,7 @@ <h5>Inherited Members</h5>
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object)">Object.Equals(Object)</a>
     </div>
     <div>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object-system-object)">Object.Equals(Object, Object)</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-      <span class="xref">System.Object.Equals(System.Object, System.Object)</span>
-=======
-      <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object-system-object)">Object.Equals(Object, Object)</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
     </div>
     <div>
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.gethashcode#system-object-gethashcode">Object.GetHashCode()</a>
@@ -133,28 +119,10 @@ <h3 id="properties">Properties
   </h3>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_Message_Ack.md&amp;value=---%0Auid%3A%20chia.dotnet.Message.Ack%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_Message_Ack.md&amp;value=---%0Auid%3A%20chia.dotnet.Message.Ack%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_Message_Ack.md&amp;value=---%0Auid%3A%20chia.dotnet.Message.Ack%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-<<<<<<< HEAD
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/Message.cs/#L36">View Source</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/Message.cs/#L38">View Source</a>
->>>>>>> main
   </span>
   <a id="chia_dotnet_Message_Ack_" data-uid="chia.dotnet.Message.Ack*"></a>
   <h4 id="chia_dotnet_Message_Ack" data-uid="chia.dotnet.Message.Ack">Ack</h4>
@@ -182,28 +150,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_Message_Command.md&amp;value=---%0Auid%3A%20chia.dotnet.Message.Command%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_Message_Command.md&amp;value=---%0Auid%3A%20chia.dotnet.Message.Command%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_Message_Command.md&amp;value=---%0Auid%3A%20chia.dotnet.Message.Command%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-<<<<<<< HEAD
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/Message.cs/#L16">View Source</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/Message.cs/#L18">View Source</a>
->>>>>>> main
   </span>
   <a id="chia_dotnet_Message_Command_" data-uid="chia.dotnet.Message.Command*"></a>
   <h4 id="chia_dotnet_Message_Command" data-uid="chia.dotnet.Message.Command">Command</h4>
@@ -231,28 +181,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_Message_Data.md&amp;value=---%0Auid%3A%20chia.dotnet.Message.Data%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_Message_Data.md&amp;value=---%0Auid%3A%20chia.dotnet.Message.Data%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_Message_Data.md&amp;value=---%0Auid%3A%20chia.dotnet.Message.Data%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-<<<<<<< HEAD
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/Message.cs/#L21">View Source</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/Message.cs/#L23">View Source</a>
->>>>>>> main
   </span>
   <a id="chia_dotnet_Message_Data_" data-uid="chia.dotnet.Message.Data*"></a>
   <h4 id="chia_dotnet_Message_Data" data-uid="chia.dotnet.Message.Data">Data</h4>
@@ -280,28 +212,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_Message_Destination.md&amp;value=---%0Auid%3A%20chia.dotnet.Message.Destination%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_Message_Destination.md&amp;value=---%0Auid%3A%20chia.dotnet.Message.Destination%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_Message_Destination.md&amp;value=---%0Auid%3A%20chia.dotnet.Message.Destination%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-<<<<<<< HEAD
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/Message.cs/#L31">View Source</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/Message.cs/#L33">View Source</a>
->>>>>>> main
   </span>
   <a id="chia_dotnet_Message_Destination_" data-uid="chia.dotnet.Message.Destination*"></a>
   <h4 id="chia_dotnet_Message_Destination" data-uid="chia.dotnet.Message.Destination">Destination</h4>
@@ -329,28 +243,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_Message_IsSuccessfulResponse.md&amp;value=---%0Auid%3A%20chia.dotnet.Message.IsSuccessfulResponse%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_Message_IsSuccessfulResponse.md&amp;value=---%0Auid%3A%20chia.dotnet.Message.IsSuccessfulResponse%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_Message_IsSuccessfulResponse.md&amp;value=---%0Auid%3A%20chia.dotnet.Message.IsSuccessfulResponse%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-<<<<<<< HEAD
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/Message.cs/#L46">View Source</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/Message.cs/#L48">View Source</a>
->>>>>>> main
   </span>
   <a id="chia_dotnet_Message_IsSuccessfulResponse_" data-uid="chia.dotnet.Message.IsSuccessfulResponse*"></a>
   <h4 id="chia_dotnet_Message_IsSuccessfulResponse" data-uid="chia.dotnet.Message.IsSuccessfulResponse">IsSuccessfulResponse</h4>
@@ -379,28 +275,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_Message_Origin.md&amp;value=---%0Auid%3A%20chia.dotnet.Message.Origin%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_Message_Origin.md&amp;value=---%0Auid%3A%20chia.dotnet.Message.Origin%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_Message_Origin.md&amp;value=---%0Auid%3A%20chia.dotnet.Message.Origin%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-<<<<<<< HEAD
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/Message.cs/#L26">View Source</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/Message.cs/#L28">View Source</a>
->>>>>>> main
   </span>
   <a id="chia_dotnet_Message_Origin_" data-uid="chia.dotnet.Message.Origin*"></a>
   <h4 id="chia_dotnet_Message_Origin" data-uid="chia.dotnet.Message.Origin">Origin</h4>
@@ -428,28 +306,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_Message_RequestId.md&amp;value=---%0Auid%3A%20chia.dotnet.Message.RequestId%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_Message_RequestId.md&amp;value=---%0Auid%3A%20chia.dotnet.Message.RequestId%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_Message_RequestId.md&amp;value=---%0Auid%3A%20chia.dotnet.Message.RequestId%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-<<<<<<< HEAD
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/Message.cs/#L41">View Source</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/Message.cs/#L43">View Source</a>
->>>>>>> main
   </span>
   <a id="chia_dotnet_Message_RequestId_" data-uid="chia.dotnet.Message.RequestId*"></a>
   <h4 id="chia_dotnet_Message_RequestId" data-uid="chia.dotnet.Message.RequestId">RequestId</h4>
@@ -479,28 +339,10 @@ <h3 id="methods">Methods
   </h3>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_Message_Create_System_String_System_Object_System_String_System_String_.md&amp;value=---%0Auid%3A%20chia.dotnet.Message.Create(System.String%2CSystem.Object%2CSystem.String%2CSystem.String)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_Message_Create_System_String_System_Object_System_String_System_String_.md&amp;value=---%0Auid%3A%20chia.dotnet.Message.Create(System.String%2CSystem.Object%2CSystem.String%2CSystem.String)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_Message_Create_System_String_System_Object_System_String_System_String_.md&amp;value=---%0Auid%3A%20chia.dotnet.Message.Create(System.String%2CSystem.Object%2CSystem.String%2CSystem.String)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-<<<<<<< HEAD
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/Message.cs/#L58">View Source</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/Message.cs/#L60">View Source</a>
->>>>>>> main
   </span>
   <a id="chia_dotnet_Message_Create_" data-uid="chia.dotnet.Message.Create*"></a>
   <h4 id="chia_dotnet_Message_Create_System_String_System_Object_System_String_System_String_" data-uid="chia.dotnet.Message.Create(System.String,System.Object,System.String,System.String)">Create(String, Object, String, String)</h4>
@@ -578,28 +420,10 @@ <h3 id="implements">Implements</h3>
               <div class="contribution">
                 <ul class="nav">
                   <li>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-                    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_Message.md&amp;value=---%0Auid%3A%20chia.dotnet.Message%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-                    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_Message.md&amp;value=---%0Auid%3A%20chia.dotnet.Message%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-=======
                     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_Message.md&amp;value=---%0Auid%3A%20chia.dotnet.Message%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
                   </li>
                   <li>
-<<<<<<< HEAD
-                    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/Message.cs/#L11" class="contribution-link">View Source</a>
-=======
                     <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/Message.cs/#L13" class="contribution-link">View Source</a>
->>>>>>> main
                   </li>
                 </ul>
               </div>
diff --git a/docs/api/chia.dotnet.Mirror.html b/docs/api/chia.dotnet.Mirror.html
index f60c310c..eef37a20 100644
--- a/docs/api/chia.dotnet.Mirror.html
+++ b/docs/api/chia.dotnet.Mirror.html
@@ -90,21 +90,7 @@ <h5>Inherited Members</h5>
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object)">Object.Equals(Object)</a>
     </div>
     <div>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object-system-object)">Object.Equals(Object, Object)</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-      <span class="xref">System.Object.Equals(System.Object, System.Object)</span>
-=======
-      <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object-system-object)">Object.Equals(Object, Object)</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
     </div>
     <div>
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.gethashcode#system-object-gethashcode">Object.GetHashCode()</a>
@@ -132,24 +118,10 @@ <h3 id="properties">Properties
   </h3>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_Mirror_Amount.md&amp;value=---%0Auid%3A%20chia.dotnet.Mirror.Amount%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_Mirror_Amount.md&amp;value=---%0Auid%3A%20chia.dotnet.Mirror.Amount%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_Mirror_Amount.md&amp;value=---%0Auid%3A%20chia.dotnet.Mirror.Amount%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/Mirror.cs/#L9">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/Mirror.cs/#L9">View Source</a>
   </span>
   <a id="chia_dotnet_Mirror_Amount_" data-uid="chia.dotnet.Mirror.Amount*"></a>
   <h4 id="chia_dotnet_Mirror_Amount" data-uid="chia.dotnet.Mirror.Amount">Amount</h4>
@@ -176,24 +148,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_Mirror_CoinId.md&amp;value=---%0Auid%3A%20chia.dotnet.Mirror.CoinId%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_Mirror_CoinId.md&amp;value=---%0Auid%3A%20chia.dotnet.Mirror.CoinId%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_Mirror_CoinId.md&amp;value=---%0Auid%3A%20chia.dotnet.Mirror.CoinId%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/Mirror.cs/#L7">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/Mirror.cs/#L7">View Source</a>
   </span>
   <a id="chia_dotnet_Mirror_CoinId_" data-uid="chia.dotnet.Mirror.CoinId*"></a>
   <h4 id="chia_dotnet_Mirror_CoinId" data-uid="chia.dotnet.Mirror.CoinId">CoinId</h4>
@@ -220,24 +178,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_Mirror_LauncherId.md&amp;value=---%0Auid%3A%20chia.dotnet.Mirror.LauncherId%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_Mirror_LauncherId.md&amp;value=---%0Auid%3A%20chia.dotnet.Mirror.LauncherId%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_Mirror_LauncherId.md&amp;value=---%0Auid%3A%20chia.dotnet.Mirror.LauncherId%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/Mirror.cs/#L8">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/Mirror.cs/#L8">View Source</a>
   </span>
   <a id="chia_dotnet_Mirror_LauncherId_" data-uid="chia.dotnet.Mirror.LauncherId*"></a>
   <h4 id="chia_dotnet_Mirror_LauncherId" data-uid="chia.dotnet.Mirror.LauncherId">LauncherId</h4>
@@ -264,24 +208,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_Mirror_Ours.md&amp;value=---%0Auid%3A%20chia.dotnet.Mirror.Ours%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_Mirror_Ours.md&amp;value=---%0Auid%3A%20chia.dotnet.Mirror.Ours%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_Mirror_Ours.md&amp;value=---%0Auid%3A%20chia.dotnet.Mirror.Ours%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/Mirror.cs/#L11">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/Mirror.cs/#L11">View Source</a>
   </span>
   <a id="chia_dotnet_Mirror_Ours_" data-uid="chia.dotnet.Mirror.Ours*"></a>
   <h4 id="chia_dotnet_Mirror_Ours" data-uid="chia.dotnet.Mirror.Ours">Ours</h4>
@@ -308,24 +238,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_Mirror_Urls.md&amp;value=---%0Auid%3A%20chia.dotnet.Mirror.Urls%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_Mirror_Urls.md&amp;value=---%0Auid%3A%20chia.dotnet.Mirror.Urls%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_Mirror_Urls.md&amp;value=---%0Auid%3A%20chia.dotnet.Mirror.Urls%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/Mirror.cs/#L10">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/Mirror.cs/#L10">View Source</a>
   </span>
   <a id="chia_dotnet_Mirror_Urls_" data-uid="chia.dotnet.Mirror.Urls*"></a>
   <h4 id="chia_dotnet_Mirror_Urls" data-uid="chia.dotnet.Mirror.Urls">Urls</h4>
@@ -362,24 +278,10 @@ <h3 id="implements">Implements</h3>
               <div class="contribution">
                 <ul class="nav">
                   <li>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-                    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_Mirror.md&amp;value=---%0Auid%3A%20chia.dotnet.Mirror%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-                    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_Mirror.md&amp;value=---%0Auid%3A%20chia.dotnet.Mirror%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-=======
                     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_Mirror.md&amp;value=---%0Auid%3A%20chia.dotnet.Mirror%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
                   </li>
                   <li>
-                    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/Mirror.cs/#L5" class="contribution-link">View Source</a>
+                    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/Mirror.cs/#L5" class="contribution-link">View Source</a>
                   </li>
                 </ul>
               </div>
diff --git a/docs/api/chia.dotnet.NFTBulkMintingInfo.html b/docs/api/chia.dotnet.NFTBulkMintingInfo.html
index f12032a9..310f7b0d 100644
--- a/docs/api/chia.dotnet.NFTBulkMintingInfo.html
+++ b/docs/api/chia.dotnet.NFTBulkMintingInfo.html
@@ -91,21 +91,7 @@ <h5>Inherited Members</h5>
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object)">Object.Equals(Object)</a>
     </div>
     <div>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object-system-object)">Object.Equals(Object, Object)</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-      <span class="xref">System.Object.Equals(System.Object, System.Object)</span>
-=======
-      <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object-system-object)">Object.Equals(Object, Object)</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
     </div>
     <div>
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.gethashcode#system-object-gethashcode">Object.GetHashCode()</a>
@@ -133,24 +119,10 @@ <h3 id="properties">Properties
   </h3>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_NFTBulkMintingInfo_DidCoin.md&amp;value=---%0Auid%3A%20chia.dotnet.NFTBulkMintingInfo.DidCoin%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_NFTBulkMintingInfo_DidCoin.md&amp;value=---%0Auid%3A%20chia.dotnet.NFTBulkMintingInfo.DidCoin%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_NFTBulkMintingInfo_DidCoin.md&amp;value=---%0Auid%3A%20chia.dotnet.NFTBulkMintingInfo.DidCoin%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/NFTBulkMintingInfo.cs/#L37">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/NFTBulkMintingInfo.cs/#L37">View Source</a>
   </span>
   <a id="chia_dotnet_NFTBulkMintingInfo_DidCoin_" data-uid="chia.dotnet.NFTBulkMintingInfo.DidCoin*"></a>
   <h4 id="chia_dotnet_NFTBulkMintingInfo_DidCoin" data-uid="chia.dotnet.NFTBulkMintingInfo.DidCoin">DidCoin</h4>
@@ -177,24 +149,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_NFTBulkMintingInfo_DidLineageParentHex.md&amp;value=---%0Auid%3A%20chia.dotnet.NFTBulkMintingInfo.DidLineageParentHex%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_NFTBulkMintingInfo_DidLineageParentHex.md&amp;value=---%0Auid%3A%20chia.dotnet.NFTBulkMintingInfo.DidLineageParentHex%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_NFTBulkMintingInfo_DidLineageParentHex.md&amp;value=---%0Auid%3A%20chia.dotnet.NFTBulkMintingInfo.DidLineageParentHex%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/NFTBulkMintingInfo.cs/#L38">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/NFTBulkMintingInfo.cs/#L38">View Source</a>
   </span>
   <a id="chia_dotnet_NFTBulkMintingInfo_DidLineageParentHex_" data-uid="chia.dotnet.NFTBulkMintingInfo.DidLineageParentHex*"></a>
   <h4 id="chia_dotnet_NFTBulkMintingInfo_DidLineageParentHex" data-uid="chia.dotnet.NFTBulkMintingInfo.DidLineageParentHex">DidLineageParentHex</h4>
@@ -221,24 +179,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_NFTBulkMintingInfo_MetadataList.md&amp;value=---%0Auid%3A%20chia.dotnet.NFTBulkMintingInfo.MetadataList%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_NFTBulkMintingInfo_MetadataList.md&amp;value=---%0Auid%3A%20chia.dotnet.NFTBulkMintingInfo.MetadataList%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_NFTBulkMintingInfo_MetadataList.md&amp;value=---%0Auid%3A%20chia.dotnet.NFTBulkMintingInfo.MetadataList%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/NFTBulkMintingInfo.cs/#L12">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/NFTBulkMintingInfo.cs/#L12">View Source</a>
   </span>
   <a id="chia_dotnet_NFTBulkMintingInfo_MetadataList_" data-uid="chia.dotnet.NFTBulkMintingInfo.MetadataList*"></a>
   <h4 id="chia_dotnet_NFTBulkMintingInfo_MetadataList" data-uid="chia.dotnet.NFTBulkMintingInfo.MetadataList">MetadataList</h4>
@@ -265,24 +209,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_NFTBulkMintingInfo_MintFromDid.md&amp;value=---%0Auid%3A%20chia.dotnet.NFTBulkMintingInfo.MintFromDid%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_NFTBulkMintingInfo_MintFromDid.md&amp;value=---%0Auid%3A%20chia.dotnet.NFTBulkMintingInfo.MintFromDid%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_NFTBulkMintingInfo_MintFromDid.md&amp;value=---%0Auid%3A%20chia.dotnet.NFTBulkMintingInfo.MintFromDid%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/NFTBulkMintingInfo.cs/#L39">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/NFTBulkMintingInfo.cs/#L39">View Source</a>
   </span>
   <a id="chia_dotnet_NFTBulkMintingInfo_MintFromDid_" data-uid="chia.dotnet.NFTBulkMintingInfo.MintFromDid*"></a>
   <h4 id="chia_dotnet_NFTBulkMintingInfo_MintFromDid" data-uid="chia.dotnet.NFTBulkMintingInfo.MintFromDid">MintFromDid</h4>
@@ -309,24 +239,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_NFTBulkMintingInfo_MintNumberStart.md&amp;value=---%0Auid%3A%20chia.dotnet.NFTBulkMintingInfo.MintNumberStart%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_NFTBulkMintingInfo_MintNumberStart.md&amp;value=---%0Auid%3A%20chia.dotnet.NFTBulkMintingInfo.MintNumberStart%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_NFTBulkMintingInfo_MintNumberStart.md&amp;value=---%0Auid%3A%20chia.dotnet.NFTBulkMintingInfo.MintNumberStart%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/NFTBulkMintingInfo.cs/#L20">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/NFTBulkMintingInfo.cs/#L20">View Source</a>
   </span>
   <a id="chia_dotnet_NFTBulkMintingInfo_MintNumberStart_" data-uid="chia.dotnet.NFTBulkMintingInfo.MintNumberStart*"></a>
   <h4 id="chia_dotnet_NFTBulkMintingInfo_MintNumberStart" data-uid="chia.dotnet.NFTBulkMintingInfo.MintNumberStart">MintNumberStart</h4>
@@ -354,24 +270,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_NFTBulkMintingInfo_MintTotal.md&amp;value=---%0Auid%3A%20chia.dotnet.NFTBulkMintingInfo.MintTotal%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_NFTBulkMintingInfo_MintTotal.md&amp;value=---%0Auid%3A%20chia.dotnet.NFTBulkMintingInfo.MintTotal%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_NFTBulkMintingInfo_MintTotal.md&amp;value=---%0Auid%3A%20chia.dotnet.NFTBulkMintingInfo.MintTotal%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/NFTBulkMintingInfo.cs/#L24">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/NFTBulkMintingInfo.cs/#L24">View Source</a>
   </span>
   <a id="chia_dotnet_NFTBulkMintingInfo_MintTotal_" data-uid="chia.dotnet.NFTBulkMintingInfo.MintTotal*"></a>
   <h4 id="chia_dotnet_NFTBulkMintingInfo_MintTotal" data-uid="chia.dotnet.NFTBulkMintingInfo.MintTotal">MintTotal</h4>
@@ -399,24 +301,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_NFTBulkMintingInfo_NewInnerpuzhash.md&amp;value=---%0Auid%3A%20chia.dotnet.NFTBulkMintingInfo.NewInnerpuzhash%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_NFTBulkMintingInfo_NewInnerpuzhash.md&amp;value=---%0Auid%3A%20chia.dotnet.NFTBulkMintingInfo.NewInnerpuzhash%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_NFTBulkMintingInfo_NewInnerpuzhash.md&amp;value=---%0Auid%3A%20chia.dotnet.NFTBulkMintingInfo.NewInnerpuzhash%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/NFTBulkMintingInfo.cs/#L35">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/NFTBulkMintingInfo.cs/#L35">View Source</a>
   </span>
   <a id="chia_dotnet_NFTBulkMintingInfo_NewInnerpuzhash_" data-uid="chia.dotnet.NFTBulkMintingInfo.NewInnerpuzhash*"></a>
   <h4 id="chia_dotnet_NFTBulkMintingInfo_NewInnerpuzhash" data-uid="chia.dotnet.NFTBulkMintingInfo.NewInnerpuzhash">NewInnerpuzhash</h4>
@@ -443,24 +331,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_NFTBulkMintingInfo_NewP2Puzhash.md&amp;value=---%0Auid%3A%20chia.dotnet.NFTBulkMintingInfo.NewP2Puzhash%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_NFTBulkMintingInfo_NewP2Puzhash.md&amp;value=---%0Auid%3A%20chia.dotnet.NFTBulkMintingInfo.NewP2Puzhash%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_NFTBulkMintingInfo_NewP2Puzhash.md&amp;value=---%0Auid%3A%20chia.dotnet.NFTBulkMintingInfo.NewP2Puzhash%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/NFTBulkMintingInfo.cs/#L36">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/NFTBulkMintingInfo.cs/#L36">View Source</a>
   </span>
   <a id="chia_dotnet_NFTBulkMintingInfo_NewP2Puzhash_" data-uid="chia.dotnet.NFTBulkMintingInfo.NewP2Puzhash*"></a>
   <h4 id="chia_dotnet_NFTBulkMintingInfo_NewP2Puzhash" data-uid="chia.dotnet.NFTBulkMintingInfo.NewP2Puzhash">NewP2Puzhash</h4>
@@ -487,24 +361,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_NFTBulkMintingInfo_RoyaltyAddress.md&amp;value=---%0Auid%3A%20chia.dotnet.NFTBulkMintingInfo.RoyaltyAddress%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_NFTBulkMintingInfo_RoyaltyAddress.md&amp;value=---%0Auid%3A%20chia.dotnet.NFTBulkMintingInfo.RoyaltyAddress%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_NFTBulkMintingInfo_RoyaltyAddress.md&amp;value=---%0Auid%3A%20chia.dotnet.NFTBulkMintingInfo.RoyaltyAddress%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/NFTBulkMintingInfo.cs/#L10">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/NFTBulkMintingInfo.cs/#L10">View Source</a>
   </span>
   <a id="chia_dotnet_NFTBulkMintingInfo_RoyaltyAddress_" data-uid="chia.dotnet.NFTBulkMintingInfo.RoyaltyAddress*"></a>
   <h4 id="chia_dotnet_NFTBulkMintingInfo_RoyaltyAddress" data-uid="chia.dotnet.NFTBulkMintingInfo.RoyaltyAddress">RoyaltyAddress</h4>
@@ -531,24 +391,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_NFTBulkMintingInfo_RoyaltyPercentage.md&amp;value=---%0Auid%3A%20chia.dotnet.NFTBulkMintingInfo.RoyaltyPercentage%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_NFTBulkMintingInfo_RoyaltyPercentage.md&amp;value=---%0Auid%3A%20chia.dotnet.NFTBulkMintingInfo.RoyaltyPercentage%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_NFTBulkMintingInfo_RoyaltyPercentage.md&amp;value=---%0Auid%3A%20chia.dotnet.NFTBulkMintingInfo.RoyaltyPercentage%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/NFTBulkMintingInfo.cs/#L11">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/NFTBulkMintingInfo.cs/#L11">View Source</a>
   </span>
   <a id="chia_dotnet_NFTBulkMintingInfo_RoyaltyPercentage_" data-uid="chia.dotnet.NFTBulkMintingInfo.RoyaltyPercentage*"></a>
   <h4 id="chia_dotnet_NFTBulkMintingInfo_RoyaltyPercentage" data-uid="chia.dotnet.NFTBulkMintingInfo.RoyaltyPercentage">RoyaltyPercentage</h4>
@@ -575,24 +421,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_NFTBulkMintingInfo_TargetList.md&amp;value=---%0Auid%3A%20chia.dotnet.NFTBulkMintingInfo.TargetList%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_NFTBulkMintingInfo_TargetList.md&amp;value=---%0Auid%3A%20chia.dotnet.NFTBulkMintingInfo.TargetList%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_NFTBulkMintingInfo_TargetList.md&amp;value=---%0Auid%3A%20chia.dotnet.NFTBulkMintingInfo.TargetList%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/NFTBulkMintingInfo.cs/#L16">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/NFTBulkMintingInfo.cs/#L16">View Source</a>
   </span>
   <a id="chia_dotnet_NFTBulkMintingInfo_TargetList_" data-uid="chia.dotnet.NFTBulkMintingInfo.TargetList*"></a>
   <h4 id="chia_dotnet_NFTBulkMintingInfo_TargetList" data-uid="chia.dotnet.NFTBulkMintingInfo.TargetList">TargetList</h4>
@@ -620,24 +452,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_NFTBulkMintingInfo_XchChangeTarget.md&amp;value=---%0Auid%3A%20chia.dotnet.NFTBulkMintingInfo.XchChangeTarget%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_NFTBulkMintingInfo_XchChangeTarget.md&amp;value=---%0Auid%3A%20chia.dotnet.NFTBulkMintingInfo.XchChangeTarget%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_NFTBulkMintingInfo_XchChangeTarget.md&amp;value=---%0Auid%3A%20chia.dotnet.NFTBulkMintingInfo.XchChangeTarget%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/NFTBulkMintingInfo.cs/#L34">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/NFTBulkMintingInfo.cs/#L34">View Source</a>
   </span>
   <a id="chia_dotnet_NFTBulkMintingInfo_XchChangeTarget_" data-uid="chia.dotnet.NFTBulkMintingInfo.XchChangeTarget*"></a>
   <h4 id="chia_dotnet_NFTBulkMintingInfo_XchChangeTarget" data-uid="chia.dotnet.NFTBulkMintingInfo.XchChangeTarget">XchChangeTarget</h4>
@@ -666,24 +484,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_NFTBulkMintingInfo_XchCoins.md&amp;value=---%0Auid%3A%20chia.dotnet.NFTBulkMintingInfo.XchCoins%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_NFTBulkMintingInfo_XchCoins.md&amp;value=---%0Auid%3A%20chia.dotnet.NFTBulkMintingInfo.XchCoins%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_NFTBulkMintingInfo_XchCoins.md&amp;value=---%0Auid%3A%20chia.dotnet.NFTBulkMintingInfo.XchCoins%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/NFTBulkMintingInfo.cs/#L29">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/NFTBulkMintingInfo.cs/#L29">View Source</a>
   </span>
   <a id="chia_dotnet_NFTBulkMintingInfo_XchCoins_" data-uid="chia.dotnet.NFTBulkMintingInfo.XchCoins*"></a>
   <h4 id="chia_dotnet_NFTBulkMintingInfo_XchCoins" data-uid="chia.dotnet.NFTBulkMintingInfo.XchCoins">XchCoins</h4>
@@ -722,24 +526,10 @@ <h3 id="implements">Implements</h3>
               <div class="contribution">
                 <ul class="nav">
                   <li>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-                    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_NFTBulkMintingInfo.md&amp;value=---%0Auid%3A%20chia.dotnet.NFTBulkMintingInfo%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-                    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_NFTBulkMintingInfo.md&amp;value=---%0Auid%3A%20chia.dotnet.NFTBulkMintingInfo%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-=======
                     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_NFTBulkMintingInfo.md&amp;value=---%0Auid%3A%20chia.dotnet.NFTBulkMintingInfo%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
                   </li>
                   <li>
-                    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/NFTBulkMintingInfo.cs/#L8" class="contribution-link">View Source</a>
+                    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/NFTBulkMintingInfo.cs/#L8" class="contribution-link">View Source</a>
                   </li>
                 </ul>
               </div>
diff --git a/docs/api/chia.dotnet.NFTInfo.html b/docs/api/chia.dotnet.NFTInfo.html
index 9064e406..5c68e307 100644
--- a/docs/api/chia.dotnet.NFTInfo.html
+++ b/docs/api/chia.dotnet.NFTInfo.html
@@ -91,21 +91,7 @@ <h5>Inherited Members</h5>
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object)">Object.Equals(Object)</a>
     </div>
     <div>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object-system-object)">Object.Equals(Object, Object)</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-      <span class="xref">System.Object.Equals(System.Object, System.Object)</span>
-=======
-      <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object-system-object)">Object.Equals(Object, Object)</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
     </div>
     <div>
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.gethashcode#system-object-gethashcode">Object.GetHashCode()</a>
@@ -133,24 +119,10 @@ <h3 id="properties">Properties
   </h3>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_NFTInfo_ChainInfo.md&amp;value=---%0Auid%3A%20chia.dotnet.NFTInfo.ChainInfo%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_NFTInfo_ChainInfo.md&amp;value=---%0Auid%3A%20chia.dotnet.NFTInfo.ChainInfo%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_NFTInfo_ChainInfo.md&amp;value=---%0Auid%3A%20chia.dotnet.NFTInfo.ChainInfo%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/NFTInfo.cs/#L69">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/NFTInfo.cs/#L69">View Source</a>
   </span>
   <a id="chia_dotnet_NFTInfo_ChainInfo_" data-uid="chia.dotnet.NFTInfo.ChainInfo*"></a>
   <h4 id="chia_dotnet_NFTInfo_ChainInfo" data-uid="chia.dotnet.NFTInfo.ChainInfo">ChainInfo</h4>
@@ -178,24 +150,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_NFTInfo_DataHash.md&amp;value=---%0Auid%3A%20chia.dotnet.NFTInfo.DataHash%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_NFTInfo_DataHash.md&amp;value=---%0Auid%3A%20chia.dotnet.NFTInfo.DataHash%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_NFTInfo_DataHash.md&amp;value=---%0Auid%3A%20chia.dotnet.NFTInfo.DataHash%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/NFTInfo.cs/#L37">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/NFTInfo.cs/#L37">View Source</a>
   </span>
   <a id="chia_dotnet_NFTInfo_DataHash_" data-uid="chia.dotnet.NFTInfo.DataHash*"></a>
   <h4 id="chia_dotnet_NFTInfo_DataHash" data-uid="chia.dotnet.NFTInfo.DataHash">DataHash</h4>
@@ -223,24 +181,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_NFTInfo_DataUris.md&amp;value=---%0Auid%3A%20chia.dotnet.NFTInfo.DataUris%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_NFTInfo_DataUris.md&amp;value=---%0Auid%3A%20chia.dotnet.NFTInfo.DataUris%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_NFTInfo_DataUris.md&amp;value=---%0Auid%3A%20chia.dotnet.NFTInfo.DataUris%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/NFTInfo.cs/#L33">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/NFTInfo.cs/#L33">View Source</a>
   </span>
   <a id="chia_dotnet_NFTInfo_DataUris_" data-uid="chia.dotnet.NFTInfo.DataUris*"></a>
   <h4 id="chia_dotnet_NFTInfo_DataUris" data-uid="chia.dotnet.NFTInfo.DataUris">DataUris</h4>
@@ -268,24 +212,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_NFTInfo_EditionNumber.md&amp;value=---%0Auid%3A%20chia.dotnet.NFTInfo.EditionNumber%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_NFTInfo_EditionNumber.md&amp;value=---%0Auid%3A%20chia.dotnet.NFTInfo.EditionNumber%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_NFTInfo_EditionNumber.md&amp;value=---%0Auid%3A%20chia.dotnet.NFTInfo.EditionNumber%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/NFTInfo.cs/#L61">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/NFTInfo.cs/#L61">View Source</a>
   </span>
   <a id="chia_dotnet_NFTInfo_EditionNumber_" data-uid="chia.dotnet.NFTInfo.EditionNumber*"></a>
   <h4 id="chia_dotnet_NFTInfo_EditionNumber" data-uid="chia.dotnet.NFTInfo.EditionNumber">EditionNumber</h4>
@@ -313,24 +243,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_NFTInfo_EditionTotal.md&amp;value=---%0Auid%3A%20chia.dotnet.NFTInfo.EditionTotal%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_NFTInfo_EditionTotal.md&amp;value=---%0Auid%3A%20chia.dotnet.NFTInfo.EditionTotal%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_NFTInfo_EditionTotal.md&amp;value=---%0Auid%3A%20chia.dotnet.NFTInfo.EditionTotal%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/NFTInfo.cs/#L57">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/NFTInfo.cs/#L57">View Source</a>
   </span>
   <a id="chia_dotnet_NFTInfo_EditionTotal_" data-uid="chia.dotnet.NFTInfo.EditionTotal*"></a>
   <h4 id="chia_dotnet_NFTInfo_EditionTotal" data-uid="chia.dotnet.NFTInfo.EditionTotal">EditionTotal</h4>
@@ -358,24 +274,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_NFTInfo_LauncherId.md&amp;value=---%0Auid%3A%20chia.dotnet.NFTInfo.LauncherId%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_NFTInfo_LauncherId.md&amp;value=---%0Auid%3A%20chia.dotnet.NFTInfo.LauncherId%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_NFTInfo_LauncherId.md&amp;value=---%0Auid%3A%20chia.dotnet.NFTInfo.LauncherId%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/NFTInfo.cs/#L13">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/NFTInfo.cs/#L13">View Source</a>
   </span>
   <a id="chia_dotnet_NFTInfo_LauncherId_" data-uid="chia.dotnet.NFTInfo.LauncherId*"></a>
   <h4 id="chia_dotnet_NFTInfo_LauncherId" data-uid="chia.dotnet.NFTInfo.LauncherId">LauncherId</h4>
@@ -403,24 +305,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_NFTInfo_LauncherPuzhash.md&amp;value=---%0Auid%3A%20chia.dotnet.NFTInfo.LauncherPuzhash%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_NFTInfo_LauncherPuzhash.md&amp;value=---%0Auid%3A%20chia.dotnet.NFTInfo.LauncherPuzhash%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_NFTInfo_LauncherPuzhash.md&amp;value=---%0Auid%3A%20chia.dotnet.NFTInfo.LauncherPuzhash%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/NFTInfo.cs/#L85">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/NFTInfo.cs/#L85">View Source</a>
   </span>
   <a id="chia_dotnet_NFTInfo_LauncherPuzhash_" data-uid="chia.dotnet.NFTInfo.LauncherPuzhash*"></a>
   <h4 id="chia_dotnet_NFTInfo_LauncherPuzhash" data-uid="chia.dotnet.NFTInfo.LauncherPuzhash">LauncherPuzhash</h4>
@@ -448,24 +336,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_NFTInfo_LicenseHash.md&amp;value=---%0Auid%3A%20chia.dotnet.NFTInfo.LicenseHash%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_NFTInfo_LicenseHash.md&amp;value=---%0Auid%3A%20chia.dotnet.NFTInfo.LicenseHash%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_NFTInfo_LicenseHash.md&amp;value=---%0Auid%3A%20chia.dotnet.NFTInfo.LicenseHash%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/NFTInfo.cs/#L53">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/NFTInfo.cs/#L53">View Source</a>
   </span>
   <a id="chia_dotnet_NFTInfo_LicenseHash_" data-uid="chia.dotnet.NFTInfo.LicenseHash*"></a>
   <h4 id="chia_dotnet_NFTInfo_LicenseHash" data-uid="chia.dotnet.NFTInfo.LicenseHash">LicenseHash</h4>
@@ -493,24 +367,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_NFTInfo_LicenseUris.md&amp;value=---%0Auid%3A%20chia.dotnet.NFTInfo.LicenseUris%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_NFTInfo_LicenseUris.md&amp;value=---%0Auid%3A%20chia.dotnet.NFTInfo.LicenseUris%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_NFTInfo_LicenseUris.md&amp;value=---%0Auid%3A%20chia.dotnet.NFTInfo.LicenseUris%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/NFTInfo.cs/#L49">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/NFTInfo.cs/#L49">View Source</a>
   </span>
   <a id="chia_dotnet_NFTInfo_LicenseUris_" data-uid="chia.dotnet.NFTInfo.LicenseUris*"></a>
   <h4 id="chia_dotnet_NFTInfo_LicenseUris" data-uid="chia.dotnet.NFTInfo.LicenseUris">LicenseUris</h4>
@@ -538,24 +398,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_NFTInfo_MetadataHash.md&amp;value=---%0Auid%3A%20chia.dotnet.NFTInfo.MetadataHash%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_NFTInfo_MetadataHash.md&amp;value=---%0Auid%3A%20chia.dotnet.NFTInfo.MetadataHash%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_NFTInfo_MetadataHash.md&amp;value=---%0Auid%3A%20chia.dotnet.NFTInfo.MetadataHash%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/NFTInfo.cs/#L45">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/NFTInfo.cs/#L45">View Source</a>
   </span>
   <a id="chia_dotnet_NFTInfo_MetadataHash_" data-uid="chia.dotnet.NFTInfo.MetadataHash*"></a>
   <h4 id="chia_dotnet_NFTInfo_MetadataHash" data-uid="chia.dotnet.NFTInfo.MetadataHash">MetadataHash</h4>
@@ -583,24 +429,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_NFTInfo_MetadataUris.md&amp;value=---%0Auid%3A%20chia.dotnet.NFTInfo.MetadataUris%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_NFTInfo_MetadataUris.md&amp;value=---%0Auid%3A%20chia.dotnet.NFTInfo.MetadataUris%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_NFTInfo_MetadataUris.md&amp;value=---%0Auid%3A%20chia.dotnet.NFTInfo.MetadataUris%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/NFTInfo.cs/#L41">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/NFTInfo.cs/#L41">View Source</a>
   </span>
   <a id="chia_dotnet_NFTInfo_MetadataUris_" data-uid="chia.dotnet.NFTInfo.MetadataUris*"></a>
   <h4 id="chia_dotnet_NFTInfo_MetadataUris" data-uid="chia.dotnet.NFTInfo.MetadataUris">MetadataUris</h4>
@@ -628,23 +460,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_NFTInfo_MinterDID.md&amp;value=---%0Auid%3A%20chia.dotnet.NFTInfo.MinterDID%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_NFTInfo_MinterDID.md&amp;value=---%0Auid%3A%20chia.dotnet.NFTInfo.MinterDID%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/NFTInfo.cs/#L89">View Source</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_NFTInfo_MinterDID.md&amp;value=---%0Auid%3A%20chia.dotnet.NFTInfo.MinterDID%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
   </span>
   <span class="small pull-right mobile-hide">
     <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/NFTInfo.cs/#L89">View Source</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
   </span>
   <a id="chia_dotnet_NFTInfo_MinterDID_" data-uid="chia.dotnet.NFTInfo.MinterDID*"></a>
   <h4 id="chia_dotnet_NFTInfo_MinterDID" data-uid="chia.dotnet.NFTInfo.MinterDID">MinterDID</h4>
@@ -672,9 +491,6 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_NFTInfo_MintHeight.md&amp;value=---%0Auid%3A%20chia.dotnet.NFTInfo.MintHeight%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_NFTInfo_MintHeight.md&amp;value=---%0Auid%3A%20chia.dotnet.NFTInfo.MintHeight%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
   </span>
   <span class="small pull-right mobile-hide">
@@ -707,88 +523,9 @@ <h5 class="propertyValue">Property Value</h5>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_NFTInfo_NFTCoinID.md&amp;value=---%0Auid%3A%20chia.dotnet.NFTInfo.NFTCoinID%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/NFTInfo.cs/#L73">View Source</a>
-  </span>
-  <a id="chia_dotnet_NFTInfo_MintHeight_" data-uid="chia.dotnet.NFTInfo.MintHeight*"></a>
-  <h4 id="chia_dotnet_NFTInfo_MintHeight" data-uid="chia.dotnet.NFTInfo.MintHeight">MintHeight</h4>
-  <div class="markdown level1 summary"><p>Block height of the NFT minting</p>
-</div>
-  <div class="markdown level1 conceptual"></div>
-  <h5 class="decalaration">Declaration</h5>
-  <div class="codewrapper">
-<<<<<<< HEAD
-    <pre><code class="lang-csharp hljs">public string MinterDID { get; set; }</code></pre>
-=======
-    <pre><code class="lang-csharp hljs">public uint MintHeight { get; set; }</code></pre>
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
-  </div>
-  <h5 class="propertyValue">Property Value</h5>
-  <table class="table table-bordered table-striped table-condensed">
-    <thead>
-      <tr>
-        <th>Type</th>
-        <th>Description</th>
-      </tr>
-    </thead>
-    <tbody>
-      <tr>
-<<<<<<< HEAD
-        <td><a class="xref" href="https://learn.microsoft.com/dotnet/api/system.string">String</a></td>
-=======
-        <td><a class="xref" href="https://learn.microsoft.com/dotnet/api/system.uint32">UInt32</a></td>
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
-        <td></td>
-      </tr>
-    </tbody>
-  </table>
-  <span class="small pull-right mobile-hide">
-    <span class="divider">|</span>
-<<<<<<< HEAD
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_NFTInfo_MintHeight.md&amp;value=---%0Auid%3A%20chia.dotnet.NFTInfo.MintHeight%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/NFTInfo.cs/#L73">View Source</a>
-  </span>
-  <a id="chia_dotnet_NFTInfo_MintHeight_" data-uid="chia.dotnet.NFTInfo.MintHeight*"></a>
-  <h4 id="chia_dotnet_NFTInfo_MintHeight" data-uid="chia.dotnet.NFTInfo.MintHeight">MintHeight</h4>
-  <div class="markdown level1 summary"><p>Block height of the NFT minting</p>
-</div>
-  <div class="markdown level1 conceptual"></div>
-  <h5 class="decalaration">Declaration</h5>
-  <div class="codewrapper">
-    <pre><code class="lang-csharp hljs">public uint MintHeight { get; set; }</code></pre>
-  </div>
-  <h5 class="propertyValue">Property Value</h5>
-  <table class="table table-bordered table-striped table-condensed">
-    <thead>
-      <tr>
-        <th>Type</th>
-        <th>Description</th>
-      </tr>
-    </thead>
-    <tbody>
-      <tr>
-        <td><a class="xref" href="https://learn.microsoft.com/dotnet/api/system.uint32">UInt32</a></td>
-        <td></td>
-      </tr>
-    </tbody>
-  </table>
-  <span class="small pull-right mobile-hide">
-    <span class="divider">|</span>
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_NFTInfo_NFTCoinID.md&amp;value=---%0Auid%3A%20chia.dotnet.NFTInfo.NFTCoinID%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_NFTInfo_NFTCoinID.md&amp;value=---%0Auid%3A%20chia.dotnet.NFTInfo.NFTCoinID%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/NFTInfo.cs/#L17">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/NFTInfo.cs/#L17">View Source</a>
   </span>
   <a id="chia_dotnet_NFTInfo_NFTCoinID_" data-uid="chia.dotnet.NFTInfo.NFTCoinID*"></a>
   <h4 id="chia_dotnet_NFTInfo_NFTCoinID" data-uid="chia.dotnet.NFTInfo.NFTCoinID">NFTCoinID</h4>
@@ -816,24 +553,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_NFTInfo_OffChainMetadata.md&amp;value=---%0Auid%3A%20chia.dotnet.NFTInfo.OffChainMetadata%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_NFTInfo_OffChainMetadata.md&amp;value=---%0Auid%3A%20chia.dotnet.NFTInfo.OffChainMetadata%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_NFTInfo_OffChainMetadata.md&amp;value=---%0Auid%3A%20chia.dotnet.NFTInfo.OffChainMetadata%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/NFTInfo.cs/#L93">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/NFTInfo.cs/#L93">View Source</a>
   </span>
   <a id="chia_dotnet_NFTInfo_OffChainMetadata_" data-uid="chia.dotnet.NFTInfo.OffChainMetadata*"></a>
   <h4 id="chia_dotnet_NFTInfo_OffChainMetadata" data-uid="chia.dotnet.NFTInfo.OffChainMetadata">OffChainMetadata</h4>
@@ -861,24 +584,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_NFTInfo_OwnerDID.md&amp;value=---%0Auid%3A%20chia.dotnet.NFTInfo.OwnerDID%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_NFTInfo_OwnerDID.md&amp;value=---%0Auid%3A%20chia.dotnet.NFTInfo.OwnerDID%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_NFTInfo_OwnerDID.md&amp;value=---%0Auid%3A%20chia.dotnet.NFTInfo.OwnerDID%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/NFTInfo.cs/#L21">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/NFTInfo.cs/#L21">View Source</a>
   </span>
   <a id="chia_dotnet_NFTInfo_OwnerDID_" data-uid="chia.dotnet.NFTInfo.OwnerDID*"></a>
   <h4 id="chia_dotnet_NFTInfo_OwnerDID" data-uid="chia.dotnet.NFTInfo.OwnerDID">OwnerDID</h4>
@@ -906,24 +615,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_NFTInfo_P2Address.md&amp;value=---%0Auid%3A%20chia.dotnet.NFTInfo.P2Address%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_NFTInfo_P2Address.md&amp;value=---%0Auid%3A%20chia.dotnet.NFTInfo.P2Address%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_NFTInfo_P2Address.md&amp;value=---%0Auid%3A%20chia.dotnet.NFTInfo.P2Address%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/NFTInfo.cs/#L97">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/NFTInfo.cs/#L97">View Source</a>
   </span>
   <a id="chia_dotnet_NFTInfo_P2Address_" data-uid="chia.dotnet.NFTInfo.P2Address*"></a>
   <h4 id="chia_dotnet_NFTInfo_P2Address" data-uid="chia.dotnet.NFTInfo.P2Address">P2Address</h4>
@@ -951,24 +646,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_NFTInfo_PendingTransaction.md&amp;value=---%0Auid%3A%20chia.dotnet.NFTInfo.PendingTransaction%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_NFTInfo_PendingTransaction.md&amp;value=---%0Auid%3A%20chia.dotnet.NFTInfo.PendingTransaction%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_NFTInfo_PendingTransaction.md&amp;value=---%0Auid%3A%20chia.dotnet.NFTInfo.PendingTransaction%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/NFTInfo.cs/#L81">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/NFTInfo.cs/#L81">View Source</a>
   </span>
   <a id="chia_dotnet_NFTInfo_PendingTransaction_" data-uid="chia.dotnet.NFTInfo.PendingTransaction*"></a>
   <h4 id="chia_dotnet_NFTInfo_PendingTransaction" data-uid="chia.dotnet.NFTInfo.PendingTransaction">PendingTransaction</h4>
@@ -996,24 +677,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_NFTInfo_RoyaltyPercentage.md&amp;value=---%0Auid%3A%20chia.dotnet.NFTInfo.RoyaltyPercentage%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_NFTInfo_RoyaltyPercentage.md&amp;value=---%0Auid%3A%20chia.dotnet.NFTInfo.RoyaltyPercentage%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_NFTInfo_RoyaltyPercentage.md&amp;value=---%0Auid%3A%20chia.dotnet.NFTInfo.RoyaltyPercentage%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/NFTInfo.cs/#L25">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/NFTInfo.cs/#L25">View Source</a>
   </span>
   <a id="chia_dotnet_NFTInfo_RoyaltyPercentage_" data-uid="chia.dotnet.NFTInfo.RoyaltyPercentage*"></a>
   <h4 id="chia_dotnet_NFTInfo_RoyaltyPercentage" data-uid="chia.dotnet.NFTInfo.RoyaltyPercentage">RoyaltyPercentage</h4>
@@ -1041,24 +708,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_NFTInfo_RoyaltyPuzzleHash.md&amp;value=---%0Auid%3A%20chia.dotnet.NFTInfo.RoyaltyPuzzleHash%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_NFTInfo_RoyaltyPuzzleHash.md&amp;value=---%0Auid%3A%20chia.dotnet.NFTInfo.RoyaltyPuzzleHash%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_NFTInfo_RoyaltyPuzzleHash.md&amp;value=---%0Auid%3A%20chia.dotnet.NFTInfo.RoyaltyPuzzleHash%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/NFTInfo.cs/#L29">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/NFTInfo.cs/#L29">View Source</a>
   </span>
   <a id="chia_dotnet_NFTInfo_RoyaltyPuzzleHash_" data-uid="chia.dotnet.NFTInfo.RoyaltyPuzzleHash*"></a>
   <h4 id="chia_dotnet_NFTInfo_RoyaltyPuzzleHash" data-uid="chia.dotnet.NFTInfo.RoyaltyPuzzleHash">RoyaltyPuzzleHash</h4>
@@ -1086,24 +739,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_NFTInfo_SupportsDID.md&amp;value=---%0Auid%3A%20chia.dotnet.NFTInfo.SupportsDID%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_NFTInfo_SupportsDID.md&amp;value=---%0Auid%3A%20chia.dotnet.NFTInfo.SupportsDID%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_NFTInfo_SupportsDID.md&amp;value=---%0Auid%3A%20chia.dotnet.NFTInfo.SupportsDID%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/NFTInfo.cs/#L77">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/NFTInfo.cs/#L77">View Source</a>
   </span>
   <a id="chia_dotnet_NFTInfo_SupportsDID_" data-uid="chia.dotnet.NFTInfo.SupportsDID*"></a>
   <h4 id="chia_dotnet_NFTInfo_SupportsDID" data-uid="chia.dotnet.NFTInfo.SupportsDID">SupportsDID</h4>
@@ -1131,24 +770,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_NFTInfo_UpdaterPuzhash.md&amp;value=---%0Auid%3A%20chia.dotnet.NFTInfo.UpdaterPuzhash%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_NFTInfo_UpdaterPuzhash.md&amp;value=---%0Auid%3A%20chia.dotnet.NFTInfo.UpdaterPuzhash%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_NFTInfo_UpdaterPuzhash.md&amp;value=---%0Auid%3A%20chia.dotnet.NFTInfo.UpdaterPuzhash%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/NFTInfo.cs/#L65">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/NFTInfo.cs/#L65">View Source</a>
   </span>
   <a id="chia_dotnet_NFTInfo_UpdaterPuzhash_" data-uid="chia.dotnet.NFTInfo.UpdaterPuzhash*"></a>
   <h4 id="chia_dotnet_NFTInfo_UpdaterPuzhash" data-uid="chia.dotnet.NFTInfo.UpdaterPuzhash">UpdaterPuzhash</h4>
@@ -1186,24 +811,10 @@ <h3 id="implements">Implements</h3>
               <div class="contribution">
                 <ul class="nav">
                   <li>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-                    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_NFTInfo.md&amp;value=---%0Auid%3A%20chia.dotnet.NFTInfo%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-                    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_NFTInfo.md&amp;value=---%0Auid%3A%20chia.dotnet.NFTInfo%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-=======
                     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_NFTInfo.md&amp;value=---%0Auid%3A%20chia.dotnet.NFTInfo%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
                   </li>
                   <li>
-                    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/NFTInfo.cs/#L8" class="contribution-link">View Source</a>
+                    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/NFTInfo.cs/#L8" class="contribution-link">View Source</a>
                   </li>
                 </ul>
               </div>
diff --git a/docs/api/chia.dotnet.NFTMintingInfo.html b/docs/api/chia.dotnet.NFTMintingInfo.html
index 0b1e0e42..fd797ded 100644
--- a/docs/api/chia.dotnet.NFTMintingInfo.html
+++ b/docs/api/chia.dotnet.NFTMintingInfo.html
@@ -120,21 +120,7 @@ <h5>Inherited Members</h5>
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object)">Object.Equals(Object)</a>
     </div>
     <div>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object-system-object)">Object.Equals(Object, Object)</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-      <span class="xref">System.Object.Equals(System.Object, System.Object)</span>
-=======
-      <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object-system-object)">Object.Equals(Object, Object)</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
     </div>
     <div>
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.gethashcode#system-object-gethashcode">Object.GetHashCode()</a>
@@ -162,24 +148,10 @@ <h3 id="properties">Properties
   </h3>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_NFTMintingInfo_DidId.md&amp;value=---%0Auid%3A%20chia.dotnet.NFTMintingInfo.DidId%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_NFTMintingInfo_DidId.md&amp;value=---%0Auid%3A%20chia.dotnet.NFTMintingInfo.DidId%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_NFTMintingInfo_DidId.md&amp;value=---%0Auid%3A%20chia.dotnet.NFTMintingInfo.DidId%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/NFTMintingInfo.cs/#L25">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/NFTMintingInfo.cs/#L25">View Source</a>
   </span>
   <a id="chia_dotnet_NFTMintingInfo_DidId_" data-uid="chia.dotnet.NFTMintingInfo.DidId*"></a>
   <h4 id="chia_dotnet_NFTMintingInfo_DidId" data-uid="chia.dotnet.NFTMintingInfo.DidId">DidId</h4>
@@ -206,24 +178,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_NFTMintingInfo_RoyaltyAddress.md&amp;value=---%0Auid%3A%20chia.dotnet.NFTMintingInfo.RoyaltyAddress%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_NFTMintingInfo_RoyaltyAddress.md&amp;value=---%0Auid%3A%20chia.dotnet.NFTMintingInfo.RoyaltyAddress%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_NFTMintingInfo_RoyaltyAddress.md&amp;value=---%0Auid%3A%20chia.dotnet.NFTMintingInfo.RoyaltyAddress%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/NFTMintingInfo.cs/#L23">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/NFTMintingInfo.cs/#L23">View Source</a>
   </span>
   <a id="chia_dotnet_NFTMintingInfo_RoyaltyAddress_" data-uid="chia.dotnet.NFTMintingInfo.RoyaltyAddress*"></a>
   <h4 id="chia_dotnet_NFTMintingInfo_RoyaltyAddress" data-uid="chia.dotnet.NFTMintingInfo.RoyaltyAddress">RoyaltyAddress</h4>
@@ -250,24 +208,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_NFTMintingInfo_TargetAddress.md&amp;value=---%0Auid%3A%20chia.dotnet.NFTMintingInfo.TargetAddress%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_NFTMintingInfo_TargetAddress.md&amp;value=---%0Auid%3A%20chia.dotnet.NFTMintingInfo.TargetAddress%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_NFTMintingInfo_TargetAddress.md&amp;value=---%0Auid%3A%20chia.dotnet.NFTMintingInfo.TargetAddress%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/NFTMintingInfo.cs/#L24">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/NFTMintingInfo.cs/#L24">View Source</a>
   </span>
   <a id="chia_dotnet_NFTMintingInfo_TargetAddress_" data-uid="chia.dotnet.NFTMintingInfo.TargetAddress*"></a>
   <h4 id="chia_dotnet_NFTMintingInfo_TargetAddress" data-uid="chia.dotnet.NFTMintingInfo.TargetAddress">TargetAddress</h4>
@@ -307,24 +251,10 @@ <h3 id="implements">Implements</h3>
               <div class="contribution">
                 <ul class="nav">
                   <li>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-                    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_NFTMintingInfo.md&amp;value=---%0Auid%3A%20chia.dotnet.NFTMintingInfo%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-                    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_NFTMintingInfo.md&amp;value=---%0Auid%3A%20chia.dotnet.NFTMintingInfo%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-=======
                     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_NFTMintingInfo.md&amp;value=---%0Auid%3A%20chia.dotnet.NFTMintingInfo%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
                   </li>
                   <li>
-                    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/NFTMintingInfo.cs/#L21" class="contribution-link">View Source</a>
+                    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/NFTMintingInfo.cs/#L21" class="contribution-link">View Source</a>
                   </li>
                 </ul>
               </div>
diff --git a/docs/api/chia.dotnet.NFTWallet.html b/docs/api/chia.dotnet.NFTWallet.html
index 1cb1465f..c3827086 100644
--- a/docs/api/chia.dotnet.NFTWallet.html
+++ b/docs/api/chia.dotnet.NFTWallet.html
@@ -158,24 +158,10 @@ <h3 id="constructors">Constructors
   </h3>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_NFTWallet__ctor_System_UInt32_chia_dotnet_WalletProxy_.md&amp;value=---%0Auid%3A%20chia.dotnet.NFTWallet.%23ctor(System.UInt32%2Cchia.dotnet.WalletProxy)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_NFTWallet__ctor_System_UInt32_chia_dotnet_WalletProxy_.md&amp;value=---%0Auid%3A%20chia.dotnet.NFTWallet.%23ctor(System.UInt32%2Cchia.dotnet.WalletProxy)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_NFTWallet__ctor_System_UInt32_chia_dotnet_WalletProxy_.md&amp;value=---%0Auid%3A%20chia.dotnet.NFTWallet.%23ctor(System.UInt32%2Cchia.dotnet.WalletProxy)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/NFTWallet.cs/#L18">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/NFTWallet.cs/#L18">View Source</a>
   </span>
   <a id="chia_dotnet_NFTWallet__ctor_" data-uid="chia.dotnet.NFTWallet.#ctor*"></a>
   <h4 id="chia_dotnet_NFTWallet__ctor_System_UInt32_chia_dotnet_WalletProxy_" data-uid="chia.dotnet.NFTWallet.#ctor(System.UInt32,chia.dotnet.WalletProxy)">NFTWallet(UInt32, WalletProxy)</h4>
@@ -214,24 +200,10 @@ <h3 id="methods">Methods
   </h3>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_NFTWallet_AddUri_System_String_System_String_System_String_System_Nullable_System_Boolean__System_UInt64_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.NFTWallet.AddUri(System.String%2CSystem.String%2CSystem.String%2CSystem.Nullable%7BSystem.Boolean%7D%2CSystem.UInt64%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_NFTWallet_AddUri_System_String_System_String_System_String_System_Nullable_System_Boolean__System_UInt64_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.NFTWallet.AddUri(System.String%2CSystem.String%2CSystem.String%2CSystem.Nullable%7BSystem.Boolean%7D%2CSystem.UInt64%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_NFTWallet_AddUri_System_String_System_String_System_String_System_Nullable_System_Boolean__System_UInt64_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.NFTWallet.AddUri(System.String%2CSystem.String%2CSystem.String%2CSystem.Nullable%7BSystem.Boolean%7D%2CSystem.UInt64%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/NFTWallet.cs/#L45">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/NFTWallet.cs/#L45">View Source</a>
   </span>
   <a id="chia_dotnet_NFTWallet_AddUri_" data-uid="chia.dotnet.NFTWallet.AddUri*"></a>
   <h4 id="chia_dotnet_NFTWallet_AddUri_System_String_System_String_System_String_System_Nullable_System_Boolean__System_UInt64_System_Threading_CancellationToken_" data-uid="chia.dotnet.NFTWallet.AddUri(System.String,System.String,System.String,System.Nullable{System.Boolean},System.UInt64,System.Threading.CancellationToken)">AddUri(String, String, String, Nullable&lt;Boolean&gt;, UInt64, CancellationToken)</h4>
@@ -312,30 +284,10 @@ <h5 class="returns">Returns</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_NFTWallet_GetDid_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.NFTWallet.GetDid(System.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/NFTWallet.cs/#L90">View Source</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_NFTWallet_GetDid_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.NFTWallet.GetDid(System.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/NFTWallet.cs/#L90">View Source</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_NFTWallet_GetDid_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.NFTWallet.GetDid(System.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
   </span>
   <span class="small pull-right mobile-hide">
     <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/NFTWallet.cs/#L90">View Source</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <a id="chia_dotnet_NFTWallet_GetDid_" data-uid="chia.dotnet.NFTWallet.GetDid*"></a>
   <h4 id="chia_dotnet_NFTWallet_GetDid_System_Threading_CancellationToken_" data-uid="chia.dotnet.NFTWallet.GetDid(System.Threading.CancellationToken)">GetDid(CancellationToken)</h4>
@@ -382,24 +334,10 @@ <h5 class="returns">Returns</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_NFTWallet_GetNFTs_System_Int32_System_Int32_System_Boolean_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.NFTWallet.GetNFTs(System.Int32%2CSystem.Int32%2CSystem.Boolean%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_NFTWallet_GetNFTs_System_Int32_System_Int32_System_Boolean_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.NFTWallet.GetNFTs(System.Int32%2CSystem.Int32%2CSystem.Boolean%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_NFTWallet_GetNFTs_System_Int32_System_Int32_System_Boolean_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.NFTWallet.GetNFTs(System.Int32%2CSystem.Int32%2CSystem.Boolean%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/NFTWallet.cs/#L75">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/NFTWallet.cs/#L75">View Source</a>
   </span>
   <a id="chia_dotnet_NFTWallet_GetNFTs_" data-uid="chia.dotnet.NFTWallet.GetNFTs*"></a>
   <h4 id="chia_dotnet_NFTWallet_GetNFTs_System_Int32_System_Int32_System_Boolean_System_Threading_CancellationToken_" data-uid="chia.dotnet.NFTWallet.GetNFTs(System.Int32,System.Int32,System.Boolean,System.Threading.CancellationToken)">GetNFTs(Int32, Int32, Boolean, CancellationToken)</h4>
@@ -461,30 +399,10 @@ <h5 class="returns">Returns</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_NFTWallet_MintNFT_chia_dotnet_NFTMintingInfo_System_Nullable_System_Boolean__System_UInt64_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.NFTWallet.MintNFT(chia.dotnet.NFTMintingInfo%2CSystem.Nullable%7BSystem.Boolean%7D%2CSystem.UInt64%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/NFTWallet.cs/#L103">View Source</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_NFTWallet_MintNFT_chia_dotnet_NFTMintingInfo_System_Nullable_System_Boolean__System_UInt64_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.NFTWallet.MintNFT(chia.dotnet.NFTMintingInfo%2CSystem.Nullable%7BSystem.Boolean%7D%2CSystem.UInt64%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/NFTWallet.cs/#L103">View Source</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_NFTWallet_MintNFT_chia_dotnet_NFTMintingInfo_System_Nullable_System_Boolean__System_UInt64_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.NFTWallet.MintNFT(chia.dotnet.NFTMintingInfo%2CSystem.Nullable%7BSystem.Boolean%7D%2CSystem.UInt64%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
   </span>
   <span class="small pull-right mobile-hide">
     <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/NFTWallet.cs/#L103">View Source</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <a id="chia_dotnet_NFTWallet_MintNFT_" data-uid="chia.dotnet.NFTWallet.MintNFT*"></a>
   <h4 id="chia_dotnet_NFTWallet_MintNFT_chia_dotnet_NFTMintingInfo_System_Nullable_System_Boolean__System_UInt64_System_Threading_CancellationToken_" data-uid="chia.dotnet.NFTWallet.MintNFT(chia.dotnet.NFTMintingInfo,System.Nullable{System.Boolean},System.UInt64,System.Threading.CancellationToken)">MintNFT(NFTMintingInfo, Nullable&lt;Boolean&gt;, UInt64, CancellationToken)</h4>
@@ -548,24 +466,10 @@ <h5 class="returns">Returns</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_NFTWallet_NftCountNfts_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.NFTWallet.NftCountNfts(System.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_NFTWallet_NftCountNfts_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.NFTWallet.NftCountNfts(System.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_NFTWallet_NftCountNfts_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.NFTWallet.NftCountNfts(System.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/NFTWallet.cs/#L62">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/NFTWallet.cs/#L62">View Source</a>
   </span>
   <a id="chia_dotnet_NFTWallet_NftCountNfts_" data-uid="chia.dotnet.NFTWallet.NftCountNfts*"></a>
   <h4 id="chia_dotnet_NFTWallet_NftCountNfts_System_Threading_CancellationToken_" data-uid="chia.dotnet.NFTWallet.NftCountNfts(System.Threading.CancellationToken)">NftCountNfts(CancellationToken)</h4>
@@ -612,30 +516,10 @@ <h5 class="returns">Returns</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_NFTWallet_NftMintBulk_chia_dotnet_NFTBulkMintingInfo_System_Nullable_System_Boolean__System_UInt64_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.NFTWallet.NftMintBulk(chia.dotnet.NFTBulkMintingInfo%2CSystem.Nullable%7BSystem.Boolean%7D%2CSystem.UInt64%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
   </span>
   <span class="small pull-right mobile-hide">
     <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/NFTWallet.cs/#L132">View Source</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_NFTWallet_NftMintBulk_chia_dotnet_NFTBulkMintingInfo_System_Nullable_System_Boolean__System_UInt64_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.NFTWallet.NftMintBulk(chia.dotnet.NFTBulkMintingInfo%2CSystem.Nullable%7BSystem.Boolean%7D%2CSystem.UInt64%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/NFTWallet.cs/#L132">View Source</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_NFTWallet_NftMintBulk_chia_dotnet_NFTBulkMintingInfo_System_Nullable_System_Boolean__System_UInt64_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.NFTWallet.NftMintBulk(chia.dotnet.NFTBulkMintingInfo%2CSystem.Nullable%7BSystem.Boolean%7D%2CSystem.UInt64%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/NFTWallet.cs/#L132">View Source</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <a id="chia_dotnet_NFTWallet_NftMintBulk_" data-uid="chia.dotnet.NFTWallet.NftMintBulk*"></a>
   <h4 id="chia_dotnet_NFTWallet_NftMintBulk_chia_dotnet_NFTBulkMintingInfo_System_Nullable_System_Boolean__System_UInt64_System_Threading_CancellationToken_" data-uid="chia.dotnet.NFTWallet.NftMintBulk(chia.dotnet.NFTBulkMintingInfo,System.Nullable{System.Boolean},System.UInt64,System.Threading.CancellationToken)">NftMintBulk(NFTBulkMintingInfo, Nullable&lt;Boolean&gt;, UInt64, CancellationToken)</h4>
@@ -698,34 +582,10 @@ <h5 class="returns">Returns</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_NFTWallet_SetDID_System_String_System_Nullable_System_Boolean__System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.NFTWallet.SetDID(System.String%2CSystem.Nullable%7BSystem.Boolean%7D%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-<<<<<<< HEAD
-    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/NFTWallet.cs/#L168">View Source</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_NFTWallet_SetDID_System_String_System_Nullable_System_Boolean__System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.NFTWallet.SetDID(System.String%2CSystem.Nullable%7BSystem.Boolean%7D%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/NFTWallet.cs/#L168">View Source</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_NFTWallet_SetDID_System_String_System_Nullable_System_Boolean__System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.NFTWallet.SetDID(System.String%2CSystem.Nullable%7BSystem.Boolean%7D%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/NFTWallet.cs/#L168">View Source</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-=======
     <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/NFTWallet.cs/#L171">View Source</a>
->>>>>>> main
   </span>
   <a id="chia_dotnet_NFTWallet_SetDID_" data-uid="chia.dotnet.NFTWallet.SetDID*"></a>
   <h4 id="chia_dotnet_NFTWallet_SetDID_System_String_System_Nullable_System_Boolean__System_Threading_CancellationToken_" data-uid="chia.dotnet.NFTWallet.SetDID(System.String,System.Nullable{System.Boolean},System.Threading.CancellationToken)">SetDID(String, Nullable&lt;Boolean&gt;, CancellationToken)</h4>
@@ -783,34 +643,10 @@ <h5 class="returns">Returns</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_NFTWallet_SetStatus_System_String_System_Boolean_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.NFTWallet.SetStatus(System.String%2CSystem.Boolean%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
   </span>
   <span class="small pull-right mobile-hide">
-<<<<<<< HEAD
-    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/NFTWallet.cs/#L184">View Source</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_NFTWallet_SetStatus_System_String_System_Boolean_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.NFTWallet.SetStatus(System.String%2CSystem.Boolean%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/NFTWallet.cs/#L184">View Source</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_NFTWallet_SetStatus_System_String_System_Boolean_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.NFTWallet.SetStatus(System.String%2CSystem.Boolean%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/NFTWallet.cs/#L184">View Source</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-=======
     <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/NFTWallet.cs/#L187">View Source</a>
->>>>>>> main
   </span>
   <a id="chia_dotnet_NFTWallet_SetStatus_" data-uid="chia.dotnet.NFTWallet.SetStatus*"></a>
   <h4 id="chia_dotnet_NFTWallet_SetStatus_System_String_System_Boolean_System_Threading_CancellationToken_" data-uid="chia.dotnet.NFTWallet.SetStatus(System.String,System.Boolean,System.Threading.CancellationToken)">SetStatus(String, Boolean, CancellationToken)</h4>
@@ -869,34 +705,10 @@ <h5 class="returns">Returns</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_NFTWallet_Transfer_System_String_System_String_System_Nullable_System_Boolean__System_UInt64_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.NFTWallet.Transfer(System.String%2CSystem.String%2CSystem.Nullable%7BSystem.Boolean%7D%2CSystem.UInt64%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
   </span>
   <span class="small pull-right mobile-hide">
-<<<<<<< HEAD
-    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/NFTWallet.cs/#L202">View Source</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_NFTWallet_Transfer_System_String_System_String_System_Nullable_System_Boolean__System_UInt64_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.NFTWallet.Transfer(System.String%2CSystem.String%2CSystem.Nullable%7BSystem.Boolean%7D%2CSystem.UInt64%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/NFTWallet.cs/#L202">View Source</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_NFTWallet_Transfer_System_String_System_String_System_Nullable_System_Boolean__System_UInt64_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.NFTWallet.Transfer(System.String%2CSystem.String%2CSystem.Nullable%7BSystem.Boolean%7D%2CSystem.UInt64%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/NFTWallet.cs/#L202">View Source</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-=======
     <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/NFTWallet.cs/#L205">View Source</a>
->>>>>>> main
   </span>
   <a id="chia_dotnet_NFTWallet_Transfer_" data-uid="chia.dotnet.NFTWallet.Transfer*"></a>
   <h4 id="chia_dotnet_NFTWallet_Transfer_System_String_System_String_System_Nullable_System_Boolean__System_UInt64_System_Threading_CancellationToken_" data-uid="chia.dotnet.NFTWallet.Transfer(System.String,System.String,System.Nullable{System.Boolean},System.UInt64,System.Threading.CancellationToken)">Transfer(String, String, Nullable&lt;Boolean&gt;, UInt64, CancellationToken)</h4>
@@ -966,24 +778,10 @@ <h5 class="returns">Returns</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_NFTWallet_Validate_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.NFTWallet.Validate(System.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_NFTWallet_Validate_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.NFTWallet.Validate(System.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_NFTWallet_Validate_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.NFTWallet.Validate(System.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/NFTWallet.cs/#L27">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/NFTWallet.cs/#L27">View Source</a>
   </span>
   <a id="chia_dotnet_NFTWallet_Validate_" data-uid="chia.dotnet.NFTWallet.Validate*"></a>
   <h4 id="chia_dotnet_NFTWallet_Validate_System_Threading_CancellationToken_" data-uid="chia.dotnet.NFTWallet.Validate(System.Threading.CancellationToken)">Validate(CancellationToken)</h4>
@@ -1037,24 +835,10 @@ <h5 class="overrides">Overrides</h5>
               <div class="contribution">
                 <ul class="nav">
                   <li>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-                    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_NFTWallet.md&amp;value=---%0Auid%3A%20chia.dotnet.NFTWallet%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-                    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_NFTWallet.md&amp;value=---%0Auid%3A%20chia.dotnet.NFTWallet%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-=======
                     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_NFTWallet.md&amp;value=---%0Auid%3A%20chia.dotnet.NFTWallet%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
                   </li>
                   <li>
-                    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/NFTWallet.cs/#L11" class="contribution-link">View Source</a>
+                    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/NFTWallet.cs/#L11" class="contribution-link">View Source</a>
                   </li>
                 </ul>
               </div>
diff --git a/docs/api/chia.dotnet.NPC.html b/docs/api/chia.dotnet.NPC.html
index 87e731ac..3fbd7eff 100644
--- a/docs/api/chia.dotnet.NPC.html
+++ b/docs/api/chia.dotnet.NPC.html
@@ -90,21 +90,7 @@ <h5>Inherited Members</h5>
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object)">Object.Equals(Object)</a>
     </div>
     <div>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object-system-object)">Object.Equals(Object, Object)</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-      <span class="xref">System.Object.Equals(System.Object, System.Object)</span>
-=======
-      <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object-system-object)">Object.Equals(Object, Object)</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
     </div>
     <div>
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.gethashcode#system-object-gethashcode">Object.GetHashCode()</a>
@@ -132,24 +118,10 @@ <h3 id="properties">Properties
   </h3>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_NPC_CoinName.md&amp;value=---%0Auid%3A%20chia.dotnet.NPC.CoinName%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_NPC_CoinName.md&amp;value=---%0Auid%3A%20chia.dotnet.NPC.CoinName%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_NPC_CoinName.md&amp;value=---%0Auid%3A%20chia.dotnet.NPC.CoinName%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/NPC.cs/#L7">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/NPC.cs/#L7">View Source</a>
   </span>
   <a id="chia_dotnet_NPC_CoinName_" data-uid="chia.dotnet.NPC.CoinName*"></a>
   <h4 id="chia_dotnet_NPC_CoinName" data-uid="chia.dotnet.NPC.CoinName">CoinName</h4>
@@ -176,24 +148,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_NPC_Conditions.md&amp;value=---%0Auid%3A%20chia.dotnet.NPC.Conditions%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_NPC_Conditions.md&amp;value=---%0Auid%3A%20chia.dotnet.NPC.Conditions%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_NPC_Conditions.md&amp;value=---%0Auid%3A%20chia.dotnet.NPC.Conditions%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/NPC.cs/#L9">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/NPC.cs/#L9">View Source</a>
   </span>
   <a id="chia_dotnet_NPC_Conditions_" data-uid="chia.dotnet.NPC.Conditions*"></a>
   <h4 id="chia_dotnet_NPC_Conditions" data-uid="chia.dotnet.NPC.Conditions">Conditions</h4>
@@ -201,21 +159,7 @@ <h4 id="chia_dotnet_NPC_Conditions" data-uid="chia.dotnet.NPC.Conditions">Condit
   <div class="markdown level1 conceptual"></div>
   <h5 class="decalaration">Declaration</h5>
   <div class="codewrapper">
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <pre><code class="lang-csharp hljs">public IEnumerable&lt;Condition&gt; Conditions { get; set; }</code></pre>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <pre><code class="lang-csharp hljs">public ICollection&lt;Condition&gt; Conditions { get; set; }</code></pre>
-=======
-    <pre><code class="lang-csharp hljs">public IEnumerable&lt;Condition&gt; Conditions { get; set; }</code></pre>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </div>
   <h5 class="propertyValue">Property Value</h5>
   <table class="table table-bordered table-striped table-condensed">
@@ -234,24 +178,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_NPC_PuzzleHash.md&amp;value=---%0Auid%3A%20chia.dotnet.NPC.PuzzleHash%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_NPC_PuzzleHash.md&amp;value=---%0Auid%3A%20chia.dotnet.NPC.PuzzleHash%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_NPC_PuzzleHash.md&amp;value=---%0Auid%3A%20chia.dotnet.NPC.PuzzleHash%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/NPC.cs/#L8">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/NPC.cs/#L8">View Source</a>
   </span>
   <a id="chia_dotnet_NPC_PuzzleHash_" data-uid="chia.dotnet.NPC.PuzzleHash*"></a>
   <h4 id="chia_dotnet_NPC_PuzzleHash" data-uid="chia.dotnet.NPC.PuzzleHash">PuzzleHash</h4>
@@ -288,24 +218,10 @@ <h3 id="implements">Implements</h3>
               <div class="contribution">
                 <ul class="nav">
                   <li>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-                    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_NPC.md&amp;value=---%0Auid%3A%20chia.dotnet.NPC%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-                    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_NPC.md&amp;value=---%0Auid%3A%20chia.dotnet.NPC%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-=======
                     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_NPC.md&amp;value=---%0Auid%3A%20chia.dotnet.NPC%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
                   </li>
                   <li>
-                    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/NPC.cs/#L5" class="contribution-link">View Source</a>
+                    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/NPC.cs/#L5" class="contribution-link">View Source</a>
                   </li>
                 </ul>
               </div>
diff --git a/docs/api/chia.dotnet.NPCResult.html b/docs/api/chia.dotnet.NPCResult.html
index 85ca19a3..ebdfa74b 100644
--- a/docs/api/chia.dotnet.NPCResult.html
+++ b/docs/api/chia.dotnet.NPCResult.html
@@ -90,21 +90,7 @@ <h5>Inherited Members</h5>
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object)">Object.Equals(Object)</a>
     </div>
     <div>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object-system-object)">Object.Equals(Object, Object)</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-      <span class="xref">System.Object.Equals(System.Object, System.Object)</span>
-=======
-      <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object-system-object)">Object.Equals(Object, Object)</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
     </div>
     <div>
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.gethashcode#system-object-gethashcode">Object.GetHashCode()</a>
@@ -132,24 +118,10 @@ <h3 id="properties">Properties
   </h3>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_NPCResult_ClvmCost.md&amp;value=---%0Auid%3A%20chia.dotnet.NPCResult.ClvmCost%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_NPCResult_ClvmCost.md&amp;value=---%0Auid%3A%20chia.dotnet.NPCResult.ClvmCost%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_NPCResult_ClvmCost.md&amp;value=---%0Auid%3A%20chia.dotnet.NPCResult.ClvmCost%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/NPCResult.cs/#L12">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/NPCResult.cs/#L12">View Source</a>
   </span>
   <a id="chia_dotnet_NPCResult_ClvmCost_" data-uid="chia.dotnet.NPCResult.ClvmCost*"></a>
   <h4 id="chia_dotnet_NPCResult_ClvmCost" data-uid="chia.dotnet.NPCResult.ClvmCost">ClvmCost</h4>
@@ -177,24 +149,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_NPCResult_Error.md&amp;value=---%0Auid%3A%20chia.dotnet.NPCResult.Error%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_NPCResult_Error.md&amp;value=---%0Auid%3A%20chia.dotnet.NPCResult.Error%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_NPCResult_Error.md&amp;value=---%0Auid%3A%20chia.dotnet.NPCResult.Error%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/NPCResult.cs/#L7">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/NPCResult.cs/#L7">View Source</a>
   </span>
   <a id="chia_dotnet_NPCResult_Error_" data-uid="chia.dotnet.NPCResult.Error*"></a>
   <h4 id="chia_dotnet_NPCResult_Error" data-uid="chia.dotnet.NPCResult.Error">Error</h4>
@@ -221,24 +179,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_NPCResult_NpcList.md&amp;value=---%0Auid%3A%20chia.dotnet.NPCResult.NpcList%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_NPCResult_NpcList.md&amp;value=---%0Auid%3A%20chia.dotnet.NPCResult.NpcList%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_NPCResult_NpcList.md&amp;value=---%0Auid%3A%20chia.dotnet.NPCResult.NpcList%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/NPCResult.cs/#L8">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/NPCResult.cs/#L8">View Source</a>
   </span>
   <a id="chia_dotnet_NPCResult_NpcList_" data-uid="chia.dotnet.NPCResult.NpcList*"></a>
   <h4 id="chia_dotnet_NPCResult_NpcList" data-uid="chia.dotnet.NPCResult.NpcList">NpcList</h4>
@@ -246,21 +190,7 @@ <h4 id="chia_dotnet_NPCResult_NpcList" data-uid="chia.dotnet.NPCResult.NpcList">
   <div class="markdown level1 conceptual"></div>
   <h5 class="decalaration">Declaration</h5>
   <div class="codewrapper">
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <pre><code class="lang-csharp hljs">public IEnumerable&lt;NPC&gt; NpcList { get; set; }</code></pre>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <pre><code class="lang-csharp hljs">public ICollection&lt;NPC&gt; NpcList { get; set; }</code></pre>
-=======
     <pre><code class="lang-csharp hljs">public IEnumerable&lt;NPC&gt; NpcList { get; set; }</code></pre>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </div>
   <h5 class="propertyValue">Property Value</h5>
   <table class="table table-bordered table-striped table-condensed">
@@ -289,24 +219,10 @@ <h3 id="implements">Implements</h3>
               <div class="contribution">
                 <ul class="nav">
                   <li>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-                    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_NPCResult.md&amp;value=---%0Auid%3A%20chia.dotnet.NPCResult%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-                    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_NPCResult.md&amp;value=---%0Auid%3A%20chia.dotnet.NPCResult%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-=======
                     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_NPCResult.md&amp;value=---%0Auid%3A%20chia.dotnet.NPCResult%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
                   </li>
                   <li>
-                    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/NPCResult.cs/#L5" class="contribution-link">View Source</a>
+                    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/NPCResult.cs/#L5" class="contribution-link">View Source</a>
                   </li>
                 </ul>
               </div>
diff --git a/docs/api/chia.dotnet.NftCoinInfo.html b/docs/api/chia.dotnet.NftCoinInfo.html
index cad00147..a2ac7dfc 100644
--- a/docs/api/chia.dotnet.NftCoinInfo.html
+++ b/docs/api/chia.dotnet.NftCoinInfo.html
@@ -90,21 +90,7 @@ <h5>Inherited Members</h5>
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object)">Object.Equals(Object)</a>
     </div>
     <div>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object-system-object)">Object.Equals(Object, Object)</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-      <span class="xref">System.Object.Equals(System.Object, System.Object)</span>
-=======
-      <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object-system-object)">Object.Equals(Object, Object)</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
     </div>
     <div>
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.gethashcode#system-object-gethashcode">Object.GetHashCode()</a>
@@ -132,24 +118,10 @@ <h3 id="properties">Properties
   </h3>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_NftCoinInfo_NftCoinId.md&amp;value=---%0Auid%3A%20chia.dotnet.NftCoinInfo.NftCoinId%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_NftCoinInfo_NftCoinId.md&amp;value=---%0Auid%3A%20chia.dotnet.NftCoinInfo.NftCoinId%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_NftCoinInfo_NftCoinId.md&amp;value=---%0Auid%3A%20chia.dotnet.NftCoinInfo.NftCoinId%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/NftCoinInfo.cs/#L6">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/NftCoinInfo.cs/#L6">View Source</a>
   </span>
   <a id="chia_dotnet_NftCoinInfo_NftCoinId_" data-uid="chia.dotnet.NftCoinInfo.NftCoinId*"></a>
   <h4 id="chia_dotnet_NftCoinInfo_NftCoinId" data-uid="chia.dotnet.NftCoinInfo.NftCoinId">NftCoinId</h4>
@@ -176,24 +148,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_NftCoinInfo_WalletId.md&amp;value=---%0Auid%3A%20chia.dotnet.NftCoinInfo.WalletId%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_NftCoinInfo_WalletId.md&amp;value=---%0Auid%3A%20chia.dotnet.NftCoinInfo.WalletId%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_NftCoinInfo_WalletId.md&amp;value=---%0Auid%3A%20chia.dotnet.NftCoinInfo.WalletId%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/NftCoinInfo.cs/#L8">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/NftCoinInfo.cs/#L8">View Source</a>
   </span>
   <a id="chia_dotnet_NftCoinInfo_WalletId_" data-uid="chia.dotnet.NftCoinInfo.WalletId*"></a>
   <h4 id="chia_dotnet_NftCoinInfo_WalletId" data-uid="chia.dotnet.NftCoinInfo.WalletId">WalletId</h4>
@@ -230,24 +188,10 @@ <h3 id="implements">Implements</h3>
               <div class="contribution">
                 <ul class="nav">
                   <li>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-                    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_NftCoinInfo.md&amp;value=---%0Auid%3A%20chia.dotnet.NftCoinInfo%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-                    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_NftCoinInfo.md&amp;value=---%0Auid%3A%20chia.dotnet.NftCoinInfo%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-=======
                     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_NftCoinInfo.md&amp;value=---%0Auid%3A%20chia.dotnet.NftCoinInfo%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
                   </li>
                   <li>
-                    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/NftCoinInfo.cs/#L3" class="contribution-link">View Source</a>
+                    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/NftCoinInfo.cs/#L3" class="contribution-link">View Source</a>
                   </li>
                 </ul>
               </div>
diff --git a/docs/api/chia.dotnet.NftMintEntry.html b/docs/api/chia.dotnet.NftMintEntry.html
index 52bd95ce..fb616e8e 100644
--- a/docs/api/chia.dotnet.NftMintEntry.html
+++ b/docs/api/chia.dotnet.NftMintEntry.html
@@ -91,21 +91,7 @@ <h5>Inherited Members</h5>
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object)">Object.Equals(Object)</a>
     </div>
     <div>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object-system-object)">Object.Equals(Object, Object)</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-      <span class="xref">System.Object.Equals(System.Object, System.Object)</span>
-=======
-      <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object-system-object)">Object.Equals(Object, Object)</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
     </div>
     <div>
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.gethashcode#system-object-gethashcode">Object.GetHashCode()</a>
@@ -133,24 +119,10 @@ <h3 id="properties">Properties
   </h3>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_NftMintEntry_EditionNumber.md&amp;value=---%0Auid%3A%20chia.dotnet.NftMintEntry.EditionNumber%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_NftMintEntry_EditionNumber.md&amp;value=---%0Auid%3A%20chia.dotnet.NftMintEntry.EditionNumber%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_NftMintEntry_EditionNumber.md&amp;value=---%0Auid%3A%20chia.dotnet.NftMintEntry.EditionNumber%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/NFTMintingInfo.cs/#L15">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/NFTMintingInfo.cs/#L15">View Source</a>
   </span>
   <a id="chia_dotnet_NftMintEntry_EditionNumber_" data-uid="chia.dotnet.NftMintEntry.EditionNumber*"></a>
   <h4 id="chia_dotnet_NftMintEntry_EditionNumber" data-uid="chia.dotnet.NftMintEntry.EditionNumber">EditionNumber</h4>
@@ -177,24 +149,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_NftMintEntry_EditionTotal.md&amp;value=---%0Auid%3A%20chia.dotnet.NftMintEntry.EditionTotal%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_NftMintEntry_EditionTotal.md&amp;value=---%0Auid%3A%20chia.dotnet.NftMintEntry.EditionTotal%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_NftMintEntry_EditionTotal.md&amp;value=---%0Auid%3A%20chia.dotnet.NftMintEntry.EditionTotal%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/NFTMintingInfo.cs/#L14">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/NFTMintingInfo.cs/#L14">View Source</a>
   </span>
   <a id="chia_dotnet_NftMintEntry_EditionTotal_" data-uid="chia.dotnet.NftMintEntry.EditionTotal*"></a>
   <h4 id="chia_dotnet_NftMintEntry_EditionTotal" data-uid="chia.dotnet.NftMintEntry.EditionTotal">EditionTotal</h4>
@@ -221,24 +179,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_NftMintEntry_Hash.md&amp;value=---%0Auid%3A%20chia.dotnet.NftMintEntry.Hash%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_NftMintEntry_Hash.md&amp;value=---%0Auid%3A%20chia.dotnet.NftMintEntry.Hash%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_NftMintEntry_Hash.md&amp;value=---%0Auid%3A%20chia.dotnet.NftMintEntry.Hash%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/NFTMintingInfo.cs/#L9">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/NFTMintingInfo.cs/#L9">View Source</a>
   </span>
   <a id="chia_dotnet_NftMintEntry_Hash_" data-uid="chia.dotnet.NftMintEntry.Hash*"></a>
   <h4 id="chia_dotnet_NftMintEntry_Hash" data-uid="chia.dotnet.NftMintEntry.Hash">Hash</h4>
@@ -265,24 +209,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_NftMintEntry_LicenseHash.md&amp;value=---%0Auid%3A%20chia.dotnet.NftMintEntry.LicenseHash%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_NftMintEntry_LicenseHash.md&amp;value=---%0Auid%3A%20chia.dotnet.NftMintEntry.LicenseHash%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_NftMintEntry_LicenseHash.md&amp;value=---%0Auid%3A%20chia.dotnet.NftMintEntry.LicenseHash%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/NFTMintingInfo.cs/#L13">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/NFTMintingInfo.cs/#L13">View Source</a>
   </span>
   <a id="chia_dotnet_NftMintEntry_LicenseHash_" data-uid="chia.dotnet.NftMintEntry.LicenseHash*"></a>
   <h4 id="chia_dotnet_NftMintEntry_LicenseHash" data-uid="chia.dotnet.NftMintEntry.LicenseHash">LicenseHash</h4>
@@ -309,24 +239,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_NftMintEntry_LicenseUris.md&amp;value=---%0Auid%3A%20chia.dotnet.NftMintEntry.LicenseUris%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_NftMintEntry_LicenseUris.md&amp;value=---%0Auid%3A%20chia.dotnet.NftMintEntry.LicenseUris%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_NftMintEntry_LicenseUris.md&amp;value=---%0Auid%3A%20chia.dotnet.NftMintEntry.LicenseUris%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/NFTMintingInfo.cs/#L12">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/NFTMintingInfo.cs/#L12">View Source</a>
   </span>
   <a id="chia_dotnet_NftMintEntry_LicenseUris_" data-uid="chia.dotnet.NftMintEntry.LicenseUris*"></a>
   <h4 id="chia_dotnet_NftMintEntry_LicenseUris" data-uid="chia.dotnet.NftMintEntry.LicenseUris">LicenseUris</h4>
@@ -353,24 +269,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_NftMintEntry_MetaHash.md&amp;value=---%0Auid%3A%20chia.dotnet.NftMintEntry.MetaHash%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_NftMintEntry_MetaHash.md&amp;value=---%0Auid%3A%20chia.dotnet.NftMintEntry.MetaHash%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_NftMintEntry_MetaHash.md&amp;value=---%0Auid%3A%20chia.dotnet.NftMintEntry.MetaHash%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/NFTMintingInfo.cs/#L11">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/NFTMintingInfo.cs/#L11">View Source</a>
   </span>
   <a id="chia_dotnet_NftMintEntry_MetaHash_" data-uid="chia.dotnet.NftMintEntry.MetaHash*"></a>
   <h4 id="chia_dotnet_NftMintEntry_MetaHash" data-uid="chia.dotnet.NftMintEntry.MetaHash">MetaHash</h4>
@@ -397,24 +299,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_NftMintEntry_MetaUris.md&amp;value=---%0Auid%3A%20chia.dotnet.NftMintEntry.MetaUris%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_NftMintEntry_MetaUris.md&amp;value=---%0Auid%3A%20chia.dotnet.NftMintEntry.MetaUris%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_NftMintEntry_MetaUris.md&amp;value=---%0Auid%3A%20chia.dotnet.NftMintEntry.MetaUris%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/NFTMintingInfo.cs/#L10">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/NFTMintingInfo.cs/#L10">View Source</a>
   </span>
   <a id="chia_dotnet_NftMintEntry_MetaUris_" data-uid="chia.dotnet.NftMintEntry.MetaUris*"></a>
   <h4 id="chia_dotnet_NftMintEntry_MetaUris" data-uid="chia.dotnet.NftMintEntry.MetaUris">MetaUris</h4>
@@ -441,24 +329,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_NftMintEntry_RoyaltyPercentage.md&amp;value=---%0Auid%3A%20chia.dotnet.NftMintEntry.RoyaltyPercentage%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_NftMintEntry_RoyaltyPercentage.md&amp;value=---%0Auid%3A%20chia.dotnet.NftMintEntry.RoyaltyPercentage%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_NftMintEntry_RoyaltyPercentage.md&amp;value=---%0Auid%3A%20chia.dotnet.NftMintEntry.RoyaltyPercentage%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/NFTMintingInfo.cs/#L7">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/NFTMintingInfo.cs/#L7">View Source</a>
   </span>
   <a id="chia_dotnet_NftMintEntry_RoyaltyPercentage_" data-uid="chia.dotnet.NftMintEntry.RoyaltyPercentage*"></a>
   <h4 id="chia_dotnet_NftMintEntry_RoyaltyPercentage" data-uid="chia.dotnet.NftMintEntry.RoyaltyPercentage">RoyaltyPercentage</h4>
@@ -485,24 +359,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_NftMintEntry_Uris.md&amp;value=---%0Auid%3A%20chia.dotnet.NftMintEntry.Uris%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_NftMintEntry_Uris.md&amp;value=---%0Auid%3A%20chia.dotnet.NftMintEntry.Uris%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_NftMintEntry_Uris.md&amp;value=---%0Auid%3A%20chia.dotnet.NftMintEntry.Uris%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/NFTMintingInfo.cs/#L8">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/NFTMintingInfo.cs/#L8">View Source</a>
   </span>
   <a id="chia_dotnet_NftMintEntry_Uris_" data-uid="chia.dotnet.NftMintEntry.Uris*"></a>
   <h4 id="chia_dotnet_NftMintEntry_Uris" data-uid="chia.dotnet.NftMintEntry.Uris">Uris</h4>
@@ -539,24 +399,10 @@ <h3 id="implements">Implements</h3>
               <div class="contribution">
                 <ul class="nav">
                   <li>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-                    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_NftMintEntry.md&amp;value=---%0Auid%3A%20chia.dotnet.NftMintEntry%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-                    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_NftMintEntry.md&amp;value=---%0Auid%3A%20chia.dotnet.NftMintEntry%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-=======
                     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_NftMintEntry.md&amp;value=---%0Auid%3A%20chia.dotnet.NftMintEntry%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
                   </li>
                   <li>
-                    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/NFTMintingInfo.cs/#L5" class="contribution-link">View Source</a>
+                    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/NFTMintingInfo.cs/#L5" class="contribution-link">View Source</a>
                   </li>
                 </ul>
               </div>
diff --git a/docs/api/chia.dotnet.NodeType.html b/docs/api/chia.dotnet.NodeType.html
index 89aabdce..34c74b8f 100644
--- a/docs/api/chia.dotnet.NodeType.html
+++ b/docs/api/chia.dotnet.NodeType.html
@@ -129,24 +129,10 @@ <h3 id="fields">Fields
               <div class="contribution">
                 <ul class="nav">
                   <li>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
                     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_NodeType.md&amp;value=---%0Auid%3A%20chia.dotnet.NodeType%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-                    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_NodeType.md&amp;value=---%0Auid%3A%20chia.dotnet.NodeType%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-=======
-                    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_NodeType.md&amp;value=---%0Auid%3A%20chia.dotnet.NodeType%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
                   </li>
                   <li>
-                    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/NodeType.cs/#L3" class="contribution-link">View Source</a>
+                    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/NodeType.cs/#L3" class="contribution-link">View Source</a>
                   </li>
                 </ul>
               </div>
diff --git a/docs/api/chia.dotnet.OfferRecord.html b/docs/api/chia.dotnet.OfferRecord.html
index 47c0b42d..8e20ba0f 100644
--- a/docs/api/chia.dotnet.OfferRecord.html
+++ b/docs/api/chia.dotnet.OfferRecord.html
@@ -91,21 +91,7 @@ <h5>Inherited Members</h5>
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object)">Object.Equals(Object)</a>
     </div>
     <div>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object-system-object)">Object.Equals(Object, Object)</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-      <span class="xref">System.Object.Equals(System.Object, System.Object)</span>
-=======
-      <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object-system-object)">Object.Equals(Object, Object)</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
     </div>
     <div>
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.gethashcode#system-object-gethashcode">Object.GetHashCode()</a>
@@ -133,24 +119,10 @@ <h3 id="properties">Properties
   </h3>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_OfferRecord_Offer.md&amp;value=---%0Auid%3A%20chia.dotnet.OfferRecord.Offer%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_OfferRecord_Offer.md&amp;value=---%0Auid%3A%20chia.dotnet.OfferRecord.Offer%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_OfferRecord_Offer.md&amp;value=---%0Auid%3A%20chia.dotnet.OfferRecord.Offer%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/OfferRecord.cs/#L11">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/OfferRecord.cs/#L11">View Source</a>
   </span>
   <a id="chia_dotnet_OfferRecord_Offer_" data-uid="chia.dotnet.OfferRecord.Offer*"></a>
   <h4 id="chia_dotnet_OfferRecord_Offer" data-uid="chia.dotnet.OfferRecord.Offer">Offer</h4>
@@ -178,24 +150,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_OfferRecord_TradeRecord.md&amp;value=---%0Auid%3A%20chia.dotnet.OfferRecord.TradeRecord%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_OfferRecord_TradeRecord.md&amp;value=---%0Auid%3A%20chia.dotnet.OfferRecord.TradeRecord%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_OfferRecord_TradeRecord.md&amp;value=---%0Auid%3A%20chia.dotnet.OfferRecord.TradeRecord%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/OfferRecord.cs/#L16">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/OfferRecord.cs/#L16">View Source</a>
   </span>
   <a id="chia_dotnet_OfferRecord_TradeRecord_" data-uid="chia.dotnet.OfferRecord.TradeRecord*"></a>
   <h4 id="chia_dotnet_OfferRecord_TradeRecord" data-uid="chia.dotnet.OfferRecord.TradeRecord">TradeRecord</h4>
@@ -233,24 +191,10 @@ <h3 id="implements">Implements</h3>
               <div class="contribution">
                 <ul class="nav">
                   <li>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-                    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_OfferRecord.md&amp;value=---%0Auid%3A%20chia.dotnet.OfferRecord%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-                    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_OfferRecord.md&amp;value=---%0Auid%3A%20chia.dotnet.OfferRecord%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-=======
                     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_OfferRecord.md&amp;value=---%0Auid%3A%20chia.dotnet.OfferRecord%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
                   </li>
                   <li>
-                    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/OfferRecord.cs/#L6" class="contribution-link">View Source</a>
+                    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/OfferRecord.cs/#L6" class="contribution-link">View Source</a>
                   </li>
                 </ul>
               </div>
diff --git a/docs/api/chia.dotnet.OfferStore.html b/docs/api/chia.dotnet.OfferStore.html
index d14dce77..513d668c 100644
--- a/docs/api/chia.dotnet.OfferStore.html
+++ b/docs/api/chia.dotnet.OfferStore.html
@@ -90,21 +90,7 @@ <h5>Inherited Members</h5>
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object)">Object.Equals(Object)</a>
     </div>
     <div>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object-system-object)">Object.Equals(Object, Object)</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-      <span class="xref">System.Object.Equals(System.Object, System.Object)</span>
-=======
-      <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object-system-object)">Object.Equals(Object, Object)</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
     </div>
     <div>
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.gethashcode#system-object-gethashcode">Object.GetHashCode()</a>
@@ -132,24 +118,10 @@ <h3 id="properties">Properties
   </h3>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_OfferStore_Inclusions.md&amp;value=---%0Auid%3A%20chia.dotnet.OfferStore.Inclusions%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_OfferStore_Inclusions.md&amp;value=---%0Auid%3A%20chia.dotnet.OfferStore.Inclusions%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_OfferStore_Inclusions.md&amp;value=---%0Auid%3A%20chia.dotnet.OfferStore.Inclusions%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/OfferStore.cs/#L9">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/OfferStore.cs/#L9">View Source</a>
   </span>
   <a id="chia_dotnet_OfferStore_Inclusions_" data-uid="chia.dotnet.OfferStore.Inclusions*"></a>
   <h4 id="chia_dotnet_OfferStore_Inclusions" data-uid="chia.dotnet.OfferStore.Inclusions">Inclusions</h4>
@@ -176,24 +148,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_OfferStore_StoreID.md&amp;value=---%0Auid%3A%20chia.dotnet.OfferStore.StoreID%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_OfferStore_StoreID.md&amp;value=---%0Auid%3A%20chia.dotnet.OfferStore.StoreID%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_OfferStore_StoreID.md&amp;value=---%0Auid%3A%20chia.dotnet.OfferStore.StoreID%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/OfferStore.cs/#L7">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/OfferStore.cs/#L7">View Source</a>
   </span>
   <a id="chia_dotnet_OfferStore_StoreID_" data-uid="chia.dotnet.OfferStore.StoreID*"></a>
   <h4 id="chia_dotnet_OfferStore_StoreID" data-uid="chia.dotnet.OfferStore.StoreID">StoreID</h4>
@@ -230,24 +188,10 @@ <h3 id="implements">Implements</h3>
               <div class="contribution">
                 <ul class="nav">
                   <li>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-                    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_OfferStore.md&amp;value=---%0Auid%3A%20chia.dotnet.OfferStore%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-                    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_OfferStore.md&amp;value=---%0Auid%3A%20chia.dotnet.OfferStore%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-=======
                     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_OfferStore.md&amp;value=---%0Auid%3A%20chia.dotnet.OfferStore%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
                   </li>
                   <li>
-                    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/OfferStore.cs/#L5" class="contribution-link">View Source</a>
+                    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/OfferStore.cs/#L5" class="contribution-link">View Source</a>
                   </li>
                 </ul>
               </div>
diff --git a/docs/api/chia.dotnet.OfferSummary.html b/docs/api/chia.dotnet.OfferSummary.html
index 04b42d11..9e8f110f 100644
--- a/docs/api/chia.dotnet.OfferSummary.html
+++ b/docs/api/chia.dotnet.OfferSummary.html
@@ -90,21 +90,7 @@ <h5>Inherited Members</h5>
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object)">Object.Equals(Object)</a>
     </div>
     <div>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object-system-object)">Object.Equals(Object, Object)</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-      <span class="xref">System.Object.Equals(System.Object, System.Object)</span>
-=======
-      <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object-system-object)">Object.Equals(Object, Object)</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
     </div>
     <div>
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.gethashcode#system-object-gethashcode">Object.GetHashCode()</a>
@@ -132,24 +118,10 @@ <h3 id="properties">Properties
   </h3>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_OfferSummary_Fees.md&amp;value=---%0Auid%3A%20chia.dotnet.OfferSummary.Fees%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_OfferSummary_Fees.md&amp;value=---%0Auid%3A%20chia.dotnet.OfferSummary.Fees%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_OfferSummary_Fees.md&amp;value=---%0Auid%3A%20chia.dotnet.OfferSummary.Fees%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/OfferSummary.cs/#L10">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/OfferSummary.cs/#L10">View Source</a>
   </span>
   <a id="chia_dotnet_OfferSummary_Fees_" data-uid="chia.dotnet.OfferSummary.Fees*"></a>
   <h4 id="chia_dotnet_OfferSummary_Fees" data-uid="chia.dotnet.OfferSummary.Fees">Fees</h4>
@@ -176,24 +148,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_OfferSummary_Id.md&amp;value=---%0Auid%3A%20chia.dotnet.OfferSummary.Id%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_OfferSummary_Id.md&amp;value=---%0Auid%3A%20chia.dotnet.OfferSummary.Id%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_OfferSummary_Id.md&amp;value=---%0Auid%3A%20chia.dotnet.OfferSummary.Id%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/OfferSummary.cs/#L7">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/OfferSummary.cs/#L7">View Source</a>
   </span>
   <a id="chia_dotnet_OfferSummary_Id_" data-uid="chia.dotnet.OfferSummary.Id*"></a>
   <h4 id="chia_dotnet_OfferSummary_Id" data-uid="chia.dotnet.OfferSummary.Id">Id</h4>
@@ -220,24 +178,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_OfferSummary_Infos.md&amp;value=---%0Auid%3A%20chia.dotnet.OfferSummary.Infos%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_OfferSummary_Infos.md&amp;value=---%0Auid%3A%20chia.dotnet.OfferSummary.Infos%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_OfferSummary_Infos.md&amp;value=---%0Auid%3A%20chia.dotnet.OfferSummary.Infos%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/OfferSummary.cs/#L11">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/OfferSummary.cs/#L11">View Source</a>
   </span>
   <a id="chia_dotnet_OfferSummary_Infos_" data-uid="chia.dotnet.OfferSummary.Infos*"></a>
   <h4 id="chia_dotnet_OfferSummary_Infos" data-uid="chia.dotnet.OfferSummary.Infos">Infos</h4>
@@ -264,24 +208,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_OfferSummary_Offered.md&amp;value=---%0Auid%3A%20chia.dotnet.OfferSummary.Offered%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_OfferSummary_Offered.md&amp;value=---%0Auid%3A%20chia.dotnet.OfferSummary.Offered%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_OfferSummary_Offered.md&amp;value=---%0Auid%3A%20chia.dotnet.OfferSummary.Offered%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/OfferSummary.cs/#L8">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/OfferSummary.cs/#L8">View Source</a>
   </span>
   <a id="chia_dotnet_OfferSummary_Offered_" data-uid="chia.dotnet.OfferSummary.Offered*"></a>
   <h4 id="chia_dotnet_OfferSummary_Offered" data-uid="chia.dotnet.OfferSummary.Offered">Offered</h4>
@@ -308,24 +238,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_OfferSummary_Requested.md&amp;value=---%0Auid%3A%20chia.dotnet.OfferSummary.Requested%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_OfferSummary_Requested.md&amp;value=---%0Auid%3A%20chia.dotnet.OfferSummary.Requested%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_OfferSummary_Requested.md&amp;value=---%0Auid%3A%20chia.dotnet.OfferSummary.Requested%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/OfferSummary.cs/#L9">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/OfferSummary.cs/#L9">View Source</a>
   </span>
   <a id="chia_dotnet_OfferSummary_Requested_" data-uid="chia.dotnet.OfferSummary.Requested*"></a>
   <h4 id="chia_dotnet_OfferSummary_Requested" data-uid="chia.dotnet.OfferSummary.Requested">Requested</h4>
@@ -362,24 +278,10 @@ <h3 id="implements">Implements</h3>
               <div class="contribution">
                 <ul class="nav">
                   <li>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-                    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_OfferSummary.md&amp;value=---%0Auid%3A%20chia.dotnet.OfferSummary%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-                    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_OfferSummary.md&amp;value=---%0Auid%3A%20chia.dotnet.OfferSummary%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-=======
                     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_OfferSummary.md&amp;value=---%0Auid%3A%20chia.dotnet.OfferSummary%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
                   </li>
                   <li>
-                    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/OfferSummary.cs/#L5" class="contribution-link">View Source</a>
+                    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/OfferSummary.cs/#L5" class="contribution-link">View Source</a>
                   </li>
                 </ul>
               </div>
diff --git a/docs/api/chia.dotnet.PaginatedPlotRequest.html b/docs/api/chia.dotnet.PaginatedPlotRequest.html
index 290fba72..7fbe19e6 100644
--- a/docs/api/chia.dotnet.PaginatedPlotRequest.html
+++ b/docs/api/chia.dotnet.PaginatedPlotRequest.html
@@ -90,21 +90,7 @@ <h5>Inherited Members</h5>
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object)">Object.Equals(Object)</a>
     </div>
     <div>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object-system-object)">Object.Equals(Object, Object)</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-      <span class="xref">System.Object.Equals(System.Object, System.Object)</span>
-=======
-      <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object-system-object)">Object.Equals(Object, Object)</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
     </div>
     <div>
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.gethashcode#system-object-gethashcode">Object.GetHashCode()</a>
@@ -132,24 +118,10 @@ <h3 id="properties">Properties
   </h3>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PaginatedPlotRequest_NodeId.md&amp;value=---%0Auid%3A%20chia.dotnet.PaginatedPlotRequest.NodeId%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_PaginatedPlotRequest_NodeId.md&amp;value=---%0Auid%3A%20chia.dotnet.PaginatedPlotRequest.NodeId%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PaginatedPlotRequest_NodeId.md&amp;value=---%0Auid%3A%20chia.dotnet.PaginatedPlotRequest.NodeId%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/PaginatedPlotRequest.cs/#L7">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/PaginatedPlotRequest.cs/#L7">View Source</a>
   </span>
   <a id="chia_dotnet_PaginatedPlotRequest_NodeId_" data-uid="chia.dotnet.PaginatedPlotRequest.NodeId*"></a>
   <h4 id="chia_dotnet_PaginatedPlotRequest_NodeId" data-uid="chia.dotnet.PaginatedPlotRequest.NodeId">NodeId</h4>
@@ -176,24 +148,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PaginatedPlotRequest_Page.md&amp;value=---%0Auid%3A%20chia.dotnet.PaginatedPlotRequest.Page%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_PaginatedPlotRequest_Page.md&amp;value=---%0Auid%3A%20chia.dotnet.PaginatedPlotRequest.Page%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PaginatedPlotRequest_Page.md&amp;value=---%0Auid%3A%20chia.dotnet.PaginatedPlotRequest.Page%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/PaginatedPlotRequest.cs/#L8">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/PaginatedPlotRequest.cs/#L8">View Source</a>
   </span>
   <a id="chia_dotnet_PaginatedPlotRequest_Page_" data-uid="chia.dotnet.PaginatedPlotRequest.Page*"></a>
   <h4 id="chia_dotnet_PaginatedPlotRequest_Page" data-uid="chia.dotnet.PaginatedPlotRequest.Page">Page</h4>
@@ -220,24 +178,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PaginatedPlotRequest_PageCount.md&amp;value=---%0Auid%3A%20chia.dotnet.PaginatedPlotRequest.PageCount%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_PaginatedPlotRequest_PageCount.md&amp;value=---%0Auid%3A%20chia.dotnet.PaginatedPlotRequest.PageCount%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PaginatedPlotRequest_PageCount.md&amp;value=---%0Auid%3A%20chia.dotnet.PaginatedPlotRequest.PageCount%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/PaginatedPlotRequest.cs/#L9">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/PaginatedPlotRequest.cs/#L9">View Source</a>
   </span>
   <a id="chia_dotnet_PaginatedPlotRequest_PageCount_" data-uid="chia.dotnet.PaginatedPlotRequest.PageCount*"></a>
   <h4 id="chia_dotnet_PaginatedPlotRequest_PageCount" data-uid="chia.dotnet.PaginatedPlotRequest.PageCount">PageCount</h4>
@@ -264,24 +208,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PaginatedPlotRequest_Plots.md&amp;value=---%0Auid%3A%20chia.dotnet.PaginatedPlotRequest.Plots%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_PaginatedPlotRequest_Plots.md&amp;value=---%0Auid%3A%20chia.dotnet.PaginatedPlotRequest.Plots%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PaginatedPlotRequest_Plots.md&amp;value=---%0Auid%3A%20chia.dotnet.PaginatedPlotRequest.Plots%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/PaginatedPlotRequest.cs/#L11">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/PaginatedPlotRequest.cs/#L11">View Source</a>
   </span>
   <a id="chia_dotnet_PaginatedPlotRequest_Plots_" data-uid="chia.dotnet.PaginatedPlotRequest.Plots*"></a>
   <h4 id="chia_dotnet_PaginatedPlotRequest_Plots" data-uid="chia.dotnet.PaginatedPlotRequest.Plots">Plots</h4>
@@ -308,24 +238,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PaginatedPlotRequest_TotalCount.md&amp;value=---%0Auid%3A%20chia.dotnet.PaginatedPlotRequest.TotalCount%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_PaginatedPlotRequest_TotalCount.md&amp;value=---%0Auid%3A%20chia.dotnet.PaginatedPlotRequest.TotalCount%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PaginatedPlotRequest_TotalCount.md&amp;value=---%0Auid%3A%20chia.dotnet.PaginatedPlotRequest.TotalCount%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/PaginatedPlotRequest.cs/#L10">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/PaginatedPlotRequest.cs/#L10">View Source</a>
   </span>
   <a id="chia_dotnet_PaginatedPlotRequest_TotalCount_" data-uid="chia.dotnet.PaginatedPlotRequest.TotalCount*"></a>
   <h4 id="chia_dotnet_PaginatedPlotRequest_TotalCount" data-uid="chia.dotnet.PaginatedPlotRequest.TotalCount">TotalCount</h4>
@@ -362,24 +278,10 @@ <h3 id="implements">Implements</h3>
               <div class="contribution">
                 <ul class="nav">
                   <li>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-                    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PaginatedPlotRequest.md&amp;value=---%0Auid%3A%20chia.dotnet.PaginatedPlotRequest%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-                    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_PaginatedPlotRequest.md&amp;value=---%0Auid%3A%20chia.dotnet.PaginatedPlotRequest%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-=======
                     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PaginatedPlotRequest.md&amp;value=---%0Auid%3A%20chia.dotnet.PaginatedPlotRequest%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
                   </li>
                   <li>
-                    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/PaginatedPlotRequest.cs/#L5" class="contribution-link">View Source</a>
+                    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/PaginatedPlotRequest.cs/#L5" class="contribution-link">View Source</a>
                   </li>
                 </ul>
               </div>
diff --git a/docs/api/chia.dotnet.PassphraseRequirements.html b/docs/api/chia.dotnet.PassphraseRequirements.html
index cb573830..1555b1b9 100644
--- a/docs/api/chia.dotnet.PassphraseRequirements.html
+++ b/docs/api/chia.dotnet.PassphraseRequirements.html
@@ -90,21 +90,7 @@ <h5>Inherited Members</h5>
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object)">Object.Equals(Object)</a>
     </div>
     <div>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object-system-object)">Object.Equals(Object, Object)</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-      <span class="xref">System.Object.Equals(System.Object, System.Object)</span>
-=======
-      <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object-system-object)">Object.Equals(Object, Object)</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
     </div>
     <div>
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.gethashcode#system-object-gethashcode">Object.GetHashCode()</a>
@@ -132,24 +118,10 @@ <h3 id="properties">Properties
   </h3>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PassphraseRequirements_IsOptional.md&amp;value=---%0Auid%3A%20chia.dotnet.PassphraseRequirements.IsOptional%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_PassphraseRequirements_IsOptional.md&amp;value=---%0Auid%3A%20chia.dotnet.PassphraseRequirements.IsOptional%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PassphraseRequirements_IsOptional.md&amp;value=---%0Auid%3A%20chia.dotnet.PassphraseRequirements.IsOptional%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/PassphraseRequirements.cs/#L5">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/PassphraseRequirements.cs/#L5">View Source</a>
   </span>
   <a id="chia_dotnet_PassphraseRequirements_IsOptional_" data-uid="chia.dotnet.PassphraseRequirements.IsOptional*"></a>
   <h4 id="chia_dotnet_PassphraseRequirements_IsOptional" data-uid="chia.dotnet.PassphraseRequirements.IsOptional">IsOptional</h4>
@@ -176,24 +148,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PassphraseRequirements_MinLength.md&amp;value=---%0Auid%3A%20chia.dotnet.PassphraseRequirements.MinLength%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_PassphraseRequirements_MinLength.md&amp;value=---%0Auid%3A%20chia.dotnet.PassphraseRequirements.MinLength%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PassphraseRequirements_MinLength.md&amp;value=---%0Auid%3A%20chia.dotnet.PassphraseRequirements.MinLength%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/PassphraseRequirements.cs/#L6">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/PassphraseRequirements.cs/#L6">View Source</a>
   </span>
   <a id="chia_dotnet_PassphraseRequirements_MinLength_" data-uid="chia.dotnet.PassphraseRequirements.MinLength*"></a>
   <h4 id="chia_dotnet_PassphraseRequirements_MinLength" data-uid="chia.dotnet.PassphraseRequirements.MinLength">MinLength</h4>
@@ -230,24 +188,10 @@ <h3 id="implements">Implements</h3>
               <div class="contribution">
                 <ul class="nav">
                   <li>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-                    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PassphraseRequirements.md&amp;value=---%0Auid%3A%20chia.dotnet.PassphraseRequirements%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-                    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_PassphraseRequirements.md&amp;value=---%0Auid%3A%20chia.dotnet.PassphraseRequirements%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-=======
                     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PassphraseRequirements.md&amp;value=---%0Auid%3A%20chia.dotnet.PassphraseRequirements%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
                   </li>
                   <li>
-                    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/PassphraseRequirements.cs/#L3" class="contribution-link">View Source</a>
+                    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/PassphraseRequirements.cs/#L3" class="contribution-link">View Source</a>
                   </li>
                 </ul>
               </div>
diff --git a/docs/api/chia.dotnet.PeerCounts.html b/docs/api/chia.dotnet.PeerCounts.html
index 3516ef0e..c152ecd3 100644
--- a/docs/api/chia.dotnet.PeerCounts.html
+++ b/docs/api/chia.dotnet.PeerCounts.html
@@ -90,21 +90,7 @@ <h5>Inherited Members</h5>
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object)">Object.Equals(Object)</a>
     </div>
     <div>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object-system-object)">Object.Equals(Object, Object)</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-      <span class="xref">System.Object.Equals(System.Object, System.Object)</span>
-=======
-      <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object-system-object)">Object.Equals(Object, Object)</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
     </div>
     <div>
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.gethashcode#system-object-gethashcode">Object.GetHashCode()</a>
@@ -132,24 +118,10 @@ <h3 id="properties">Properties
   </h3>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PeerCounts_Ipv4Last5Days.md&amp;value=---%0Auid%3A%20chia.dotnet.PeerCounts.Ipv4Last5Days%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_PeerCounts_Ipv4Last5Days.md&amp;value=---%0Auid%3A%20chia.dotnet.PeerCounts.Ipv4Last5Days%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PeerCounts_Ipv4Last5Days.md&amp;value=---%0Auid%3A%20chia.dotnet.PeerCounts.Ipv4Last5Days%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/PeerCounts.cs/#L12">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/PeerCounts.cs/#L12">View Source</a>
   </span>
   <a id="chia_dotnet_PeerCounts_Ipv4Last5Days_" data-uid="chia.dotnet.PeerCounts.Ipv4Last5Days*"></a>
   <h4 id="chia_dotnet_PeerCounts_Ipv4Last5Days" data-uid="chia.dotnet.PeerCounts.Ipv4Last5Days">Ipv4Last5Days</h4>
@@ -177,24 +149,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PeerCounts_Ipv6Last5Days.md&amp;value=---%0Auid%3A%20chia.dotnet.PeerCounts.Ipv6Last5Days%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_PeerCounts_Ipv6Last5Days.md&amp;value=---%0Auid%3A%20chia.dotnet.PeerCounts.Ipv6Last5Days%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PeerCounts_Ipv6Last5Days.md&amp;value=---%0Auid%3A%20chia.dotnet.PeerCounts.Ipv6Last5Days%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/PeerCounts.cs/#L14">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/PeerCounts.cs/#L14">View Source</a>
   </span>
   <a id="chia_dotnet_PeerCounts_Ipv6Last5Days_" data-uid="chia.dotnet.PeerCounts.Ipv6Last5Days*"></a>
   <h4 id="chia_dotnet_PeerCounts_Ipv6Last5Days" data-uid="chia.dotnet.PeerCounts.Ipv6Last5Days">Ipv6Last5Days</h4>
@@ -222,24 +180,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PeerCounts_ReliableNodes.md&amp;value=---%0Auid%3A%20chia.dotnet.PeerCounts.ReliableNodes%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_PeerCounts_ReliableNodes.md&amp;value=---%0Auid%3A%20chia.dotnet.PeerCounts.ReliableNodes%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PeerCounts_ReliableNodes.md&amp;value=---%0Auid%3A%20chia.dotnet.PeerCounts.ReliableNodes%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/PeerCounts.cs/#L11">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/PeerCounts.cs/#L11">View Source</a>
   </span>
   <a id="chia_dotnet_PeerCounts_ReliableNodes_" data-uid="chia.dotnet.PeerCounts.ReliableNodes*"></a>
   <h4 id="chia_dotnet_PeerCounts_ReliableNodes" data-uid="chia.dotnet.PeerCounts.ReliableNodes">ReliableNodes</h4>
@@ -266,24 +210,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PeerCounts_TotalLast5Days.md&amp;value=---%0Auid%3A%20chia.dotnet.PeerCounts.TotalLast5Days%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_PeerCounts_TotalLast5Days.md&amp;value=---%0Auid%3A%20chia.dotnet.PeerCounts.TotalLast5Days%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PeerCounts_TotalLast5Days.md&amp;value=---%0Auid%3A%20chia.dotnet.PeerCounts.TotalLast5Days%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/PeerCounts.cs/#L9">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/PeerCounts.cs/#L9">View Source</a>
   </span>
   <a id="chia_dotnet_PeerCounts_TotalLast5Days_" data-uid="chia.dotnet.PeerCounts.TotalLast5Days*"></a>
   <h4 id="chia_dotnet_PeerCounts_TotalLast5Days" data-uid="chia.dotnet.PeerCounts.TotalLast5Days">TotalLast5Days</h4>
@@ -311,24 +241,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PeerCounts_Versions.md&amp;value=---%0Auid%3A%20chia.dotnet.PeerCounts.Versions%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_PeerCounts_Versions.md&amp;value=---%0Auid%3A%20chia.dotnet.PeerCounts.Versions%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PeerCounts_Versions.md&amp;value=---%0Auid%3A%20chia.dotnet.PeerCounts.Versions%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/PeerCounts.cs/#L16">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/PeerCounts.cs/#L16">View Source</a>
   </span>
   <a id="chia_dotnet_PeerCounts_Versions_" data-uid="chia.dotnet.PeerCounts.Versions*"></a>
   <h4 id="chia_dotnet_PeerCounts_Versions" data-uid="chia.dotnet.PeerCounts.Versions">Versions</h4>
@@ -365,24 +281,10 @@ <h3 id="implements">Implements</h3>
               <div class="contribution">
                 <ul class="nav">
                   <li>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-                    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PeerCounts.md&amp;value=---%0Auid%3A%20chia.dotnet.PeerCounts%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-                    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_PeerCounts.md&amp;value=---%0Auid%3A%20chia.dotnet.PeerCounts%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-=======
                     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PeerCounts.md&amp;value=---%0Auid%3A%20chia.dotnet.PeerCounts%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
                   </li>
                   <li>
-                    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/PeerCounts.cs/#L7" class="contribution-link">View Source</a>
+                    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/PeerCounts.cs/#L7" class="contribution-link">View Source</a>
                   </li>
                 </ul>
               </div>
diff --git a/docs/api/chia.dotnet.PlotInfo.html b/docs/api/chia.dotnet.PlotInfo.html
index d9074013..60193753 100644
--- a/docs/api/chia.dotnet.PlotInfo.html
+++ b/docs/api/chia.dotnet.PlotInfo.html
@@ -91,21 +91,7 @@ <h5>Inherited Members</h5>
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object)">Object.Equals(Object)</a>
     </div>
     <div>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object-system-object)">Object.Equals(Object, Object)</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-      <span class="xref">System.Object.Equals(System.Object, System.Object)</span>
-=======
-      <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object-system-object)">Object.Equals(Object, Object)</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
     </div>
     <div>
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.gethashcode#system-object-gethashcode">Object.GetHashCode()</a>
@@ -133,24 +119,10 @@ <h3 id="properties">Properties
   </h3>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PlotInfo_DateTimeModified.md&amp;value=---%0Auid%3A%20chia.dotnet.PlotInfo.DateTimeModified%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_PlotInfo_DateTimeModified.md&amp;value=---%0Auid%3A%20chia.dotnet.PlotInfo.DateTimeModified%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PlotInfo_DateTimeModified.md&amp;value=---%0Auid%3A%20chia.dotnet.PlotInfo.DateTimeModified%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/PlotInfo.cs/#L20">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/PlotInfo.cs/#L20">View Source</a>
   </span>
   <a id="chia_dotnet_PlotInfo_DateTimeModified_" data-uid="chia.dotnet.PlotInfo.DateTimeModified*"></a>
   <h4 id="chia_dotnet_PlotInfo_DateTimeModified" data-uid="chia.dotnet.PlotInfo.DateTimeModified">DateTimeModified</h4>
@@ -178,23 +150,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PlotInfo_Filename.md&amp;value=---%0Auid%3A%20chia.dotnet.PlotInfo.Filename%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_PlotInfo_Filename.md&amp;value=---%0Auid%3A%20chia.dotnet.PlotInfo.Filename%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/PlotInfo.cs/#L13">View Source</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PlotInfo_Filename.md&amp;value=---%0Auid%3A%20chia.dotnet.PlotInfo.Filename%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
   </span>
   <span class="small pull-right mobile-hide">
     <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/PlotInfo.cs/#L13">View Source</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
   </span>
   <a id="chia_dotnet_PlotInfo_Filename_" data-uid="chia.dotnet.PlotInfo.Filename*"></a>
   <h4 id="chia_dotnet_PlotInfo_Filename" data-uid="chia.dotnet.PlotInfo.Filename">Filename</h4>
@@ -221,83 +180,6 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_PlotInfo_FileSize.md&amp;value=---%0Auid%3A%20chia.dotnet.PlotInfo.FileSize%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PlotInfo_FileSize.md&amp;value=---%0Auid%3A%20chia.dotnet.PlotInfo.FileSize%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/PlotInfo.cs/#L12">View Source</a>
-  </span>
-  <a id="chia_dotnet_PlotInfo_FileSize_" data-uid="chia.dotnet.PlotInfo.FileSize*"></a>
-  <h4 id="chia_dotnet_PlotInfo_FileSize" data-uid="chia.dotnet.PlotInfo.FileSize">FileSize</h4>
-  <div class="markdown level1 summary"></div>
-  <div class="markdown level1 conceptual"></div>
-  <h5 class="decalaration">Declaration</h5>
-  <div class="codewrapper">
-    <pre><code class="lang-csharp hljs">public ulong FileSize { get; set; }</code></pre>
-  </div>
-  <h5 class="propertyValue">Property Value</h5>
-  <table class="table table-bordered table-striped table-condensed">
-    <thead>
-      <tr>
-        <th>Type</th>
-        <th>Description</th>
-      </tr>
-    </thead>
-    <tbody>
-      <tr>
-        <td><a class="xref" href="https://learn.microsoft.com/dotnet/api/system.uint64">UInt64</a></td>
-        <td></td>
-      </tr>
-    </tbody>
-  </table>
-  <span class="small pull-right mobile-hide">
-    <span class="divider">|</span>
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PlotInfo_PlotId.md&amp;value=---%0Auid%3A%20chia.dotnet.PlotInfo.PlotId%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/PlotInfo.cs/#L12">View Source</a>
-  </span>
-  <a id="chia_dotnet_PlotInfo_FileSize_" data-uid="chia.dotnet.PlotInfo.FileSize*"></a>
-  <h4 id="chia_dotnet_PlotInfo_FileSize" data-uid="chia.dotnet.PlotInfo.FileSize">FileSize</h4>
-  <div class="markdown level1 summary"></div>
-  <div class="markdown level1 conceptual"></div>
-  <h5 class="decalaration">Declaration</h5>
-  <div class="codewrapper">
-<<<<<<< HEAD
-    <pre><code class="lang-csharp hljs">public string Filename { get; set; }</code></pre>
-=======
-    <pre><code class="lang-csharp hljs">public ulong FileSize { get; set; }</code></pre>
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
-  </div>
-  <h5 class="propertyValue">Property Value</h5>
-  <table class="table table-bordered table-striped table-condensed">
-    <thead>
-      <tr>
-        <th>Type</th>
-        <th>Description</th>
-      </tr>
-    </thead>
-    <tbody>
-      <tr>
-<<<<<<< HEAD
-        <td><a class="xref" href="https://learn.microsoft.com/dotnet/api/system.string">String</a></td>
-=======
-        <td><a class="xref" href="https://learn.microsoft.com/dotnet/api/system.uint64">UInt64</a></td>
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
-        <td></td>
-      </tr>
-    </tbody>
-  </table>
-  <span class="small pull-right mobile-hide">
-    <span class="divider">|</span>
-<<<<<<< HEAD
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PlotInfo_FileSize.md&amp;value=---%0Auid%3A%20chia.dotnet.PlotInfo.FileSize%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
   </span>
   <span class="small pull-right mobile-hide">
@@ -329,12 +211,9 @@ <h5 class="propertyValue">Property Value</h5>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PlotInfo_PlotId.md&amp;value=---%0Auid%3A%20chia.dotnet.PlotInfo.PlotId%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_PlotInfo_PlotId.md&amp;value=---%0Auid%3A%20chia.dotnet.PlotInfo.PlotId%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/PlotInfo.cs/#L14">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/PlotInfo.cs/#L14">View Source</a>
   </span>
   <a id="chia_dotnet_PlotInfo_PlotId_" data-uid="chia.dotnet.PlotInfo.PlotId*"></a>
   <h4 id="chia_dotnet_PlotInfo_PlotId" data-uid="chia.dotnet.PlotInfo.PlotId">PlotId</h4>
@@ -361,24 +240,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PlotInfo_PlotPublicKey.md&amp;value=---%0Auid%3A%20chia.dotnet.PlotInfo.PlotPublicKey%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_PlotInfo_PlotPublicKey.md&amp;value=---%0Auid%3A%20chia.dotnet.PlotInfo.PlotPublicKey%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PlotInfo_PlotPublicKey.md&amp;value=---%0Auid%3A%20chia.dotnet.PlotInfo.PlotPublicKey%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/PlotInfo.cs/#L15">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/PlotInfo.cs/#L15">View Source</a>
   </span>
   <a id="chia_dotnet_PlotInfo_PlotPublicKey_" data-uid="chia.dotnet.PlotInfo.PlotPublicKey*"></a>
   <h4 id="chia_dotnet_PlotInfo_PlotPublicKey" data-uid="chia.dotnet.PlotInfo.PlotPublicKey">PlotPublicKey</h4>
@@ -405,24 +270,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PlotInfo_PoolContractPuzzleHash.md&amp;value=---%0Auid%3A%20chia.dotnet.PlotInfo.PoolContractPuzzleHash%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_PlotInfo_PoolContractPuzzleHash.md&amp;value=---%0Auid%3A%20chia.dotnet.PlotInfo.PoolContractPuzzleHash%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PlotInfo_PoolContractPuzzleHash.md&amp;value=---%0Auid%3A%20chia.dotnet.PlotInfo.PoolContractPuzzleHash%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/PlotInfo.cs/#L16">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/PlotInfo.cs/#L16">View Source</a>
   </span>
   <a id="chia_dotnet_PlotInfo_PoolContractPuzzleHash_" data-uid="chia.dotnet.PlotInfo.PoolContractPuzzleHash*"></a>
   <h4 id="chia_dotnet_PlotInfo_PoolContractPuzzleHash" data-uid="chia.dotnet.PlotInfo.PoolContractPuzzleHash">PoolContractPuzzleHash</h4>
@@ -449,24 +300,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PlotInfo_PoolPublicKey.md&amp;value=---%0Auid%3A%20chia.dotnet.PlotInfo.PoolPublicKey%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_PlotInfo_PoolPublicKey.md&amp;value=---%0Auid%3A%20chia.dotnet.PlotInfo.PoolPublicKey%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PlotInfo_PoolPublicKey.md&amp;value=---%0Auid%3A%20chia.dotnet.PlotInfo.PoolPublicKey%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/PlotInfo.cs/#L17">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/PlotInfo.cs/#L17">View Source</a>
   </span>
   <a id="chia_dotnet_PlotInfo_PoolPublicKey_" data-uid="chia.dotnet.PlotInfo.PoolPublicKey*"></a>
   <h4 id="chia_dotnet_PlotInfo_PoolPublicKey" data-uid="chia.dotnet.PlotInfo.PoolPublicKey">PoolPublicKey</h4>
@@ -493,24 +330,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PlotInfo_Size.md&amp;value=---%0Auid%3A%20chia.dotnet.PlotInfo.Size%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_PlotInfo_Size.md&amp;value=---%0Auid%3A%20chia.dotnet.PlotInfo.Size%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PlotInfo_Size.md&amp;value=---%0Auid%3A%20chia.dotnet.PlotInfo.Size%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/PlotInfo.cs/#L18">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/PlotInfo.cs/#L18">View Source</a>
   </span>
   <a id="chia_dotnet_PlotInfo_Size_" data-uid="chia.dotnet.PlotInfo.Size*"></a>
   <h4 id="chia_dotnet_PlotInfo_Size" data-uid="chia.dotnet.PlotInfo.Size">Size</h4>
@@ -537,24 +360,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PlotInfo_TimeModified.md&amp;value=---%0Auid%3A%20chia.dotnet.PlotInfo.TimeModified%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_PlotInfo_TimeModified.md&amp;value=---%0Auid%3A%20chia.dotnet.PlotInfo.TimeModified%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PlotInfo_TimeModified.md&amp;value=---%0Auid%3A%20chia.dotnet.PlotInfo.TimeModified%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/PlotInfo.cs/#L19">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/PlotInfo.cs/#L19">View Source</a>
   </span>
   <a id="chia_dotnet_PlotInfo_TimeModified_" data-uid="chia.dotnet.PlotInfo.TimeModified*"></a>
   <h4 id="chia_dotnet_PlotInfo_TimeModified" data-uid="chia.dotnet.PlotInfo.TimeModified">TimeModified</h4>
@@ -591,24 +400,10 @@ <h3 id="implements">Implements</h3>
               <div class="contribution">
                 <ul class="nav">
                   <li>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-                    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PlotInfo.md&amp;value=---%0Auid%3A%20chia.dotnet.PlotInfo%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-                    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_PlotInfo.md&amp;value=---%0Auid%3A%20chia.dotnet.PlotInfo%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-=======
                     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PlotInfo.md&amp;value=---%0Auid%3A%20chia.dotnet.PlotInfo%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
                   </li>
                   <li>
-                    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/PlotInfo.cs/#L10" class="contribution-link">View Source</a>
+                    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/PlotInfo.cs/#L10" class="contribution-link">View Source</a>
                   </li>
                 </ul>
               </div>
diff --git a/docs/api/chia.dotnet.PlotInfoRequestData.html b/docs/api/chia.dotnet.PlotInfoRequestData.html
index ab70208b..8d396490 100644
--- a/docs/api/chia.dotnet.PlotInfoRequestData.html
+++ b/docs/api/chia.dotnet.PlotInfoRequestData.html
@@ -90,21 +90,7 @@ <h5>Inherited Members</h5>
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object)">Object.Equals(Object)</a>
     </div>
     <div>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object-system-object)">Object.Equals(Object, Object)</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-      <span class="xref">System.Object.Equals(System.Object, System.Object)</span>
-=======
-      <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object-system-object)">Object.Equals(Object, Object)</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
     </div>
     <div>
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.gethashcode#system-object-gethashcode">Object.GetHashCode()</a>
@@ -132,24 +118,10 @@ <h3 id="properties">Properties
   </h3>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PlotInfoRequestData_Filter.md&amp;value=---%0Auid%3A%20chia.dotnet.PlotInfoRequestData.Filter%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_PlotInfoRequestData_Filter.md&amp;value=---%0Auid%3A%20chia.dotnet.PlotInfoRequestData.Filter%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PlotInfoRequestData_Filter.md&amp;value=---%0Auid%3A%20chia.dotnet.PlotInfoRequestData.Filter%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/PlotInfoRequestData.cs/#L10">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/PlotInfoRequestData.cs/#L10">View Source</a>
   </span>
   <a id="chia_dotnet_PlotInfoRequestData_Filter_" data-uid="chia.dotnet.PlotInfoRequestData.Filter*"></a>
   <h4 id="chia_dotnet_PlotInfoRequestData_Filter" data-uid="chia.dotnet.PlotInfoRequestData.Filter">Filter</h4>
@@ -176,24 +148,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PlotInfoRequestData_NodeId.md&amp;value=---%0Auid%3A%20chia.dotnet.PlotInfoRequestData.NodeId%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_PlotInfoRequestData_NodeId.md&amp;value=---%0Auid%3A%20chia.dotnet.PlotInfoRequestData.NodeId%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PlotInfoRequestData_NodeId.md&amp;value=---%0Auid%3A%20chia.dotnet.PlotInfoRequestData.NodeId%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/PlotInfoRequestData.cs/#L7">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/PlotInfoRequestData.cs/#L7">View Source</a>
   </span>
   <a id="chia_dotnet_PlotInfoRequestData_NodeId_" data-uid="chia.dotnet.PlotInfoRequestData.NodeId*"></a>
   <h4 id="chia_dotnet_PlotInfoRequestData_NodeId" data-uid="chia.dotnet.PlotInfoRequestData.NodeId">NodeId</h4>
@@ -220,24 +178,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PlotInfoRequestData_Page.md&amp;value=---%0Auid%3A%20chia.dotnet.PlotInfoRequestData.Page%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_PlotInfoRequestData_Page.md&amp;value=---%0Auid%3A%20chia.dotnet.PlotInfoRequestData.Page%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PlotInfoRequestData_Page.md&amp;value=---%0Auid%3A%20chia.dotnet.PlotInfoRequestData.Page%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/PlotInfoRequestData.cs/#L8">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/PlotInfoRequestData.cs/#L8">View Source</a>
   </span>
   <a id="chia_dotnet_PlotInfoRequestData_Page_" data-uid="chia.dotnet.PlotInfoRequestData.Page*"></a>
   <h4 id="chia_dotnet_PlotInfoRequestData_Page" data-uid="chia.dotnet.PlotInfoRequestData.Page">Page</h4>
@@ -264,24 +208,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PlotInfoRequestData_PageSize.md&amp;value=---%0Auid%3A%20chia.dotnet.PlotInfoRequestData.PageSize%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_PlotInfoRequestData_PageSize.md&amp;value=---%0Auid%3A%20chia.dotnet.PlotInfoRequestData.PageSize%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PlotInfoRequestData_PageSize.md&amp;value=---%0Auid%3A%20chia.dotnet.PlotInfoRequestData.PageSize%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/PlotInfoRequestData.cs/#L9">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/PlotInfoRequestData.cs/#L9">View Source</a>
   </span>
   <a id="chia_dotnet_PlotInfoRequestData_PageSize_" data-uid="chia.dotnet.PlotInfoRequestData.PageSize*"></a>
   <h4 id="chia_dotnet_PlotInfoRequestData_PageSize" data-uid="chia.dotnet.PlotInfoRequestData.PageSize">PageSize</h4>
@@ -308,24 +238,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PlotInfoRequestData_Reverse.md&amp;value=---%0Auid%3A%20chia.dotnet.PlotInfoRequestData.Reverse%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_PlotInfoRequestData_Reverse.md&amp;value=---%0Auid%3A%20chia.dotnet.PlotInfoRequestData.Reverse%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PlotInfoRequestData_Reverse.md&amp;value=---%0Auid%3A%20chia.dotnet.PlotInfoRequestData.Reverse%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/PlotInfoRequestData.cs/#L12">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/PlotInfoRequestData.cs/#L12">View Source</a>
   </span>
   <a id="chia_dotnet_PlotInfoRequestData_Reverse_" data-uid="chia.dotnet.PlotInfoRequestData.Reverse*"></a>
   <h4 id="chia_dotnet_PlotInfoRequestData_Reverse" data-uid="chia.dotnet.PlotInfoRequestData.Reverse">Reverse</h4>
@@ -352,24 +268,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PlotInfoRequestData_SortKey.md&amp;value=---%0Auid%3A%20chia.dotnet.PlotInfoRequestData.SortKey%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_PlotInfoRequestData_SortKey.md&amp;value=---%0Auid%3A%20chia.dotnet.PlotInfoRequestData.SortKey%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PlotInfoRequestData_SortKey.md&amp;value=---%0Auid%3A%20chia.dotnet.PlotInfoRequestData.SortKey%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/PlotInfoRequestData.cs/#L11">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/PlotInfoRequestData.cs/#L11">View Source</a>
   </span>
   <a id="chia_dotnet_PlotInfoRequestData_SortKey_" data-uid="chia.dotnet.PlotInfoRequestData.SortKey*"></a>
   <h4 id="chia_dotnet_PlotInfoRequestData_SortKey" data-uid="chia.dotnet.PlotInfoRequestData.SortKey">SortKey</h4>
@@ -406,24 +308,10 @@ <h3 id="implements">Implements</h3>
               <div class="contribution">
                 <ul class="nav">
                   <li>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-                    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PlotInfoRequestData.md&amp;value=---%0Auid%3A%20chia.dotnet.PlotInfoRequestData%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-                    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_PlotInfoRequestData.md&amp;value=---%0Auid%3A%20chia.dotnet.PlotInfoRequestData%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-=======
                     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PlotInfoRequestData.md&amp;value=---%0Auid%3A%20chia.dotnet.PlotInfoRequestData%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
                   </li>
                   <li>
-                    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/PlotInfoRequestData.cs/#L5" class="contribution-link">View Source</a>
+                    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/PlotInfoRequestData.cs/#L5" class="contribution-link">View Source</a>
                   </li>
                 </ul>
               </div>
diff --git a/docs/api/chia.dotnet.PlotPathRequestData.html b/docs/api/chia.dotnet.PlotPathRequestData.html
index 358704b8..c519d3ca 100644
--- a/docs/api/chia.dotnet.PlotPathRequestData.html
+++ b/docs/api/chia.dotnet.PlotPathRequestData.html
@@ -90,21 +90,7 @@ <h5>Inherited Members</h5>
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object)">Object.Equals(Object)</a>
     </div>
     <div>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object-system-object)">Object.Equals(Object, Object)</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-      <span class="xref">System.Object.Equals(System.Object, System.Object)</span>
-=======
-      <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object-system-object)">Object.Equals(Object, Object)</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
     </div>
     <div>
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.gethashcode#system-object-gethashcode">Object.GetHashCode()</a>
@@ -132,24 +118,10 @@ <h3 id="properties">Properties
   </h3>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PlotPathRequestData_Filter.md&amp;value=---%0Auid%3A%20chia.dotnet.PlotPathRequestData.Filter%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_PlotPathRequestData_Filter.md&amp;value=---%0Auid%3A%20chia.dotnet.PlotPathRequestData.Filter%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PlotPathRequestData_Filter.md&amp;value=---%0Auid%3A%20chia.dotnet.PlotPathRequestData.Filter%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/PlotPathRequestData.cs/#L10">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/PlotPathRequestData.cs/#L10">View Source</a>
   </span>
   <a id="chia_dotnet_PlotPathRequestData_Filter_" data-uid="chia.dotnet.PlotPathRequestData.Filter*"></a>
   <h4 id="chia_dotnet_PlotPathRequestData_Filter" data-uid="chia.dotnet.PlotPathRequestData.Filter">Filter</h4>
@@ -176,24 +148,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PlotPathRequestData_NodeId.md&amp;value=---%0Auid%3A%20chia.dotnet.PlotPathRequestData.NodeId%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_PlotPathRequestData_NodeId.md&amp;value=---%0Auid%3A%20chia.dotnet.PlotPathRequestData.NodeId%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PlotPathRequestData_NodeId.md&amp;value=---%0Auid%3A%20chia.dotnet.PlotPathRequestData.NodeId%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/PlotPathRequestData.cs/#L7">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/PlotPathRequestData.cs/#L7">View Source</a>
   </span>
   <a id="chia_dotnet_PlotPathRequestData_NodeId_" data-uid="chia.dotnet.PlotPathRequestData.NodeId*"></a>
   <h4 id="chia_dotnet_PlotPathRequestData_NodeId" data-uid="chia.dotnet.PlotPathRequestData.NodeId">NodeId</h4>
@@ -220,24 +178,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PlotPathRequestData_Page.md&amp;value=---%0Auid%3A%20chia.dotnet.PlotPathRequestData.Page%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_PlotPathRequestData_Page.md&amp;value=---%0Auid%3A%20chia.dotnet.PlotPathRequestData.Page%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PlotPathRequestData_Page.md&amp;value=---%0Auid%3A%20chia.dotnet.PlotPathRequestData.Page%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/PlotPathRequestData.cs/#L8">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/PlotPathRequestData.cs/#L8">View Source</a>
   </span>
   <a id="chia_dotnet_PlotPathRequestData_Page_" data-uid="chia.dotnet.PlotPathRequestData.Page*"></a>
   <h4 id="chia_dotnet_PlotPathRequestData_Page" data-uid="chia.dotnet.PlotPathRequestData.Page">Page</h4>
@@ -264,24 +208,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PlotPathRequestData_PageSize.md&amp;value=---%0Auid%3A%20chia.dotnet.PlotPathRequestData.PageSize%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_PlotPathRequestData_PageSize.md&amp;value=---%0Auid%3A%20chia.dotnet.PlotPathRequestData.PageSize%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PlotPathRequestData_PageSize.md&amp;value=---%0Auid%3A%20chia.dotnet.PlotPathRequestData.PageSize%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/PlotPathRequestData.cs/#L9">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/PlotPathRequestData.cs/#L9">View Source</a>
   </span>
   <a id="chia_dotnet_PlotPathRequestData_PageSize_" data-uid="chia.dotnet.PlotPathRequestData.PageSize*"></a>
   <h4 id="chia_dotnet_PlotPathRequestData_PageSize" data-uid="chia.dotnet.PlotPathRequestData.PageSize">PageSize</h4>
@@ -308,24 +238,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PlotPathRequestData_Reverse.md&amp;value=---%0Auid%3A%20chia.dotnet.PlotPathRequestData.Reverse%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_PlotPathRequestData_Reverse.md&amp;value=---%0Auid%3A%20chia.dotnet.PlotPathRequestData.Reverse%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PlotPathRequestData_Reverse.md&amp;value=---%0Auid%3A%20chia.dotnet.PlotPathRequestData.Reverse%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/PlotPathRequestData.cs/#L11">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/PlotPathRequestData.cs/#L11">View Source</a>
   </span>
   <a id="chia_dotnet_PlotPathRequestData_Reverse_" data-uid="chia.dotnet.PlotPathRequestData.Reverse*"></a>
   <h4 id="chia_dotnet_PlotPathRequestData_Reverse" data-uid="chia.dotnet.PlotPathRequestData.Reverse">Reverse</h4>
@@ -362,24 +278,10 @@ <h3 id="implements">Implements</h3>
               <div class="contribution">
                 <ul class="nav">
                   <li>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-                    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PlotPathRequestData.md&amp;value=---%0Auid%3A%20chia.dotnet.PlotPathRequestData%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-                    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_PlotPathRequestData.md&amp;value=---%0Auid%3A%20chia.dotnet.PlotPathRequestData%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-=======
                     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PlotPathRequestData.md&amp;value=---%0Auid%3A%20chia.dotnet.PlotPathRequestData%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
                   </li>
                   <li>
-                    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/PlotPathRequestData.cs/#L5" class="contribution-link">View Source</a>
+                    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/PlotPathRequestData.cs/#L5" class="contribution-link">View Source</a>
                   </li>
                 </ul>
               </div>
diff --git a/docs/api/chia.dotnet.PlotState.html b/docs/api/chia.dotnet.PlotState.html
index 49a28719..3f54b478 100644
--- a/docs/api/chia.dotnet.PlotState.html
+++ b/docs/api/chia.dotnet.PlotState.html
@@ -117,24 +117,10 @@ <h3 id="fields">Fields
               <div class="contribution">
                 <ul class="nav">
                   <li>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
                     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PlotState.md&amp;value=---%0Auid%3A%20chia.dotnet.PlotState%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-                    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_PlotState.md&amp;value=---%0Auid%3A%20chia.dotnet.PlotState%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-=======
-                    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PlotState.md&amp;value=---%0Auid%3A%20chia.dotnet.PlotState%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
                   </li>
                   <li>
-                    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/PlotState.cs/#L3" class="contribution-link">View Source</a>
+                    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/PlotState.cs/#L3" class="contribution-link">View Source</a>
                   </li>
                 </ul>
               </div>
diff --git a/docs/api/chia.dotnet.PlotterConfig.html b/docs/api/chia.dotnet.PlotterConfig.html
index 62e568e5..d6f59e3e 100644
--- a/docs/api/chia.dotnet.PlotterConfig.html
+++ b/docs/api/chia.dotnet.PlotterConfig.html
@@ -92,21 +92,7 @@ <h5>Inherited Members</h5>
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object)">Object.Equals(Object)</a>
     </div>
     <div>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object-system-object)">Object.Equals(Object, Object)</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-      <span class="xref">System.Object.Equals(System.Object, System.Object)</span>
-=======
-      <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object-system-object)">Object.Equals(Object, Object)</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
     </div>
     <div>
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.gethashcode#system-object-gethashcode">Object.GetHashCode()</a>
@@ -134,24 +120,10 @@ <h3 id="properties">Properties
   </h3>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PlotterConfig_AltFingerprint.md&amp;value=---%0Auid%3A%20chia.dotnet.PlotterConfig.AltFingerprint%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_PlotterConfig_AltFingerprint.md&amp;value=---%0Auid%3A%20chia.dotnet.PlotterConfig.AltFingerprint%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PlotterConfig_AltFingerprint.md&amp;value=---%0Auid%3A%20chia.dotnet.PlotterConfig.AltFingerprint%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/PlotterConfig.cs/#L96">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/PlotterConfig.cs/#L96">View Source</a>
   </span>
   <a id="chia_dotnet_PlotterConfig_AltFingerprint_" data-uid="chia.dotnet.PlotterConfig.AltFingerprint*"></a>
   <h4 id="chia_dotnet_PlotterConfig_AltFingerprint" data-uid="chia.dotnet.PlotterConfig.AltFingerprint">AltFingerprint</h4>
@@ -181,24 +153,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PlotterConfig_Buckets.md&amp;value=---%0Auid%3A%20chia.dotnet.PlotterConfig.Buckets%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_PlotterConfig_Buckets.md&amp;value=---%0Auid%3A%20chia.dotnet.PlotterConfig.Buckets%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PlotterConfig_Buckets.md&amp;value=---%0Auid%3A%20chia.dotnet.PlotterConfig.Buckets%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/PlotterConfig.cs/#L89">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/PlotterConfig.cs/#L89">View Source</a>
   </span>
   <a id="chia_dotnet_PlotterConfig_Buckets_" data-uid="chia.dotnet.PlotterConfig.Buckets*"></a>
   <h4 id="chia_dotnet_PlotterConfig_Buckets" data-uid="chia.dotnet.PlotterConfig.Buckets">Buckets</h4>
@@ -230,24 +188,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PlotterConfig_Buffer.md&amp;value=---%0Auid%3A%20chia.dotnet.PlotterConfig.Buffer%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_PlotterConfig_Buffer.md&amp;value=---%0Auid%3A%20chia.dotnet.PlotterConfig.Buffer%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PlotterConfig_Buffer.md&amp;value=---%0Auid%3A%20chia.dotnet.PlotterConfig.Buffer%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/PlotterConfig.cs/#L80">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/PlotterConfig.cs/#L80">View Source</a>
   </span>
   <a id="chia_dotnet_PlotterConfig_Buffer_" data-uid="chia.dotnet.PlotterConfig.Buffer*"></a>
   <h4 id="chia_dotnet_PlotterConfig_Buffer" data-uid="chia.dotnet.PlotterConfig.Buffer">Buffer</h4>
@@ -281,24 +225,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PlotterConfig_Delay.md&amp;value=---%0Auid%3A%20chia.dotnet.PlotterConfig.Delay%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_PlotterConfig_Delay.md&amp;value=---%0Auid%3A%20chia.dotnet.PlotterConfig.Delay%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PlotterConfig_Delay.md&amp;value=---%0Auid%3A%20chia.dotnet.PlotterConfig.Delay%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/PlotterConfig.cs/#L19">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/PlotterConfig.cs/#L19">View Source</a>
   </span>
   <a id="chia_dotnet_PlotterConfig_Delay_" data-uid="chia.dotnet.PlotterConfig.Delay*"></a>
   <h4 id="chia_dotnet_PlotterConfig_Delay" data-uid="chia.dotnet.PlotterConfig.Delay">Delay</h4>
@@ -328,24 +258,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PlotterConfig_DestinationDir.md&amp;value=---%0Auid%3A%20chia.dotnet.PlotterConfig.DestinationDir%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_PlotterConfig_DestinationDir.md&amp;value=---%0Auid%3A%20chia.dotnet.PlotterConfig.DestinationDir%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PlotterConfig_DestinationDir.md&amp;value=---%0Auid%3A%20chia.dotnet.PlotterConfig.DestinationDir%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/PlotterConfig.cs/#L69">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/PlotterConfig.cs/#L69">View Source</a>
   </span>
   <a id="chia_dotnet_PlotterConfig_DestinationDir_" data-uid="chia.dotnet.PlotterConfig.DestinationDir*"></a>
   <h4 id="chia_dotnet_PlotterConfig_DestinationDir" data-uid="chia.dotnet.PlotterConfig.DestinationDir">DestinationDir</h4>
@@ -376,24 +292,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PlotterConfig_ExcludeFinalDir.md&amp;value=---%0Auid%3A%20chia.dotnet.PlotterConfig.ExcludeFinalDir%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_PlotterConfig_ExcludeFinalDir.md&amp;value=---%0Auid%3A%20chia.dotnet.PlotterConfig.ExcludeFinalDir%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PlotterConfig_ExcludeFinalDir.md&amp;value=---%0Auid%3A%20chia.dotnet.PlotterConfig.ExcludeFinalDir%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/PlotterConfig.cs/#L141">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/PlotterConfig.cs/#L141">View Source</a>
   </span>
   <a id="chia_dotnet_PlotterConfig_ExcludeFinalDir_" data-uid="chia.dotnet.PlotterConfig.ExcludeFinalDir*"></a>
   <h4 id="chia_dotnet_PlotterConfig_ExcludeFinalDir" data-uid="chia.dotnet.PlotterConfig.ExcludeFinalDir">ExcludeFinalDir</h4>
@@ -423,24 +325,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PlotterConfig_FarmerPublicKey.md&amp;value=---%0Auid%3A%20chia.dotnet.PlotterConfig.FarmerPublicKey%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_PlotterConfig_FarmerPublicKey.md&amp;value=---%0Auid%3A%20chia.dotnet.PlotterConfig.FarmerPublicKey%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PlotterConfig_FarmerPublicKey.md&amp;value=---%0Auid%3A%20chia.dotnet.PlotterConfig.FarmerPublicKey%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/PlotterConfig.cs/#L113">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/PlotterConfig.cs/#L113">View Source</a>
   </span>
   <a id="chia_dotnet_PlotterConfig_FarmerPublicKey_" data-uid="chia.dotnet.PlotterConfig.FarmerPublicKey*"></a>
   <h4 id="chia_dotnet_PlotterConfig_FarmerPublicKey" data-uid="chia.dotnet.PlotterConfig.FarmerPublicKey">FarmerPublicKey</h4>
@@ -470,24 +358,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PlotterConfig_Memo.md&amp;value=---%0Auid%3A%20chia.dotnet.PlotterConfig.Memo%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_PlotterConfig_Memo.md&amp;value=---%0Auid%3A%20chia.dotnet.PlotterConfig.Memo%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PlotterConfig_Memo.md&amp;value=---%0Auid%3A%20chia.dotnet.PlotterConfig.Memo%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/PlotterConfig.cs/#L119">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/PlotterConfig.cs/#L119">View Source</a>
   </span>
   <a id="chia_dotnet_PlotterConfig_Memo_" data-uid="chia.dotnet.PlotterConfig.Memo*"></a>
   <h4 id="chia_dotnet_PlotterConfig_Memo" data-uid="chia.dotnet.PlotterConfig.Memo">Memo</h4>
@@ -516,24 +390,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PlotterConfig_NoBitField.md&amp;value=---%0Auid%3A%20chia.dotnet.PlotterConfig.NoBitField%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_PlotterConfig_NoBitField.md&amp;value=---%0Auid%3A%20chia.dotnet.PlotterConfig.NoBitField%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PlotterConfig_NoBitField.md&amp;value=---%0Auid%3A%20chia.dotnet.PlotterConfig.NoBitField%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/PlotterConfig.cs/#L127">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/PlotterConfig.cs/#L127">View Source</a>
   </span>
   <a id="chia_dotnet_PlotterConfig_NoBitField_" data-uid="chia.dotnet.PlotterConfig.NoBitField*"></a>
   <h4 id="chia_dotnet_PlotterConfig_NoBitField" data-uid="chia.dotnet.PlotterConfig.NoBitField">NoBitField</h4>
@@ -564,23 +424,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PlotterConfig_Number.md&amp;value=---%0Auid%3A%20chia.dotnet.PlotterConfig.Number%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_PlotterConfig_Number.md&amp;value=---%0Auid%3A%20chia.dotnet.PlotterConfig.Number%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/PlotterConfig.cs/#L32">View Source</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PlotterConfig_Number.md&amp;value=---%0Auid%3A%20chia.dotnet.PlotterConfig.Number%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
   </span>
   <span class="small pull-right mobile-hide">
     <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/PlotterConfig.cs/#L32">View Source</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
   </span>
   <a id="chia_dotnet_PlotterConfig_Number_" data-uid="chia.dotnet.PlotterConfig.Number*"></a>
   <h4 id="chia_dotnet_PlotterConfig_Number" data-uid="chia.dotnet.PlotterConfig.Number">Number</h4>
@@ -610,105 +457,6 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_PlotterConfig_NumThreads.md&amp;value=---%0Auid%3A%20chia.dotnet.PlotterConfig.NumThreads%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PlotterConfig_NumThreads.md&amp;value=---%0Auid%3A%20chia.dotnet.PlotterConfig.NumThreads%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/PlotterConfig.cs/#L134">View Source</a>
-  </span>
-  <a id="chia_dotnet_PlotterConfig_NumThreads_" data-uid="chia.dotnet.PlotterConfig.NumThreads*"></a>
-  <h4 id="chia_dotnet_PlotterConfig_NumThreads" data-uid="chia.dotnet.PlotterConfig.NumThreads">NumThreads</h4>
-  <div class="markdown level1 summary"><p>The number of threads to devote to each plot</p>
-</div>
-  <div class="markdown level1 conceptual"></div>
-  <h5 class="decalaration">Declaration</h5>
-  <div class="codewrapper">
-    <pre><code class="lang-csharp hljs">[JsonProperty(&quot;r&quot;)]
-public int NumThreads { get; set; }</code></pre>
-  </div>
-  <h5 class="propertyValue">Property Value</h5>
-  <table class="table table-bordered table-striped table-condensed">
-    <thead>
-      <tr>
-        <th>Type</th>
-        <th>Description</th>
-      </tr>
-    </thead>
-    <tbody>
-      <tr>
-        <td><a class="xref" href="https://learn.microsoft.com/dotnet/api/system.int32">Int32</a></td>
-        <td><p>Defaults to 2</p>
-</td>
-      </tr>
-    </tbody>
-  </table>
-  <span class="small pull-right mobile-hide">
-    <span class="divider">|</span>
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PlotterConfig_OverrideK.md&amp;value=---%0Auid%3A%20chia.dotnet.PlotterConfig.OverrideK%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/PlotterConfig.cs/#L134">View Source</a>
-  </span>
-  <a id="chia_dotnet_PlotterConfig_NumThreads_" data-uid="chia.dotnet.PlotterConfig.NumThreads*"></a>
-  <h4 id="chia_dotnet_PlotterConfig_NumThreads" data-uid="chia.dotnet.PlotterConfig.NumThreads">NumThreads</h4>
-  <div class="markdown level1 summary"><p>The number of threads to devote to each plot</p>
-</div>
-  <div class="markdown level1 conceptual"></div>
-  <h5 class="decalaration">Declaration</h5>
-  <div class="codewrapper">
-<<<<<<< HEAD
-<<<<<<< HEAD
-    <pre><code class="lang-csharp hljs">[JsonProperty(&quot;r&quot;)]
-public int NumThreads { get; set; }</code></pre>
-=======
-    <pre><code class="lang-csharp hljs">[JsonProperty(&quot;overrideK&quot;)]
-public bool? OverrideK { get; set; }</code></pre>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-=======
-    <pre><code class="lang-csharp hljs">[JsonProperty(&quot;n&quot;)]
-public int Number { get; set; }</code></pre>
-=======
-<<<<<<< HEAD
-    <pre><code class="lang-csharp hljs">[JsonProperty(&quot;r&quot;)]
-public int NumThreads { get; set; }</code></pre>
-=======
-    <pre><code class="lang-csharp hljs">[JsonProperty(&quot;overrideK&quot;)]
-public bool? OverrideK { get; set; }</code></pre>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
-  </div>
-  <h5 class="propertyValue">Property Value</h5>
-  <table class="table table-bordered table-striped table-condensed">
-    <thead>
-      <tr>
-        <th>Type</th>
-        <th>Description</th>
-      </tr>
-    </thead>
-    <tbody>
-      <tr>
-<<<<<<< HEAD
-        <td><a class="xref" href="https://learn.microsoft.com/dotnet/api/system.int32">Int32</a></td>
-        <td><p>Defaults to 1</p>
-=======
-<<<<<<< HEAD
-        <td><a class="xref" href="https://learn.microsoft.com/dotnet/api/system.int32">Int32</a></td>
-        <td><p>Defaults to 2</p>
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
-</td>
-      </tr>
-    </tbody>
-  </table>
-  <span class="small pull-right mobile-hide">
-    <span class="divider">|</span>
-<<<<<<< HEAD
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PlotterConfig_NumThreads.md&amp;value=---%0Auid%3A%20chia.dotnet.PlotterConfig.NumThreads%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
   </span>
   <span class="small pull-right mobile-hide">
@@ -723,7 +471,6 @@ <h5 class="decalaration">Declaration</h5>
   <div class="codewrapper">
     <pre><code class="lang-csharp hljs">[JsonProperty(&quot;r&quot;)]
 public int NumThreads { get; set; }</code></pre>
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </div>
   <h5 class="propertyValue">Property Value</h5>
   <table class="table table-bordered table-striped table-condensed">
@@ -735,10 +482,6 @@ <h5 class="propertyValue">Property Value</h5>
     </thead>
     <tbody>
       <tr>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
         <td><a class="xref" href="https://learn.microsoft.com/dotnet/api/system.int32">Int32</a></td>
         <td><p>Defaults to 2</p>
 </td>
@@ -748,12 +491,9 @@ <h5 class="propertyValue">Property Value</h5>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PlotterConfig_OverrideK.md&amp;value=---%0Auid%3A%20chia.dotnet.PlotterConfig.OverrideK%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_PlotterConfig_OverrideK.md&amp;value=---%0Auid%3A%20chia.dotnet.PlotterConfig.OverrideK%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/PlotterConfig.cs/#L148">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/PlotterConfig.cs/#L148">View Source</a>
   </span>
   <a id="chia_dotnet_PlotterConfig_OverrideK_" data-uid="chia.dotnet.PlotterConfig.OverrideK*"></a>
   <h4 id="chia_dotnet_PlotterConfig_OverrideK" data-uid="chia.dotnet.PlotterConfig.OverrideK">OverrideK</h4>
@@ -775,16 +515,6 @@ <h5 class="propertyValue">Property Value</h5>
     </thead>
     <tbody>
       <tr>
-<<<<<<< HEAD
-=======
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-=======
-<<<<<<< HEAD
-=======
-=======
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
         <td><a class="xref" href="https://learn.microsoft.com/dotnet/api/system.nullable-1">Nullable</a>&lt;<a class="xref" href="https://learn.microsoft.com/dotnet/api/system.boolean">Boolean</a>&gt;</td>
         <td><p>Defaults to false.</p>
 </td>
@@ -793,24 +523,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PlotterConfig_Parallel.md&amp;value=---%0Auid%3A%20chia.dotnet.PlotterConfig.Parallel%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_PlotterConfig_Parallel.md&amp;value=---%0Auid%3A%20chia.dotnet.PlotterConfig.Parallel%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PlotterConfig_Parallel.md&amp;value=---%0Auid%3A%20chia.dotnet.PlotterConfig.Parallel%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/PlotterConfig.cs/#L25">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/PlotterConfig.cs/#L25">View Source</a>
   </span>
   <a id="chia_dotnet_PlotterConfig_Parallel_" data-uid="chia.dotnet.PlotterConfig.Parallel*"></a>
   <h4 id="chia_dotnet_PlotterConfig_Parallel" data-uid="chia.dotnet.PlotterConfig.Parallel">Parallel</h4>
@@ -839,24 +555,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PlotterConfig_PoolContractAddress.md&amp;value=---%0Auid%3A%20chia.dotnet.PlotterConfig.PoolContractAddress%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_PlotterConfig_PoolContractAddress.md&amp;value=---%0Auid%3A%20chia.dotnet.PlotterConfig.PoolContractAddress%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PlotterConfig_PoolContractAddress.md&amp;value=---%0Auid%3A%20chia.dotnet.PlotterConfig.PoolContractAddress%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/PlotterConfig.cs/#L99">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/PlotterConfig.cs/#L99">View Source</a>
   </span>
   <a id="chia_dotnet_PlotterConfig_PoolContractAddress_" data-uid="chia.dotnet.PlotterConfig.PoolContractAddress*"></a>
   <h4 id="chia_dotnet_PlotterConfig_PoolContractAddress" data-uid="chia.dotnet.PlotterConfig.PoolContractAddress">PoolContractAddress</h4>
@@ -884,24 +586,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PlotterConfig_PoolPublicKey.md&amp;value=---%0Auid%3A%20chia.dotnet.PlotterConfig.PoolPublicKey%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_PlotterConfig_PoolPublicKey.md&amp;value=---%0Auid%3A%20chia.dotnet.PlotterConfig.PoolPublicKey%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PlotterConfig_PoolPublicKey.md&amp;value=---%0Auid%3A%20chia.dotnet.PlotterConfig.PoolPublicKey%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/PlotterConfig.cs/#L106">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/PlotterConfig.cs/#L106">View Source</a>
   </span>
   <a id="chia_dotnet_PlotterConfig_PoolPublicKey_" data-uid="chia.dotnet.PlotterConfig.PoolPublicKey*"></a>
   <h4 id="chia_dotnet_PlotterConfig_PoolPublicKey" data-uid="chia.dotnet.PlotterConfig.PoolPublicKey">PoolPublicKey</h4>
@@ -931,24 +619,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PlotterConfig_Queue.md&amp;value=---%0Auid%3A%20chia.dotnet.PlotterConfig.Queue%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_PlotterConfig_Queue.md&amp;value=---%0Auid%3A%20chia.dotnet.PlotterConfig.Queue%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PlotterConfig_Queue.md&amp;value=---%0Auid%3A%20chia.dotnet.PlotterConfig.Queue%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/PlotterConfig.cs/#L45">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/PlotterConfig.cs/#L45">View Source</a>
   </span>
   <a id="chia_dotnet_PlotterConfig_Queue_" data-uid="chia.dotnet.PlotterConfig.Queue*"></a>
   <h4 id="chia_dotnet_PlotterConfig_Queue" data-uid="chia.dotnet.PlotterConfig.Queue">Queue</h4>
@@ -977,24 +651,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PlotterConfig_Size.md&amp;value=---%0Auid%3A%20chia.dotnet.PlotterConfig.Size%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_PlotterConfig_Size.md&amp;value=---%0Auid%3A%20chia.dotnet.PlotterConfig.Size%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PlotterConfig_Size.md&amp;value=---%0Auid%3A%20chia.dotnet.PlotterConfig.Size%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/PlotterConfig.cs/#L39">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/PlotterConfig.cs/#L39">View Source</a>
   </span>
   <a id="chia_dotnet_PlotterConfig_Size_" data-uid="chia.dotnet.PlotterConfig.Size*"></a>
   <h4 id="chia_dotnet_PlotterConfig_Size" data-uid="chia.dotnet.PlotterConfig.Size">Size</h4>
@@ -1024,24 +684,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PlotterConfig_TempDir.md&amp;value=---%0Auid%3A%20chia.dotnet.PlotterConfig.TempDir%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_PlotterConfig_TempDir.md&amp;value=---%0Auid%3A%20chia.dotnet.PlotterConfig.TempDir%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PlotterConfig_TempDir.md&amp;value=---%0Auid%3A%20chia.dotnet.PlotterConfig.TempDir%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/PlotterConfig.cs/#L54">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/PlotterConfig.cs/#L54">View Source</a>
   </span>
   <a id="chia_dotnet_PlotterConfig_TempDir_" data-uid="chia.dotnet.PlotterConfig.TempDir*"></a>
   <h4 id="chia_dotnet_PlotterConfig_TempDir" data-uid="chia.dotnet.PlotterConfig.TempDir">TempDir</h4>
@@ -1073,24 +719,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PlotterConfig_TempDir2.md&amp;value=---%0Auid%3A%20chia.dotnet.PlotterConfig.TempDir2%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_PlotterConfig_TempDir2.md&amp;value=---%0Auid%3A%20chia.dotnet.PlotterConfig.TempDir2%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PlotterConfig_TempDir2.md&amp;value=---%0Auid%3A%20chia.dotnet.PlotterConfig.TempDir2%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/PlotterConfig.cs/#L61">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/PlotterConfig.cs/#L61">View Source</a>
   </span>
   <a id="chia_dotnet_PlotterConfig_TempDir2_" data-uid="chia.dotnet.PlotterConfig.TempDir2*"></a>
   <h4 id="chia_dotnet_PlotterConfig_TempDir2" data-uid="chia.dotnet.PlotterConfig.TempDir2">TempDir2</h4>
@@ -1130,24 +762,10 @@ <h3 id="implements">Implements</h3>
               <div class="contribution">
                 <ul class="nav">
                   <li>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-                    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PlotterConfig.md&amp;value=---%0Auid%3A%20chia.dotnet.PlotterConfig%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-                    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_PlotterConfig.md&amp;value=---%0Auid%3A%20chia.dotnet.PlotterConfig%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-=======
                     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PlotterConfig.md&amp;value=---%0Auid%3A%20chia.dotnet.PlotterConfig%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
                   </li>
                   <li>
-                    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/PlotterConfig.cs/#L13" class="contribution-link">View Source</a>
+                    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/PlotterConfig.cs/#L13" class="contribution-link">View Source</a>
                   </li>
                 </ul>
               </div>
diff --git a/docs/api/chia.dotnet.PlotterInfo.html b/docs/api/chia.dotnet.PlotterInfo.html
index 8db7fd46..67c3fc06 100644
--- a/docs/api/chia.dotnet.PlotterInfo.html
+++ b/docs/api/chia.dotnet.PlotterInfo.html
@@ -90,21 +90,7 @@ <h5>Inherited Members</h5>
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object)">Object.Equals(Object)</a>
     </div>
     <div>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object-system-object)">Object.Equals(Object, Object)</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-      <span class="xref">System.Object.Equals(System.Object, System.Object)</span>
-=======
-      <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object-system-object)">Object.Equals(Object, Object)</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
     </div>
     <div>
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.gethashcode#system-object-gethashcode">Object.GetHashCode()</a>
@@ -132,24 +118,10 @@ <h3 id="properties">Properties
   </h3>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PlotterInfo_CanInstall.md&amp;value=---%0Auid%3A%20chia.dotnet.PlotterInfo.CanInstall%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_PlotterInfo_CanInstall.md&amp;value=---%0Auid%3A%20chia.dotnet.PlotterInfo.CanInstall%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PlotterInfo_CanInstall.md&amp;value=---%0Auid%3A%20chia.dotnet.PlotterInfo.CanInstall%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/PlotterInfo.cs/#L5">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/PlotterInfo.cs/#L5">View Source</a>
   </span>
   <a id="chia_dotnet_PlotterInfo_CanInstall_" data-uid="chia.dotnet.PlotterInfo.CanInstall*"></a>
   <h4 id="chia_dotnet_PlotterInfo_CanInstall" data-uid="chia.dotnet.PlotterInfo.CanInstall">CanInstall</h4>
@@ -176,24 +148,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PlotterInfo_DisplayName.md&amp;value=---%0Auid%3A%20chia.dotnet.PlotterInfo.DisplayName%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_PlotterInfo_DisplayName.md&amp;value=---%0Auid%3A%20chia.dotnet.PlotterInfo.DisplayName%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PlotterInfo_DisplayName.md&amp;value=---%0Auid%3A%20chia.dotnet.PlotterInfo.DisplayName%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/PlotterInfo.cs/#L6">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/PlotterInfo.cs/#L6">View Source</a>
   </span>
   <a id="chia_dotnet_PlotterInfo_DisplayName_" data-uid="chia.dotnet.PlotterInfo.DisplayName*"></a>
   <h4 id="chia_dotnet_PlotterInfo_DisplayName" data-uid="chia.dotnet.PlotterInfo.DisplayName">DisplayName</h4>
@@ -220,24 +178,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PlotterInfo_Installed.md&amp;value=---%0Auid%3A%20chia.dotnet.PlotterInfo.Installed%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_PlotterInfo_Installed.md&amp;value=---%0Auid%3A%20chia.dotnet.PlotterInfo.Installed%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PlotterInfo_Installed.md&amp;value=---%0Auid%3A%20chia.dotnet.PlotterInfo.Installed%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/PlotterInfo.cs/#L7">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/PlotterInfo.cs/#L7">View Source</a>
   </span>
   <a id="chia_dotnet_PlotterInfo_Installed_" data-uid="chia.dotnet.PlotterInfo.Installed*"></a>
   <h4 id="chia_dotnet_PlotterInfo_Installed" data-uid="chia.dotnet.PlotterInfo.Installed">Installed</h4>
@@ -264,24 +208,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PlotterInfo_Version.md&amp;value=---%0Auid%3A%20chia.dotnet.PlotterInfo.Version%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_PlotterInfo_Version.md&amp;value=---%0Auid%3A%20chia.dotnet.PlotterInfo.Version%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PlotterInfo_Version.md&amp;value=---%0Auid%3A%20chia.dotnet.PlotterInfo.Version%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/PlotterInfo.cs/#L8">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/PlotterInfo.cs/#L8">View Source</a>
   </span>
   <a id="chia_dotnet_PlotterInfo_Version_" data-uid="chia.dotnet.PlotterInfo.Version*"></a>
   <h4 id="chia_dotnet_PlotterInfo_Version" data-uid="chia.dotnet.PlotterInfo.Version">Version</h4>
@@ -318,24 +248,10 @@ <h3 id="implements">Implements</h3>
               <div class="contribution">
                 <ul class="nav">
                   <li>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-                    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PlotterInfo.md&amp;value=---%0Auid%3A%20chia.dotnet.PlotterInfo%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-                    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_PlotterInfo.md&amp;value=---%0Auid%3A%20chia.dotnet.PlotterInfo%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-=======
                     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PlotterInfo.md&amp;value=---%0Auid%3A%20chia.dotnet.PlotterInfo%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
                   </li>
                   <li>
-                    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/PlotterInfo.cs/#L3" class="contribution-link">View Source</a>
+                    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/PlotterInfo.cs/#L3" class="contribution-link">View Source</a>
                   </li>
                 </ul>
               </div>
diff --git a/docs/api/chia.dotnet.PlotterProxy.html b/docs/api/chia.dotnet.PlotterProxy.html
index 75677000..1ac88c21 100644
--- a/docs/api/chia.dotnet.PlotterProxy.html
+++ b/docs/api/chia.dotnet.PlotterProxy.html
@@ -143,24 +143,10 @@ <h3 id="constructors">Constructors
   </h3>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PlotterProxy__ctor_chia_dotnet_WebSocketRpcClient_System_String_.md&amp;value=---%0Auid%3A%20chia.dotnet.PlotterProxy.%23ctor(chia.dotnet.WebSocketRpcClient%2CSystem.String)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_PlotterProxy__ctor_chia_dotnet_WebSocketRpcClient_System_String_.md&amp;value=---%0Auid%3A%20chia.dotnet.PlotterProxy.%23ctor(chia.dotnet.WebSocketRpcClient%2CSystem.String)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PlotterProxy__ctor_chia_dotnet_WebSocketRpcClient_System_String_.md&amp;value=---%0Auid%3A%20chia.dotnet.PlotterProxy.%23ctor(chia.dotnet.WebSocketRpcClient%2CSystem.String)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/PlotterProxy.cs/#L20">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/PlotterProxy.cs/#L20">View Source</a>
   </span>
   <a id="chia_dotnet_PlotterProxy__ctor_" data-uid="chia.dotnet.PlotterProxy.#ctor*"></a>
   <h4 id="chia_dotnet_PlotterProxy__ctor_chia_dotnet_WebSocketRpcClient_System_String_" data-uid="chia.dotnet.PlotterProxy.#ctor(chia.dotnet.WebSocketRpcClient,System.String)">PlotterProxy(WebSocketRpcClient, String)</h4>
@@ -202,24 +188,10 @@ <h3 id="methods">Methods
   </h3>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PlotterProxy_GetPlotters_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.PlotterProxy.GetPlotters(System.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_PlotterProxy_GetPlotters_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.PlotterProxy.GetPlotters(System.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PlotterProxy_GetPlotters_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.PlotterProxy.GetPlotters(System.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/PlotterProxy.cs/#L60">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/PlotterProxy.cs/#L60">View Source</a>
   </span>
   <a id="chia_dotnet_PlotterProxy_GetPlotters_" data-uid="chia.dotnet.PlotterProxy.GetPlotters*"></a>
   <h4 id="chia_dotnet_PlotterProxy_GetPlotters_System_Threading_CancellationToken_" data-uid="chia.dotnet.PlotterProxy.GetPlotters(System.Threading.CancellationToken)">GetPlotters(CancellationToken)</h4>
@@ -266,24 +238,10 @@ <h5 class="returns">Returns</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PlotterProxy_RegisterPlotter_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.PlotterProxy.RegisterPlotter(System.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_PlotterProxy_RegisterPlotter_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.PlotterProxy.RegisterPlotter(System.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PlotterProxy_RegisterPlotter_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.PlotterProxy.RegisterPlotter(System.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/PlotterProxy.cs/#L30">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/PlotterProxy.cs/#L30">View Source</a>
   </span>
   <a id="chia_dotnet_PlotterProxy_RegisterPlotter_" data-uid="chia.dotnet.PlotterProxy.RegisterPlotter*"></a>
   <h4 id="chia_dotnet_PlotterProxy_RegisterPlotter_System_Threading_CancellationToken_" data-uid="chia.dotnet.PlotterProxy.RegisterPlotter(System.Threading.CancellationToken)">RegisterPlotter(CancellationToken)</h4>
@@ -330,24 +288,10 @@ <h5 class="returns">Returns</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PlotterProxy_StartPlotting_chia_dotnet_PlotterConfig_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.PlotterProxy.StartPlotting(chia.dotnet.PlotterConfig%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_PlotterProxy_StartPlotting_chia_dotnet_PlotterConfig_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.PlotterProxy.StartPlotting(chia.dotnet.PlotterConfig%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PlotterProxy_StartPlotting_chia_dotnet_PlotterConfig_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.PlotterProxy.StartPlotting(chia.dotnet.PlotterConfig%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/PlotterProxy.cs/#L44">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/PlotterProxy.cs/#L44">View Source</a>
   </span>
   <a id="chia_dotnet_PlotterProxy_StartPlotting_" data-uid="chia.dotnet.PlotterProxy.StartPlotting*"></a>
   <h4 id="chia_dotnet_PlotterProxy_StartPlotting_chia_dotnet_PlotterConfig_System_Threading_CancellationToken_" data-uid="chia.dotnet.PlotterProxy.StartPlotting(chia.dotnet.PlotterConfig,System.Threading.CancellationToken)">StartPlotting(PlotterConfig, CancellationToken)</h4>
@@ -400,24 +344,10 @@ <h5 class="returns">Returns</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PlotterProxy_StopPlotting_System_String_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.PlotterProxy.StopPlotting(System.String%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_PlotterProxy_StopPlotting_System_String_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.PlotterProxy.StopPlotting(System.String%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PlotterProxy_StopPlotting_System_String_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.PlotterProxy.StopPlotting(System.String%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/PlotterProxy.cs/#L71">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/PlotterProxy.cs/#L71">View Source</a>
   </span>
   <a id="chia_dotnet_PlotterProxy_StopPlotting_" data-uid="chia.dotnet.PlotterProxy.StopPlotting*"></a>
   <h4 id="chia_dotnet_PlotterProxy_StopPlotting_System_String_System_Threading_CancellationToken_" data-uid="chia.dotnet.PlotterProxy.StopPlotting(System.String,System.Threading.CancellationToken)">StopPlotting(String, CancellationToken)</h4>
@@ -476,24 +406,10 @@ <h5 class="returns">Returns</h5>
               <div class="contribution">
                 <ul class="nav">
                   <li>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-                    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PlotterProxy.md&amp;value=---%0Auid%3A%20chia.dotnet.PlotterProxy%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-                    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_PlotterProxy.md&amp;value=---%0Auid%3A%20chia.dotnet.PlotterProxy%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-=======
                     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PlotterProxy.md&amp;value=---%0Auid%3A%20chia.dotnet.PlotterProxy%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
                   </li>
                   <li>
-                    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/PlotterProxy.cs/#L12" class="contribution-link">View Source</a>
+                    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/PlotterProxy.cs/#L12" class="contribution-link">View Source</a>
                   </li>
                 </ul>
               </div>
diff --git a/docs/api/chia.dotnet.PluginStatus.html b/docs/api/chia.dotnet.PluginStatus.html
index 83275251..41f211b5 100644
--- a/docs/api/chia.dotnet.PluginStatus.html
+++ b/docs/api/chia.dotnet.PluginStatus.html
@@ -90,21 +90,7 @@ <h5>Inherited Members</h5>
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object)">Object.Equals(Object)</a>
     </div>
     <div>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object-system-object)">Object.Equals(Object, Object)</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-      <span class="xref">System.Object.Equals(System.Object, System.Object)</span>
-=======
-      <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object-system-object)">Object.Equals(Object, Object)</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
     </div>
     <div>
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.gethashcode#system-object-gethashcode">Object.GetHashCode()</a>
@@ -132,24 +118,10 @@ <h3 id="properties">Properties
   </h3>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PluginStatus_Downloaders.md&amp;value=---%0Auid%3A%20chia.dotnet.PluginStatus.Downloaders%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_PluginStatus_Downloaders.md&amp;value=---%0Auid%3A%20chia.dotnet.PluginStatus.Downloaders%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PluginStatus_Downloaders.md&amp;value=---%0Auid%3A%20chia.dotnet.PluginStatus.Downloaders%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/PluginStatus.cs/#L8">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/PluginStatus.cs/#L8">View Source</a>
   </span>
   <a id="chia_dotnet_PluginStatus_Downloaders_" data-uid="chia.dotnet.PluginStatus.Downloaders*"></a>
   <h4 id="chia_dotnet_PluginStatus_Downloaders" data-uid="chia.dotnet.PluginStatus.Downloaders">Downloaders</h4>
@@ -176,24 +148,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PluginStatus_Uploasders.md&amp;value=---%0Auid%3A%20chia.dotnet.PluginStatus.Uploasders%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_PluginStatus_Uploasders.md&amp;value=---%0Auid%3A%20chia.dotnet.PluginStatus.Uploasders%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PluginStatus_Uploasders.md&amp;value=---%0Auid%3A%20chia.dotnet.PluginStatus.Uploasders%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/PluginStatus.cs/#L7">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/PluginStatus.cs/#L7">View Source</a>
   </span>
   <a id="chia_dotnet_PluginStatus_Uploasders_" data-uid="chia.dotnet.PluginStatus.Uploasders*"></a>
   <h4 id="chia_dotnet_PluginStatus_Uploasders" data-uid="chia.dotnet.PluginStatus.Uploasders">Uploasders</h4>
@@ -230,24 +188,10 @@ <h3 id="implements">Implements</h3>
               <div class="contribution">
                 <ul class="nav">
                   <li>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-                    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PluginStatus.md&amp;value=---%0Auid%3A%20chia.dotnet.PluginStatus%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-                    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_PluginStatus.md&amp;value=---%0Auid%3A%20chia.dotnet.PluginStatus%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-=======
                     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PluginStatus.md&amp;value=---%0Auid%3A%20chia.dotnet.PluginStatus%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
                   </li>
                   <li>
-                    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/PluginStatus.cs/#L5" class="contribution-link">View Source</a>
+                    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/PluginStatus.cs/#L5" class="contribution-link">View Source</a>
                   </li>
                 </ul>
               </div>
diff --git a/docs/api/chia.dotnet.PoolInfo.html b/docs/api/chia.dotnet.PoolInfo.html
index 77bda986..a1b29af5 100644
--- a/docs/api/chia.dotnet.PoolInfo.html
+++ b/docs/api/chia.dotnet.PoolInfo.html
@@ -90,21 +90,7 @@ <h5>Inherited Members</h5>
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object)">Object.Equals(Object)</a>
     </div>
     <div>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object-system-object)">Object.Equals(Object, Object)</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-      <span class="xref">System.Object.Equals(System.Object, System.Object)</span>
-=======
-      <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object-system-object)">Object.Equals(Object, Object)</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
     </div>
     <div>
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.gethashcode#system-object-gethashcode">Object.GetHashCode()</a>
@@ -132,24 +118,10 @@ <h3 id="fields">Fields
   </h3>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PoolInfo_POOL_PROTOCOL_VERSION.md&amp;value=---%0Auid%3A%20chia.dotnet.PoolInfo.POOL_PROTOCOL_VERSION%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_PoolInfo_POOL_PROTOCOL_VERSION.md&amp;value=---%0Auid%3A%20chia.dotnet.PoolInfo.POOL_PROTOCOL_VERSION%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PoolInfo_POOL_PROTOCOL_VERSION.md&amp;value=---%0Auid%3A%20chia.dotnet.PoolInfo.POOL_PROTOCOL_VERSION%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/PoolInfo.cs/#L10">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/PoolInfo.cs/#L10">View Source</a>
   </span>
   <h4 id="chia_dotnet_PoolInfo_POOL_PROTOCOL_VERSION" data-uid="chia.dotnet.PoolInfo.POOL_PROTOCOL_VERSION">POOL_PROTOCOL_VERSION</h4>
   <div class="markdown level1 summary"><p>The current version of the pool protocol</p>
@@ -178,24 +150,10 @@ <h3 id="properties">Properties
   </h3>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PoolInfo_AuthenticationTokenTimeout.md&amp;value=---%0Auid%3A%20chia.dotnet.PoolInfo.AuthenticationTokenTimeout%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_PoolInfo_AuthenticationTokenTimeout.md&amp;value=---%0Auid%3A%20chia.dotnet.PoolInfo.AuthenticationTokenTimeout%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PoolInfo_AuthenticationTokenTimeout.md&amp;value=---%0Auid%3A%20chia.dotnet.PoolInfo.AuthenticationTokenTimeout%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/PoolInfo.cs/#L20">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/PoolInfo.cs/#L20">View Source</a>
   </span>
   <a id="chia_dotnet_PoolInfo_AuthenticationTokenTimeout_" data-uid="chia.dotnet.PoolInfo.AuthenticationTokenTimeout*"></a>
   <h4 id="chia_dotnet_PoolInfo_AuthenticationTokenTimeout" data-uid="chia.dotnet.PoolInfo.AuthenticationTokenTimeout">AuthenticationTokenTimeout</h4>
@@ -222,24 +180,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PoolInfo_Description.md&amp;value=---%0Auid%3A%20chia.dotnet.PoolInfo.Description%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_PoolInfo_Description.md&amp;value=---%0Auid%3A%20chia.dotnet.PoolInfo.Description%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PoolInfo_Description.md&amp;value=---%0Auid%3A%20chia.dotnet.PoolInfo.Description%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/PoolInfo.cs/#L18">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/PoolInfo.cs/#L18">View Source</a>
   </span>
   <a id="chia_dotnet_PoolInfo_Description_" data-uid="chia.dotnet.PoolInfo.Description*"></a>
   <h4 id="chia_dotnet_PoolInfo_Description" data-uid="chia.dotnet.PoolInfo.Description">Description</h4>
@@ -266,24 +210,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PoolInfo_Fee.md&amp;value=---%0Auid%3A%20chia.dotnet.PoolInfo.Fee%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_PoolInfo_Fee.md&amp;value=---%0Auid%3A%20chia.dotnet.PoolInfo.Fee%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PoolInfo_Fee.md&amp;value=---%0Auid%3A%20chia.dotnet.PoolInfo.Fee%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/PoolInfo.cs/#L17">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/PoolInfo.cs/#L17">View Source</a>
   </span>
   <a id="chia_dotnet_PoolInfo_Fee_" data-uid="chia.dotnet.PoolInfo.Fee*"></a>
   <h4 id="chia_dotnet_PoolInfo_Fee" data-uid="chia.dotnet.PoolInfo.Fee">Fee</h4>
@@ -310,24 +240,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PoolInfo_LogoUri.md&amp;value=---%0Auid%3A%20chia.dotnet.PoolInfo.LogoUri%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_PoolInfo_LogoUri.md&amp;value=---%0Auid%3A%20chia.dotnet.PoolInfo.LogoUri%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PoolInfo_LogoUri.md&amp;value=---%0Auid%3A%20chia.dotnet.PoolInfo.LogoUri%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/PoolInfo.cs/#L13">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/PoolInfo.cs/#L13">View Source</a>
   </span>
   <a id="chia_dotnet_PoolInfo_LogoUri_" data-uid="chia.dotnet.PoolInfo.LogoUri*"></a>
   <h4 id="chia_dotnet_PoolInfo_LogoUri" data-uid="chia.dotnet.PoolInfo.LogoUri">LogoUri</h4>
@@ -354,24 +270,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PoolInfo_MinimumDifficulty.md&amp;value=---%0Auid%3A%20chia.dotnet.PoolInfo.MinimumDifficulty%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_PoolInfo_MinimumDifficulty.md&amp;value=---%0Auid%3A%20chia.dotnet.PoolInfo.MinimumDifficulty%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PoolInfo_MinimumDifficulty.md&amp;value=---%0Auid%3A%20chia.dotnet.PoolInfo.MinimumDifficulty%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/PoolInfo.cs/#L14">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/PoolInfo.cs/#L14">View Source</a>
   </span>
   <a id="chia_dotnet_PoolInfo_MinimumDifficulty_" data-uid="chia.dotnet.PoolInfo.MinimumDifficulty*"></a>
   <h4 id="chia_dotnet_PoolInfo_MinimumDifficulty" data-uid="chia.dotnet.PoolInfo.MinimumDifficulty">MinimumDifficulty</h4>
@@ -398,24 +300,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PoolInfo_Name.md&amp;value=---%0Auid%3A%20chia.dotnet.PoolInfo.Name%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_PoolInfo_Name.md&amp;value=---%0Auid%3A%20chia.dotnet.PoolInfo.Name%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PoolInfo_Name.md&amp;value=---%0Auid%3A%20chia.dotnet.PoolInfo.Name%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/PoolInfo.cs/#L12">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/PoolInfo.cs/#L12">View Source</a>
   </span>
   <a id="chia_dotnet_PoolInfo_Name_" data-uid="chia.dotnet.PoolInfo.Name*"></a>
   <h4 id="chia_dotnet_PoolInfo_Name" data-uid="chia.dotnet.PoolInfo.Name">Name</h4>
@@ -442,24 +330,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PoolInfo_ProtocolVersion.md&amp;value=---%0Auid%3A%20chia.dotnet.PoolInfo.ProtocolVersion%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_PoolInfo_ProtocolVersion.md&amp;value=---%0Auid%3A%20chia.dotnet.PoolInfo.ProtocolVersion%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PoolInfo_ProtocolVersion.md&amp;value=---%0Auid%3A%20chia.dotnet.PoolInfo.ProtocolVersion%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/PoolInfo.cs/#L16">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/PoolInfo.cs/#L16">View Source</a>
   </span>
   <a id="chia_dotnet_PoolInfo_ProtocolVersion_" data-uid="chia.dotnet.PoolInfo.ProtocolVersion*"></a>
   <h4 id="chia_dotnet_PoolInfo_ProtocolVersion" data-uid="chia.dotnet.PoolInfo.ProtocolVersion">ProtocolVersion</h4>
@@ -486,24 +360,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PoolInfo_RelativeLockHeight.md&amp;value=---%0Auid%3A%20chia.dotnet.PoolInfo.RelativeLockHeight%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_PoolInfo_RelativeLockHeight.md&amp;value=---%0Auid%3A%20chia.dotnet.PoolInfo.RelativeLockHeight%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PoolInfo_RelativeLockHeight.md&amp;value=---%0Auid%3A%20chia.dotnet.PoolInfo.RelativeLockHeight%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/PoolInfo.cs/#L15">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/PoolInfo.cs/#L15">View Source</a>
   </span>
   <a id="chia_dotnet_PoolInfo_RelativeLockHeight_" data-uid="chia.dotnet.PoolInfo.RelativeLockHeight*"></a>
   <h4 id="chia_dotnet_PoolInfo_RelativeLockHeight" data-uid="chia.dotnet.PoolInfo.RelativeLockHeight">RelativeLockHeight</h4>
@@ -530,24 +390,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PoolInfo_TargetPuzzleHash.md&amp;value=---%0Auid%3A%20chia.dotnet.PoolInfo.TargetPuzzleHash%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_PoolInfo_TargetPuzzleHash.md&amp;value=---%0Auid%3A%20chia.dotnet.PoolInfo.TargetPuzzleHash%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PoolInfo_TargetPuzzleHash.md&amp;value=---%0Auid%3A%20chia.dotnet.PoolInfo.TargetPuzzleHash%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/PoolInfo.cs/#L19">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/PoolInfo.cs/#L19">View Source</a>
   </span>
   <a id="chia_dotnet_PoolInfo_TargetPuzzleHash_" data-uid="chia.dotnet.PoolInfo.TargetPuzzleHash*"></a>
   <h4 id="chia_dotnet_PoolInfo_TargetPuzzleHash" data-uid="chia.dotnet.PoolInfo.TargetPuzzleHash">TargetPuzzleHash</h4>
@@ -584,24 +430,10 @@ <h3 id="implements">Implements</h3>
               <div class="contribution">
                 <ul class="nav">
                   <li>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-                    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PoolInfo.md&amp;value=---%0Auid%3A%20chia.dotnet.PoolInfo%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-                    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_PoolInfo.md&amp;value=---%0Auid%3A%20chia.dotnet.PoolInfo%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-=======
                     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PoolInfo.md&amp;value=---%0Auid%3A%20chia.dotnet.PoolInfo%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
                   </li>
                   <li>
-                    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/PoolInfo.cs/#L5" class="contribution-link">View Source</a>
+                    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/PoolInfo.cs/#L5" class="contribution-link">View Source</a>
                   </li>
                 </ul>
               </div>
diff --git a/docs/api/chia.dotnet.PoolPoint.html b/docs/api/chia.dotnet.PoolPoint.html
index 00f07e86..d2205ab3 100644
--- a/docs/api/chia.dotnet.PoolPoint.html
+++ b/docs/api/chia.dotnet.PoolPoint.html
@@ -90,21 +90,7 @@ <h5>Inherited Members</h5>
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object)">Object.Equals(Object)</a>
     </div>
     <div>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object-system-object)">Object.Equals(Object, Object)</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-      <span class="xref">System.Object.Equals(System.Object, System.Object)</span>
-=======
-      <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object-system-object)">Object.Equals(Object, Object)</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
     </div>
     <div>
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.gethashcode#system-object-gethashcode">Object.GetHashCode()</a>
@@ -133,24 +119,10 @@ <h3 id="properties">Properties
   </h3>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PoolPoint_DateTimeFound.md&amp;value=---%0Auid%3A%20chia.dotnet.PoolPoint.DateTimeFound%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_PoolPoint_DateTimeFound.md&amp;value=---%0Auid%3A%20chia.dotnet.PoolPoint.DateTimeFound%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PoolPoint_DateTimeFound.md&amp;value=---%0Auid%3A%20chia.dotnet.PoolPoint.DateTimeFound%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/PoolPoint.cs/#L12">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/PoolPoint.cs/#L12">View Source</a>
   </span>
   <a id="chia_dotnet_PoolPoint_DateTimeFound_" data-uid="chia.dotnet.PoolPoint.DateTimeFound*"></a>
   <h4 id="chia_dotnet_PoolPoint_DateTimeFound" data-uid="chia.dotnet.PoolPoint.DateTimeFound">DateTimeFound</h4>
@@ -178,24 +150,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PoolPoint_Difficulty.md&amp;value=---%0Auid%3A%20chia.dotnet.PoolPoint.Difficulty%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_PoolPoint_Difficulty.md&amp;value=---%0Auid%3A%20chia.dotnet.PoolPoint.Difficulty%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PoolPoint_Difficulty.md&amp;value=---%0Auid%3A%20chia.dotnet.PoolPoint.Difficulty%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/PoolPoint.cs/#L11">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/PoolPoint.cs/#L11">View Source</a>
   </span>
   <a id="chia_dotnet_PoolPoint_Difficulty_" data-uid="chia.dotnet.PoolPoint.Difficulty*"></a>
   <h4 id="chia_dotnet_PoolPoint_Difficulty" data-uid="chia.dotnet.PoolPoint.Difficulty">Difficulty</h4>
@@ -222,24 +180,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PoolPoint_TimeFound.md&amp;value=---%0Auid%3A%20chia.dotnet.PoolPoint.TimeFound%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_PoolPoint_TimeFound.md&amp;value=---%0Auid%3A%20chia.dotnet.PoolPoint.TimeFound%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PoolPoint_TimeFound.md&amp;value=---%0Auid%3A%20chia.dotnet.PoolPoint.TimeFound%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/PoolPoint.cs/#L10">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/PoolPoint.cs/#L10">View Source</a>
   </span>
   <a id="chia_dotnet_PoolPoint_TimeFound_" data-uid="chia.dotnet.PoolPoint.TimeFound*"></a>
   <h4 id="chia_dotnet_PoolPoint_TimeFound" data-uid="chia.dotnet.PoolPoint.TimeFound">TimeFound</h4>
@@ -276,24 +220,10 @@ <h3 id="implements">Implements</h3>
               <div class="contribution">
                 <ul class="nav">
                   <li>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-                    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PoolPoint.md&amp;value=---%0Auid%3A%20chia.dotnet.PoolPoint%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-                    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_PoolPoint.md&amp;value=---%0Auid%3A%20chia.dotnet.PoolPoint%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-=======
                     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PoolPoint.md&amp;value=---%0Auid%3A%20chia.dotnet.PoolPoint%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
                   </li>
                   <li>
-                    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/PoolPoint.cs/#L7" class="contribution-link">View Source</a>
+                    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/PoolPoint.cs/#L7" class="contribution-link">View Source</a>
                   </li>
                 </ul>
               </div>
diff --git a/docs/api/chia.dotnet.PoolSingletonState.html b/docs/api/chia.dotnet.PoolSingletonState.html
index c91fb315..2b0f8dd5 100644
--- a/docs/api/chia.dotnet.PoolSingletonState.html
+++ b/docs/api/chia.dotnet.PoolSingletonState.html
@@ -127,24 +127,10 @@ <h3 id="fields">Fields
               <div class="contribution">
                 <ul class="nav">
                   <li>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
                     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PoolSingletonState.md&amp;value=---%0Auid%3A%20chia.dotnet.PoolSingletonState%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-                    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_PoolSingletonState.md&amp;value=---%0Auid%3A%20chia.dotnet.PoolSingletonState%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-=======
-                    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PoolSingletonState.md&amp;value=---%0Auid%3A%20chia.dotnet.PoolSingletonState%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
                   </li>
                   <li>
-                    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/PoolSingletonState.cs/#L19" class="contribution-link">View Source</a>
+                    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/PoolSingletonState.cs/#L19" class="contribution-link">View Source</a>
                   </li>
                 </ul>
               </div>
diff --git a/docs/api/chia.dotnet.PoolState.html b/docs/api/chia.dotnet.PoolState.html
index d9a30612..8dfcf7ba 100644
--- a/docs/api/chia.dotnet.PoolState.html
+++ b/docs/api/chia.dotnet.PoolState.html
@@ -95,21 +95,7 @@ <h5>Inherited Members</h5>
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object)">Object.Equals(Object)</a>
     </div>
     <div>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object-system-object)">Object.Equals(Object, Object)</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-      <span class="xref">System.Object.Equals(System.Object, System.Object)</span>
-=======
-      <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object-system-object)">Object.Equals(Object, Object)</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
     </div>
     <div>
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.gethashcode#system-object-gethashcode">Object.GetHashCode()</a>
@@ -137,24 +123,10 @@ <h3 id="properties">Properties
   </h3>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PoolState_OwnerPubkey.md&amp;value=---%0Auid%3A%20chia.dotnet.PoolState.OwnerPubkey%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_PoolState_OwnerPubkey.md&amp;value=---%0Auid%3A%20chia.dotnet.PoolState.OwnerPubkey%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PoolState_OwnerPubkey.md&amp;value=---%0Auid%3A%20chia.dotnet.PoolState.OwnerPubkey%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/PoolState.cs/#L31">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/PoolState.cs/#L31">View Source</a>
   </span>
   <a id="chia_dotnet_PoolState_OwnerPubkey_" data-uid="chia.dotnet.PoolState.OwnerPubkey*"></a>
   <h4 id="chia_dotnet_PoolState_OwnerPubkey" data-uid="chia.dotnet.PoolState.OwnerPubkey">OwnerPubkey</h4>
@@ -182,24 +154,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PoolState_PoolUrl.md&amp;value=---%0Auid%3A%20chia.dotnet.PoolState.PoolUrl%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_PoolState_PoolUrl.md&amp;value=---%0Auid%3A%20chia.dotnet.PoolState.PoolUrl%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PoolState_PoolUrl.md&amp;value=---%0Auid%3A%20chia.dotnet.PoolState.PoolUrl%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/PoolState.cs/#L34">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/PoolState.cs/#L34">View Source</a>
   </span>
   <a id="chia_dotnet_PoolState_PoolUrl_" data-uid="chia.dotnet.PoolState.PoolUrl*"></a>
   <h4 id="chia_dotnet_PoolState_PoolUrl" data-uid="chia.dotnet.PoolState.PoolUrl">PoolUrl</h4>
@@ -226,24 +184,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PoolState_RelativeLockHeight.md&amp;value=---%0Auid%3A%20chia.dotnet.PoolState.RelativeLockHeight%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_PoolState_RelativeLockHeight.md&amp;value=---%0Auid%3A%20chia.dotnet.PoolState.RelativeLockHeight%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PoolState_RelativeLockHeight.md&amp;value=---%0Auid%3A%20chia.dotnet.PoolState.RelativeLockHeight%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/PoolState.cs/#L36">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/PoolState.cs/#L36">View Source</a>
   </span>
   <a id="chia_dotnet_PoolState_RelativeLockHeight_" data-uid="chia.dotnet.PoolState.RelativeLockHeight*"></a>
   <h4 id="chia_dotnet_PoolState_RelativeLockHeight" data-uid="chia.dotnet.PoolState.RelativeLockHeight">RelativeLockHeight</h4>
@@ -270,24 +214,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PoolState_State.md&amp;value=---%0Auid%3A%20chia.dotnet.PoolState.State%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_PoolState_State.md&amp;value=---%0Auid%3A%20chia.dotnet.PoolState.State%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PoolState_State.md&amp;value=---%0Auid%3A%20chia.dotnet.PoolState.State%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/PoolState.cs/#L19">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/PoolState.cs/#L19">View Source</a>
   </span>
   <a id="chia_dotnet_PoolState_State_" data-uid="chia.dotnet.PoolState.State*"></a>
   <h4 id="chia_dotnet_PoolState_State" data-uid="chia.dotnet.PoolState.State">State</h4>
@@ -315,24 +245,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PoolState_TargetPuzzleHash.md&amp;value=---%0Auid%3A%20chia.dotnet.PoolState.TargetPuzzleHash%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_PoolState_TargetPuzzleHash.md&amp;value=---%0Auid%3A%20chia.dotnet.PoolState.TargetPuzzleHash%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PoolState_TargetPuzzleHash.md&amp;value=---%0Auid%3A%20chia.dotnet.PoolState.TargetPuzzleHash%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/PoolState.cs/#L26">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/PoolState.cs/#L26">View Source</a>
   </span>
   <a id="chia_dotnet_PoolState_TargetPuzzleHash_" data-uid="chia.dotnet.PoolState.TargetPuzzleHash*"></a>
   <h4 id="chia_dotnet_PoolState_TargetPuzzleHash" data-uid="chia.dotnet.PoolState.TargetPuzzleHash">TargetPuzzleHash</h4>
@@ -362,24 +278,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PoolState_Version.md&amp;value=---%0Auid%3A%20chia.dotnet.PoolState.Version%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_PoolState_Version.md&amp;value=---%0Auid%3A%20chia.dotnet.PoolState.Version%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PoolState_Version.md&amp;value=---%0Auid%3A%20chia.dotnet.PoolState.Version%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/PoolState.cs/#L14">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/PoolState.cs/#L14">View Source</a>
   </span>
   <a id="chia_dotnet_PoolState_Version_" data-uid="chia.dotnet.PoolState.Version*"></a>
   <h4 id="chia_dotnet_PoolState_Version" data-uid="chia.dotnet.PoolState.Version">Version</h4>
@@ -416,24 +318,10 @@ <h3 id="implements">Implements</h3>
               <div class="contribution">
                 <ul class="nav">
                   <li>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-                    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PoolState.md&amp;value=---%0Auid%3A%20chia.dotnet.PoolState%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-                    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_PoolState.md&amp;value=---%0Auid%3A%20chia.dotnet.PoolState%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-=======
                     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PoolState.md&amp;value=---%0Auid%3A%20chia.dotnet.PoolState%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
                   </li>
                   <li>
-                    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/PoolState.cs/#L10" class="contribution-link">View Source</a>
+                    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/PoolState.cs/#L10" class="contribution-link">View Source</a>
                   </li>
                 </ul>
               </div>
diff --git a/docs/api/chia.dotnet.PoolStateInfo.html b/docs/api/chia.dotnet.PoolStateInfo.html
index 6a404b85..4e44f644 100644
--- a/docs/api/chia.dotnet.PoolStateInfo.html
+++ b/docs/api/chia.dotnet.PoolStateInfo.html
@@ -92,21 +92,7 @@ <h5>Inherited Members</h5>
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object)">Object.Equals(Object)</a>
     </div>
     <div>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object-system-object)">Object.Equals(Object, Object)</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-      <span class="xref">System.Object.Equals(System.Object, System.Object)</span>
-=======
-      <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object-system-object)">Object.Equals(Object, Object)</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
     </div>
     <div>
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.gethashcode#system-object-gethashcode">Object.GetHashCode()</a>
@@ -134,24 +120,10 @@ <h3 id="properties">Properties
   </h3>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PoolStateInfo_AuthenticationTokenTimeout.md&amp;value=---%0Auid%3A%20chia.dotnet.PoolStateInfo.AuthenticationTokenTimeout%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_PoolStateInfo_AuthenticationTokenTimeout.md&amp;value=---%0Auid%3A%20chia.dotnet.PoolStateInfo.AuthenticationTokenTimeout%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PoolStateInfo_AuthenticationTokenTimeout.md&amp;value=---%0Auid%3A%20chia.dotnet.PoolStateInfo.AuthenticationTokenTimeout%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/PoolStateInfo.cs/#L14">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/PoolStateInfo.cs/#L14">View Source</a>
   </span>
   <a id="chia_dotnet_PoolStateInfo_AuthenticationTokenTimeout_" data-uid="chia.dotnet.PoolStateInfo.AuthenticationTokenTimeout*"></a>
   <h4 id="chia_dotnet_PoolStateInfo_AuthenticationTokenTimeout" data-uid="chia.dotnet.PoolStateInfo.AuthenticationTokenTimeout">AuthenticationTokenTimeout</h4>
@@ -178,24 +150,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PoolStateInfo_CurrentDifficulty.md&amp;value=---%0Auid%3A%20chia.dotnet.PoolStateInfo.CurrentDifficulty%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_PoolStateInfo_CurrentDifficulty.md&amp;value=---%0Auid%3A%20chia.dotnet.PoolStateInfo.CurrentDifficulty%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PoolStateInfo_CurrentDifficulty.md&amp;value=---%0Auid%3A%20chia.dotnet.PoolStateInfo.CurrentDifficulty%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/PoolStateInfo.cs/#L15">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/PoolStateInfo.cs/#L15">View Source</a>
   </span>
   <a id="chia_dotnet_PoolStateInfo_CurrentDifficulty_" data-uid="chia.dotnet.PoolStateInfo.CurrentDifficulty*"></a>
   <h4 id="chia_dotnet_PoolStateInfo_CurrentDifficulty" data-uid="chia.dotnet.PoolStateInfo.CurrentDifficulty">CurrentDifficulty</h4>
@@ -222,24 +180,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PoolStateInfo_CurrentPoints.md&amp;value=---%0Auid%3A%20chia.dotnet.PoolStateInfo.CurrentPoints%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_PoolStateInfo_CurrentPoints.md&amp;value=---%0Auid%3A%20chia.dotnet.PoolStateInfo.CurrentPoints%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PoolStateInfo_CurrentPoints.md&amp;value=---%0Auid%3A%20chia.dotnet.PoolStateInfo.CurrentPoints%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/PoolStateInfo.cs/#L16">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/PoolStateInfo.cs/#L16">View Source</a>
   </span>
   <a id="chia_dotnet_PoolStateInfo_CurrentPoints_" data-uid="chia.dotnet.PoolStateInfo.CurrentPoints*"></a>
   <h4 id="chia_dotnet_PoolStateInfo_CurrentPoints" data-uid="chia.dotnet.PoolStateInfo.CurrentPoints">CurrentPoints</h4>
@@ -266,24 +210,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PoolStateInfo_NextFarmerUpdate.md&amp;value=---%0Auid%3A%20chia.dotnet.PoolStateInfo.NextFarmerUpdate%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_PoolStateInfo_NextFarmerUpdate.md&amp;value=---%0Auid%3A%20chia.dotnet.PoolStateInfo.NextFarmerUpdate%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PoolStateInfo_NextFarmerUpdate.md&amp;value=---%0Auid%3A%20chia.dotnet.PoolStateInfo.NextFarmerUpdate%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/PoolStateInfo.cs/#L17">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/PoolStateInfo.cs/#L17">View Source</a>
   </span>
   <a id="chia_dotnet_PoolStateInfo_NextFarmerUpdate_" data-uid="chia.dotnet.PoolStateInfo.NextFarmerUpdate*"></a>
   <h4 id="chia_dotnet_PoolStateInfo_NextFarmerUpdate" data-uid="chia.dotnet.PoolStateInfo.NextFarmerUpdate">NextFarmerUpdate</h4>
@@ -310,24 +240,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PoolStateInfo_NextFarmerUpdateDateTime.md&amp;value=---%0Auid%3A%20chia.dotnet.PoolStateInfo.NextFarmerUpdateDateTime%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_PoolStateInfo_NextFarmerUpdateDateTime.md&amp;value=---%0Auid%3A%20chia.dotnet.PoolStateInfo.NextFarmerUpdateDateTime%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PoolStateInfo_NextFarmerUpdateDateTime.md&amp;value=---%0Auid%3A%20chia.dotnet.PoolStateInfo.NextFarmerUpdateDateTime%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/PoolStateInfo.cs/#L29">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/PoolStateInfo.cs/#L29">View Source</a>
   </span>
   <a id="chia_dotnet_PoolStateInfo_NextFarmerUpdateDateTime_" data-uid="chia.dotnet.PoolStateInfo.NextFarmerUpdateDateTime*"></a>
   <h4 id="chia_dotnet_PoolStateInfo_NextFarmerUpdateDateTime" data-uid="chia.dotnet.PoolStateInfo.NextFarmerUpdateDateTime">NextFarmerUpdateDateTime</h4>
@@ -355,24 +271,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PoolStateInfo_NextPoolInfoUpdate.md&amp;value=---%0Auid%3A%20chia.dotnet.PoolStateInfo.NextPoolInfoUpdate%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_PoolStateInfo_NextPoolInfoUpdate.md&amp;value=---%0Auid%3A%20chia.dotnet.PoolStateInfo.NextPoolInfoUpdate%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PoolStateInfo_NextPoolInfoUpdate.md&amp;value=---%0Auid%3A%20chia.dotnet.PoolStateInfo.NextPoolInfoUpdate%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/PoolStateInfo.cs/#L18">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/PoolStateInfo.cs/#L18">View Source</a>
   </span>
   <a id="chia_dotnet_PoolStateInfo_NextPoolInfoUpdate_" data-uid="chia.dotnet.PoolStateInfo.NextPoolInfoUpdate*"></a>
   <h4 id="chia_dotnet_PoolStateInfo_NextPoolInfoUpdate" data-uid="chia.dotnet.PoolStateInfo.NextPoolInfoUpdate">NextPoolInfoUpdate</h4>
@@ -399,24 +301,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PoolStateInfo_NextPoolInfoUpdateDateTime.md&amp;value=---%0Auid%3A%20chia.dotnet.PoolStateInfo.NextPoolInfoUpdateDateTime%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_PoolStateInfo_NextPoolInfoUpdateDateTime.md&amp;value=---%0Auid%3A%20chia.dotnet.PoolStateInfo.NextPoolInfoUpdateDateTime%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PoolStateInfo_NextPoolInfoUpdateDateTime.md&amp;value=---%0Auid%3A%20chia.dotnet.PoolStateInfo.NextPoolInfoUpdateDateTime%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/PoolStateInfo.cs/#L31">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/PoolStateInfo.cs/#L31">View Source</a>
   </span>
   <a id="chia_dotnet_PoolStateInfo_NextPoolInfoUpdateDateTime_" data-uid="chia.dotnet.PoolStateInfo.NextPoolInfoUpdateDateTime*"></a>
   <h4 id="chia_dotnet_PoolStateInfo_NextPoolInfoUpdateDateTime" data-uid="chia.dotnet.PoolStateInfo.NextPoolInfoUpdateDateTime">NextPoolInfoUpdateDateTime</h4>
@@ -444,24 +332,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PoolStateInfo_P2SingletonPuzzleHash.md&amp;value=---%0Auid%3A%20chia.dotnet.PoolStateInfo.P2SingletonPuzzleHash%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_PoolStateInfo_P2SingletonPuzzleHash.md&amp;value=---%0Auid%3A%20chia.dotnet.PoolStateInfo.P2SingletonPuzzleHash%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PoolStateInfo_P2SingletonPuzzleHash.md&amp;value=---%0Auid%3A%20chia.dotnet.PoolStateInfo.P2SingletonPuzzleHash%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/PoolStateInfo.cs/#L19">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/PoolStateInfo.cs/#L19">View Source</a>
   </span>
   <a id="chia_dotnet_PoolStateInfo_P2SingletonPuzzleHash_" data-uid="chia.dotnet.PoolStateInfo.P2SingletonPuzzleHash*"></a>
   <h4 id="chia_dotnet_PoolStateInfo_P2SingletonPuzzleHash" data-uid="chia.dotnet.PoolStateInfo.P2SingletonPuzzleHash">P2SingletonPuzzleHash</h4>
@@ -488,24 +362,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PoolStateInfo_PlotCount.md&amp;value=---%0Auid%3A%20chia.dotnet.PoolStateInfo.PlotCount%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_PoolStateInfo_PlotCount.md&amp;value=---%0Auid%3A%20chia.dotnet.PoolStateInfo.PlotCount%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PoolStateInfo_PlotCount.md&amp;value=---%0Auid%3A%20chia.dotnet.PoolStateInfo.PlotCount%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/PoolStateInfo.cs/#L26">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/PoolStateInfo.cs/#L26">View Source</a>
   </span>
   <a id="chia_dotnet_PoolStateInfo_PlotCount_" data-uid="chia.dotnet.PoolStateInfo.PlotCount*"></a>
   <h4 id="chia_dotnet_PoolStateInfo_PlotCount" data-uid="chia.dotnet.PoolStateInfo.PlotCount">PlotCount</h4>
@@ -532,24 +392,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PoolStateInfo_PointsAcknowledged24h.md&amp;value=---%0Auid%3A%20chia.dotnet.PoolStateInfo.PointsAcknowledged24h%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_PoolStateInfo_PointsAcknowledged24h.md&amp;value=---%0Auid%3A%20chia.dotnet.PoolStateInfo.PointsAcknowledged24h%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PoolStateInfo_PointsAcknowledged24h.md&amp;value=---%0Auid%3A%20chia.dotnet.PoolStateInfo.PointsAcknowledged24h%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/PoolStateInfo.cs/#L20">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/PoolStateInfo.cs/#L20">View Source</a>
   </span>
   <a id="chia_dotnet_PoolStateInfo_PointsAcknowledged24h_" data-uid="chia.dotnet.PoolStateInfo.PointsAcknowledged24h*"></a>
   <h4 id="chia_dotnet_PoolStateInfo_PointsAcknowledged24h" data-uid="chia.dotnet.PoolStateInfo.PointsAcknowledged24h">PointsAcknowledged24h</h4>
@@ -558,21 +404,7 @@ <h4 id="chia_dotnet_PoolStateInfo_PointsAcknowledged24h" data-uid="chia.dotnet.P
   <h5 class="decalaration">Declaration</h5>
   <div class="codewrapper">
     <pre><code class="lang-csharp hljs">[JsonProperty(&quot;points_acknowledged_24h&quot;)]
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-public IEnumerable&lt;PoolPoint&gt; PointsAcknowledged24h { get; set; }</code></pre>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-public ICollection&lt;PoolPoint&gt; PointsAcknowledged24h { get; set; }</code></pre>
-=======
 public IEnumerable&lt;PoolPoint&gt; PointsAcknowledged24h { get; set; }</code></pre>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </div>
   <h5 class="propertyValue">Property Value</h5>
   <table class="table table-bordered table-striped table-condensed">
@@ -591,24 +423,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PoolStateInfo_PointsAcknowledgedSinceStart.md&amp;value=---%0Auid%3A%20chia.dotnet.PoolStateInfo.PointsAcknowledgedSinceStart%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_PoolStateInfo_PointsAcknowledgedSinceStart.md&amp;value=---%0Auid%3A%20chia.dotnet.PoolStateInfo.PointsAcknowledgedSinceStart%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PoolStateInfo_PointsAcknowledgedSinceStart.md&amp;value=---%0Auid%3A%20chia.dotnet.PoolStateInfo.PointsAcknowledgedSinceStart%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/PoolStateInfo.cs/#L22">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/PoolStateInfo.cs/#L22">View Source</a>
   </span>
   <a id="chia_dotnet_PoolStateInfo_PointsAcknowledgedSinceStart_" data-uid="chia.dotnet.PoolStateInfo.PointsAcknowledgedSinceStart*"></a>
   <h4 id="chia_dotnet_PoolStateInfo_PointsAcknowledgedSinceStart" data-uid="chia.dotnet.PoolStateInfo.PointsAcknowledgedSinceStart">PointsAcknowledgedSinceStart</h4>
@@ -635,24 +453,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PoolStateInfo_PointsFound24h.md&amp;value=---%0Auid%3A%20chia.dotnet.PoolStateInfo.PointsFound24h%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_PoolStateInfo_PointsFound24h.md&amp;value=---%0Auid%3A%20chia.dotnet.PoolStateInfo.PointsFound24h%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PoolStateInfo_PointsFound24h.md&amp;value=---%0Auid%3A%20chia.dotnet.PoolStateInfo.PointsFound24h%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/PoolStateInfo.cs/#L23">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/PoolStateInfo.cs/#L23">View Source</a>
   </span>
   <a id="chia_dotnet_PoolStateInfo_PointsFound24h_" data-uid="chia.dotnet.PoolStateInfo.PointsFound24h*"></a>
   <h4 id="chia_dotnet_PoolStateInfo_PointsFound24h" data-uid="chia.dotnet.PoolStateInfo.PointsFound24h">PointsFound24h</h4>
@@ -661,21 +465,7 @@ <h4 id="chia_dotnet_PoolStateInfo_PointsFound24h" data-uid="chia.dotnet.PoolStat
   <h5 class="decalaration">Declaration</h5>
   <div class="codewrapper">
     <pre><code class="lang-csharp hljs">[JsonProperty(&quot;points_found_24h&quot;)]
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-public IEnumerable&lt;PoolPoint&gt; PointsFound24h { get; set; }</code></pre>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-public ICollection&lt;PoolPoint&gt; PointsFound24h { get; set; }</code></pre>
-=======
 public IEnumerable&lt;PoolPoint&gt; PointsFound24h { get; set; }</code></pre>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </div>
   <h5 class="propertyValue">Property Value</h5>
   <table class="table table-bordered table-striped table-condensed">
@@ -694,24 +484,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PoolStateInfo_PointsFoundSinceStart.md&amp;value=---%0Auid%3A%20chia.dotnet.PoolStateInfo.PointsFoundSinceStart%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_PoolStateInfo_PointsFoundSinceStart.md&amp;value=---%0Auid%3A%20chia.dotnet.PoolStateInfo.PointsFoundSinceStart%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PoolStateInfo_PointsFoundSinceStart.md&amp;value=---%0Auid%3A%20chia.dotnet.PoolStateInfo.PointsFoundSinceStart%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/PoolStateInfo.cs/#L25">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/PoolStateInfo.cs/#L25">View Source</a>
   </span>
   <a id="chia_dotnet_PoolStateInfo_PointsFoundSinceStart_" data-uid="chia.dotnet.PoolStateInfo.PointsFoundSinceStart*"></a>
   <h4 id="chia_dotnet_PoolStateInfo_PointsFoundSinceStart" data-uid="chia.dotnet.PoolStateInfo.PointsFoundSinceStart">PointsFoundSinceStart</h4>
@@ -738,24 +514,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PoolStateInfo_PoolConfig.md&amp;value=---%0Auid%3A%20chia.dotnet.PoolStateInfo.PoolConfig%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_PoolStateInfo_PoolConfig.md&amp;value=---%0Auid%3A%20chia.dotnet.PoolStateInfo.PoolConfig%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PoolStateInfo_PoolConfig.md&amp;value=---%0Auid%3A%20chia.dotnet.PoolStateInfo.PoolConfig%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/PoolStateInfo.cs/#L27">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/PoolStateInfo.cs/#L27">View Source</a>
   </span>
   <a id="chia_dotnet_PoolStateInfo_PoolConfig_" data-uid="chia.dotnet.PoolStateInfo.PoolConfig*"></a>
   <h4 id="chia_dotnet_PoolStateInfo_PoolConfig" data-uid="chia.dotnet.PoolStateInfo.PoolConfig">PoolConfig</h4>
@@ -782,24 +544,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PoolStateInfo_PoolErrors24h.md&amp;value=---%0Auid%3A%20chia.dotnet.PoolStateInfo.PoolErrors24h%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_PoolStateInfo_PoolErrors24h.md&amp;value=---%0Auid%3A%20chia.dotnet.PoolStateInfo.PoolErrors24h%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PoolStateInfo_PoolErrors24h.md&amp;value=---%0Auid%3A%20chia.dotnet.PoolStateInfo.PoolErrors24h%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/PoolStateInfo.cs/#L28">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/PoolStateInfo.cs/#L28">View Source</a>
   </span>
   <a id="chia_dotnet_PoolStateInfo_PoolErrors24h_" data-uid="chia.dotnet.PoolStateInfo.PoolErrors24h*"></a>
   <h4 id="chia_dotnet_PoolStateInfo_PoolErrors24h" data-uid="chia.dotnet.PoolStateInfo.PoolErrors24h">PoolErrors24h</h4>
@@ -807,21 +555,7 @@ <h4 id="chia_dotnet_PoolStateInfo_PoolErrors24h" data-uid="chia.dotnet.PoolState
   <div class="markdown level1 conceptual"></div>
   <h5 class="decalaration">Declaration</h5>
   <div class="codewrapper">
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <pre><code class="lang-csharp hljs">public IEnumerable&lt;ErrorResponse&gt; PoolErrors24h { get; set; }</code></pre>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <pre><code class="lang-csharp hljs">public ICollection&lt;ErrorResponse&gt; PoolErrors24h { get; set; }</code></pre>
-=======
-    <pre><code class="lang-csharp hljs">public IEnumerable&lt;ErrorResponse&gt; PoolErrors24h { get; set; }</code></pre>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </div>
   <h5 class="propertyValue">Property Value</h5>
   <table class="table table-bordered table-striped table-condensed">
@@ -850,24 +584,10 @@ <h3 id="implements">Implements</h3>
               <div class="contribution">
                 <ul class="nav">
                   <li>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-                    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PoolStateInfo.md&amp;value=---%0Auid%3A%20chia.dotnet.PoolStateInfo%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-                    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_PoolStateInfo.md&amp;value=---%0Auid%3A%20chia.dotnet.PoolStateInfo%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-=======
                     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PoolStateInfo.md&amp;value=---%0Auid%3A%20chia.dotnet.PoolStateInfo%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
                   </li>
                   <li>
-                    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/PoolStateInfo.cs/#L12" class="contribution-link">View Source</a>
+                    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/PoolStateInfo.cs/#L12" class="contribution-link">View Source</a>
                   </li>
                 </ul>
               </div>
diff --git a/docs/api/chia.dotnet.PoolTarget.html b/docs/api/chia.dotnet.PoolTarget.html
index 6c3519a1..d3a770cd 100644
--- a/docs/api/chia.dotnet.PoolTarget.html
+++ b/docs/api/chia.dotnet.PoolTarget.html
@@ -90,21 +90,7 @@ <h5>Inherited Members</h5>
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object)">Object.Equals(Object)</a>
     </div>
     <div>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object-system-object)">Object.Equals(Object, Object)</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-      <span class="xref">System.Object.Equals(System.Object, System.Object)</span>
-=======
-      <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object-system-object)">Object.Equals(Object, Object)</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
     </div>
     <div>
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.gethashcode#system-object-gethashcode">Object.GetHashCode()</a>
@@ -132,24 +118,10 @@ <h3 id="properties">Properties
   </h3>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PoolTarget_MaxHeight.md&amp;value=---%0Auid%3A%20chia.dotnet.PoolTarget.MaxHeight%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_PoolTarget_MaxHeight.md&amp;value=---%0Auid%3A%20chia.dotnet.PoolTarget.MaxHeight%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PoolTarget_MaxHeight.md&amp;value=---%0Auid%3A%20chia.dotnet.PoolTarget.MaxHeight%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/PoolTarget.cs/#L9">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/PoolTarget.cs/#L9">View Source</a>
   </span>
   <a id="chia_dotnet_PoolTarget_MaxHeight_" data-uid="chia.dotnet.PoolTarget.MaxHeight*"></a>
   <h4 id="chia_dotnet_PoolTarget_MaxHeight" data-uid="chia.dotnet.PoolTarget.MaxHeight">MaxHeight</h4>
@@ -177,24 +149,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PoolTarget_PuzzleHash.md&amp;value=---%0Auid%3A%20chia.dotnet.PoolTarget.PuzzleHash%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_PoolTarget_PuzzleHash.md&amp;value=---%0Auid%3A%20chia.dotnet.PoolTarget.PuzzleHash%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PoolTarget_PuzzleHash.md&amp;value=---%0Auid%3A%20chia.dotnet.PoolTarget.PuzzleHash%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/PoolTarget.cs/#L5">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/PoolTarget.cs/#L5">View Source</a>
   </span>
   <a id="chia_dotnet_PoolTarget_PuzzleHash_" data-uid="chia.dotnet.PoolTarget.PuzzleHash*"></a>
   <h4 id="chia_dotnet_PoolTarget_PuzzleHash" data-uid="chia.dotnet.PoolTarget.PuzzleHash">PuzzleHash</h4>
@@ -231,24 +189,10 @@ <h3 id="implements">Implements</h3>
               <div class="contribution">
                 <ul class="nav">
                   <li>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-                    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PoolTarget.md&amp;value=---%0Auid%3A%20chia.dotnet.PoolTarget%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-                    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_PoolTarget.md&amp;value=---%0Auid%3A%20chia.dotnet.PoolTarget%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-=======
                     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PoolTarget.md&amp;value=---%0Auid%3A%20chia.dotnet.PoolTarget%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
                   </li>
                   <li>
-                    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/PoolTarget.cs/#L3" class="contribution-link">View Source</a>
+                    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/PoolTarget.cs/#L3" class="contribution-link">View Source</a>
                   </li>
                 </ul>
               </div>
diff --git a/docs/api/chia.dotnet.PoolWallet.html b/docs/api/chia.dotnet.PoolWallet.html
index 752cb300..fe3b9ff4 100644
--- a/docs/api/chia.dotnet.PoolWallet.html
+++ b/docs/api/chia.dotnet.PoolWallet.html
@@ -158,24 +158,10 @@ <h3 id="constructors">Constructors
   </h3>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PoolWallet__ctor_System_UInt32_chia_dotnet_WalletProxy_.md&amp;value=---%0Auid%3A%20chia.dotnet.PoolWallet.%23ctor(System.UInt32%2Cchia.dotnet.WalletProxy)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_PoolWallet__ctor_System_UInt32_chia_dotnet_WalletProxy_.md&amp;value=---%0Auid%3A%20chia.dotnet.PoolWallet.%23ctor(System.UInt32%2Cchia.dotnet.WalletProxy)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PoolWallet__ctor_System_UInt32_chia_dotnet_WalletProxy_.md&amp;value=---%0Auid%3A%20chia.dotnet.PoolWallet.%23ctor(System.UInt32%2Cchia.dotnet.WalletProxy)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/PoolWallet.cs/#L18">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/PoolWallet.cs/#L18">View Source</a>
   </span>
   <a id="chia_dotnet_PoolWallet__ctor_" data-uid="chia.dotnet.PoolWallet.#ctor*"></a>
   <h4 id="chia_dotnet_PoolWallet__ctor_System_UInt32_chia_dotnet_WalletProxy_" data-uid="chia.dotnet.PoolWallet.#ctor(System.UInt32,chia.dotnet.WalletProxy)">PoolWallet(UInt32, WalletProxy)</h4>
@@ -214,28 +200,10 @@ <h3 id="methods">Methods
   </h3>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PoolWallet_AbsorbRewards_System_UInt64_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.PoolWallet.AbsorbRewards(System.UInt64%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_PoolWallet_AbsorbRewards_System_UInt64_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.PoolWallet.AbsorbRewards(System.UInt64%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PoolWallet_AbsorbRewards_System_UInt64_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.PoolWallet.AbsorbRewards(System.UInt64%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-<<<<<<< HEAD
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/PoolWallet.cs/#L78">View Source</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/PoolWallet.cs/#L79">View Source</a>
->>>>>>> main
   </span>
   <a id="chia_dotnet_PoolWallet_AbsorbRewards_" data-uid="chia.dotnet.PoolWallet.AbsorbRewards*"></a>
   <h4 id="chia_dotnet_PoolWallet_AbsorbRewards_System_UInt64_System_Threading_CancellationToken_" data-uid="chia.dotnet.PoolWallet.AbsorbRewards(System.UInt64,System.Threading.CancellationToken)">AbsorbRewards(UInt64, CancellationToken)</h4>
@@ -288,28 +256,10 @@ <h5 class="returns">Returns</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PoolWallet_JoinPool_System_String_System_String_System_UInt32_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.PoolWallet.JoinPool(System.String%2CSystem.String%2CSystem.UInt32%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_PoolWallet_JoinPool_System_String_System_String_System_UInt32_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.PoolWallet.JoinPool(System.String%2CSystem.String%2CSystem.UInt32%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PoolWallet_JoinPool_System_String_System_String_System_UInt32_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.PoolWallet.JoinPool(System.String%2CSystem.String%2CSystem.UInt32%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-<<<<<<< HEAD
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/PoolWallet.cs/#L40">View Source</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/PoolWallet.cs/#L41">View Source</a>
->>>>>>> main
   </span>
   <a id="chia_dotnet_PoolWallet_JoinPool_" data-uid="chia.dotnet.PoolWallet.JoinPool*"></a>
   <h4 id="chia_dotnet_PoolWallet_JoinPool_System_String_System_String_System_UInt32_System_Threading_CancellationToken_" data-uid="chia.dotnet.PoolWallet.JoinPool(System.String,System.String,System.UInt32,System.Threading.CancellationToken)">JoinPool(String, String, UInt32, CancellationToken)</h4>
@@ -377,28 +327,10 @@ <h5 id="chia_dotnet_PoolWallet_JoinPool_System_String_System_String_System_UInt3
 </div>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PoolWallet_SelfPool_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.PoolWallet.SelfPool(System.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_PoolWallet_SelfPool_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.PoolWallet.SelfPool(System.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PoolWallet_SelfPool_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.PoolWallet.SelfPool(System.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-<<<<<<< HEAD
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/PoolWallet.cs/#L67">View Source</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/PoolWallet.cs/#L68">View Source</a>
->>>>>>> main
   </span>
   <a id="chia_dotnet_PoolWallet_SelfPool_" data-uid="chia.dotnet.PoolWallet.SelfPool*"></a>
   <h4 id="chia_dotnet_PoolWallet_SelfPool_System_Threading_CancellationToken_" data-uid="chia.dotnet.PoolWallet.SelfPool(System.Threading.CancellationToken)">SelfPool(CancellationToken)</h4>
@@ -447,28 +379,10 @@ <h5 class="returns">Returns</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PoolWallet_Status_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.PoolWallet.Status(System.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_PoolWallet_Status_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.PoolWallet.Status(System.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PoolWallet_Status_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.PoolWallet.Status(System.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-<<<<<<< HEAD
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/PoolWallet.cs/#L96">View Source</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/PoolWallet.cs/#L97">View Source</a>
->>>>>>> main
   </span>
   <a id="chia_dotnet_PoolWallet_Status_" data-uid="chia.dotnet.PoolWallet.Status*"></a>
   <h4 id="chia_dotnet_PoolWallet_Status_System_Threading_CancellationToken_" data-uid="chia.dotnet.PoolWallet.Status(System.Threading.CancellationToken)">Status(CancellationToken)</h4>
@@ -515,24 +429,10 @@ <h5 class="returns">Returns</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PoolWallet_Validate_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.PoolWallet.Validate(System.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_PoolWallet_Validate_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.PoolWallet.Validate(System.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PoolWallet_Validate_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.PoolWallet.Validate(System.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/PoolWallet.cs/#L27">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/PoolWallet.cs/#L27">View Source</a>
   </span>
   <a id="chia_dotnet_PoolWallet_Validate_" data-uid="chia.dotnet.PoolWallet.Validate*"></a>
   <h4 id="chia_dotnet_PoolWallet_Validate_System_Threading_CancellationToken_" data-uid="chia.dotnet.PoolWallet.Validate(System.Threading.CancellationToken)">Validate(CancellationToken)</h4>
@@ -586,24 +486,10 @@ <h5 class="overrides">Overrides</h5>
               <div class="contribution">
                 <ul class="nav">
                   <li>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-                    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PoolWallet.md&amp;value=---%0Auid%3A%20chia.dotnet.PoolWallet%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-                    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_PoolWallet.md&amp;value=---%0Auid%3A%20chia.dotnet.PoolWallet%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-=======
                     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PoolWallet.md&amp;value=---%0Auid%3A%20chia.dotnet.PoolWallet%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
                   </li>
                   <li>
-                    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/PoolWallet.cs/#L11" class="contribution-link">View Source</a>
+                    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/PoolWallet.cs/#L11" class="contribution-link">View Source</a>
                   </li>
                 </ul>
               </div>
diff --git a/docs/api/chia.dotnet.PoolWalletConfig.html b/docs/api/chia.dotnet.PoolWalletConfig.html
index 3802f300..f0e983a5 100644
--- a/docs/api/chia.dotnet.PoolWalletConfig.html
+++ b/docs/api/chia.dotnet.PoolWalletConfig.html
@@ -91,21 +91,7 @@ <h5>Inherited Members</h5>
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object)">Object.Equals(Object)</a>
     </div>
     <div>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object-system-object)">Object.Equals(Object, Object)</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-      <span class="xref">System.Object.Equals(System.Object, System.Object)</span>
-=======
-      <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object-system-object)">Object.Equals(Object, Object)</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
     </div>
     <div>
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.gethashcode#system-object-gethashcode">Object.GetHashCode()</a>
@@ -133,24 +119,10 @@ <h3 id="properties">Properties
   </h3>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PoolWalletConfig_AuthenticationPublicKey.md&amp;value=---%0Auid%3A%20chia.dotnet.PoolWalletConfig.AuthenticationPublicKey%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_PoolWalletConfig_AuthenticationPublicKey.md&amp;value=---%0Auid%3A%20chia.dotnet.PoolWalletConfig.AuthenticationPublicKey%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PoolWalletConfig_AuthenticationPublicKey.md&amp;value=---%0Auid%3A%20chia.dotnet.PoolWalletConfig.AuthenticationPublicKey%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/PoolWalletConfig.cs/#L14">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/PoolWalletConfig.cs/#L14">View Source</a>
   </span>
   <a id="chia_dotnet_PoolWalletConfig_AuthenticationPublicKey_" data-uid="chia.dotnet.PoolWalletConfig.AuthenticationPublicKey*"></a>
   <h4 id="chia_dotnet_PoolWalletConfig_AuthenticationPublicKey" data-uid="chia.dotnet.PoolWalletConfig.AuthenticationPublicKey">AuthenticationPublicKey</h4>
@@ -177,24 +149,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PoolWalletConfig_LauncherId.md&amp;value=---%0Auid%3A%20chia.dotnet.PoolWalletConfig.LauncherId%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_PoolWalletConfig_LauncherId.md&amp;value=---%0Auid%3A%20chia.dotnet.PoolWalletConfig.LauncherId%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PoolWalletConfig_LauncherId.md&amp;value=---%0Auid%3A%20chia.dotnet.PoolWalletConfig.LauncherId%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/PoolWalletConfig.cs/#L8">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/PoolWalletConfig.cs/#L8">View Source</a>
   </span>
   <a id="chia_dotnet_PoolWalletConfig_LauncherId_" data-uid="chia.dotnet.PoolWalletConfig.LauncherId*"></a>
   <h4 id="chia_dotnet_PoolWalletConfig_LauncherId" data-uid="chia.dotnet.PoolWalletConfig.LauncherId">LauncherId</h4>
@@ -221,24 +179,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PoolWalletConfig_OwnerPublicKey.md&amp;value=---%0Auid%3A%20chia.dotnet.PoolWalletConfig.OwnerPublicKey%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_PoolWalletConfig_OwnerPublicKey.md&amp;value=---%0Auid%3A%20chia.dotnet.PoolWalletConfig.OwnerPublicKey%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PoolWalletConfig_OwnerPublicKey.md&amp;value=---%0Auid%3A%20chia.dotnet.PoolWalletConfig.OwnerPublicKey%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/PoolWalletConfig.cs/#L13">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/PoolWalletConfig.cs/#L13">View Source</a>
   </span>
   <a id="chia_dotnet_PoolWalletConfig_OwnerPublicKey_" data-uid="chia.dotnet.PoolWalletConfig.OwnerPublicKey*"></a>
   <h4 id="chia_dotnet_PoolWalletConfig_OwnerPublicKey" data-uid="chia.dotnet.PoolWalletConfig.OwnerPublicKey">OwnerPublicKey</h4>
@@ -265,24 +209,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PoolWalletConfig_P2SingletonPuzzleHash.md&amp;value=---%0Auid%3A%20chia.dotnet.PoolWalletConfig.P2SingletonPuzzleHash%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_PoolWalletConfig_P2SingletonPuzzleHash.md&amp;value=---%0Auid%3A%20chia.dotnet.PoolWalletConfig.P2SingletonPuzzleHash%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PoolWalletConfig_P2SingletonPuzzleHash.md&amp;value=---%0Auid%3A%20chia.dotnet.PoolWalletConfig.P2SingletonPuzzleHash%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/PoolWalletConfig.cs/#L12">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/PoolWalletConfig.cs/#L12">View Source</a>
   </span>
   <a id="chia_dotnet_PoolWalletConfig_P2SingletonPuzzleHash_" data-uid="chia.dotnet.PoolWalletConfig.P2SingletonPuzzleHash*"></a>
   <h4 id="chia_dotnet_PoolWalletConfig_P2SingletonPuzzleHash" data-uid="chia.dotnet.PoolWalletConfig.P2SingletonPuzzleHash">P2SingletonPuzzleHash</h4>
@@ -309,24 +239,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PoolWalletConfig_PayoutInstructions.md&amp;value=---%0Auid%3A%20chia.dotnet.PoolWalletConfig.PayoutInstructions%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_PoolWalletConfig_PayoutInstructions.md&amp;value=---%0Auid%3A%20chia.dotnet.PoolWalletConfig.PayoutInstructions%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PoolWalletConfig_PayoutInstructions.md&amp;value=---%0Auid%3A%20chia.dotnet.PoolWalletConfig.PayoutInstructions%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/PoolWalletConfig.cs/#L10">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/PoolWalletConfig.cs/#L10">View Source</a>
   </span>
   <a id="chia_dotnet_PoolWalletConfig_PayoutInstructions_" data-uid="chia.dotnet.PoolWalletConfig.PayoutInstructions*"></a>
   <h4 id="chia_dotnet_PoolWalletConfig_PayoutInstructions" data-uid="chia.dotnet.PoolWalletConfig.PayoutInstructions">PayoutInstructions</h4>
@@ -353,24 +269,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PoolWalletConfig_PoolUrl.md&amp;value=---%0Auid%3A%20chia.dotnet.PoolWalletConfig.PoolUrl%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_PoolWalletConfig_PoolUrl.md&amp;value=---%0Auid%3A%20chia.dotnet.PoolWalletConfig.PoolUrl%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PoolWalletConfig_PoolUrl.md&amp;value=---%0Auid%3A%20chia.dotnet.PoolWalletConfig.PoolUrl%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/PoolWalletConfig.cs/#L9">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/PoolWalletConfig.cs/#L9">View Source</a>
   </span>
   <a id="chia_dotnet_PoolWalletConfig_PoolUrl_" data-uid="chia.dotnet.PoolWalletConfig.PoolUrl*"></a>
   <h4 id="chia_dotnet_PoolWalletConfig_PoolUrl" data-uid="chia.dotnet.PoolWalletConfig.PoolUrl">PoolUrl</h4>
@@ -397,24 +299,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PoolWalletConfig_TargetPuzzleHash.md&amp;value=---%0Auid%3A%20chia.dotnet.PoolWalletConfig.TargetPuzzleHash%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_PoolWalletConfig_TargetPuzzleHash.md&amp;value=---%0Auid%3A%20chia.dotnet.PoolWalletConfig.TargetPuzzleHash%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PoolWalletConfig_TargetPuzzleHash.md&amp;value=---%0Auid%3A%20chia.dotnet.PoolWalletConfig.TargetPuzzleHash%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/PoolWalletConfig.cs/#L11">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/PoolWalletConfig.cs/#L11">View Source</a>
   </span>
   <a id="chia_dotnet_PoolWalletConfig_TargetPuzzleHash_" data-uid="chia.dotnet.PoolWalletConfig.TargetPuzzleHash*"></a>
   <h4 id="chia_dotnet_PoolWalletConfig_TargetPuzzleHash" data-uid="chia.dotnet.PoolWalletConfig.TargetPuzzleHash">TargetPuzzleHash</h4>
@@ -451,24 +339,10 @@ <h3 id="implements">Implements</h3>
               <div class="contribution">
                 <ul class="nav">
                   <li>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-                    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PoolWalletConfig.md&amp;value=---%0Auid%3A%20chia.dotnet.PoolWalletConfig%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-                    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_PoolWalletConfig.md&amp;value=---%0Auid%3A%20chia.dotnet.PoolWalletConfig%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-=======
                     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PoolWalletConfig.md&amp;value=---%0Auid%3A%20chia.dotnet.PoolWalletConfig%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
                   </li>
                   <li>
-                    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/PoolWalletConfig.cs/#L6" class="contribution-link">View Source</a>
+                    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/PoolWalletConfig.cs/#L6" class="contribution-link">View Source</a>
                   </li>
                 </ul>
               </div>
diff --git a/docs/api/chia.dotnet.PoolWalletInfo.html b/docs/api/chia.dotnet.PoolWalletInfo.html
index ee3c2f12..df15fa64 100644
--- a/docs/api/chia.dotnet.PoolWalletInfo.html
+++ b/docs/api/chia.dotnet.PoolWalletInfo.html
@@ -92,21 +92,7 @@ <h5>Inherited Members</h5>
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object)">Object.Equals(Object)</a>
     </div>
     <div>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object-system-object)">Object.Equals(Object, Object)</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-      <span class="xref">System.Object.Equals(System.Object, System.Object)</span>
-=======
-      <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object-system-object)">Object.Equals(Object, Object)</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
     </div>
     <div>
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.gethashcode#system-object-gethashcode">Object.GetHashCode()</a>
@@ -134,24 +120,10 @@ <h3 id="properties">Properties
   </h3>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PoolWalletInfo_Current.md&amp;value=---%0Auid%3A%20chia.dotnet.PoolWalletInfo.Current%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_PoolWalletInfo_Current.md&amp;value=---%0Auid%3A%20chia.dotnet.PoolWalletInfo.Current%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PoolWalletInfo_Current.md&amp;value=---%0Auid%3A%20chia.dotnet.PoolWalletInfo.Current%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/PoolWalletInfo.cs/#L9">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/PoolWalletInfo.cs/#L9">View Source</a>
   </span>
   <a id="chia_dotnet_PoolWalletInfo_Current_" data-uid="chia.dotnet.PoolWalletInfo.Current*"></a>
   <h4 id="chia_dotnet_PoolWalletInfo_Current" data-uid="chia.dotnet.PoolWalletInfo.Current">Current</h4>
@@ -178,24 +150,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PoolWalletInfo_CurrentInner.md&amp;value=---%0Auid%3A%20chia.dotnet.PoolWalletInfo.CurrentInner%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_PoolWalletInfo_CurrentInner.md&amp;value=---%0Auid%3A%20chia.dotnet.PoolWalletInfo.CurrentInner%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PoolWalletInfo_CurrentInner.md&amp;value=---%0Auid%3A%20chia.dotnet.PoolWalletInfo.CurrentInner%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/PoolWalletInfo.cs/#L17">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/PoolWalletInfo.cs/#L17">View Source</a>
   </span>
   <a id="chia_dotnet_PoolWalletInfo_CurrentInner_" data-uid="chia.dotnet.PoolWalletInfo.CurrentInner*"></a>
   <h4 id="chia_dotnet_PoolWalletInfo_CurrentInner" data-uid="chia.dotnet.PoolWalletInfo.CurrentInner">CurrentInner</h4>
@@ -223,24 +181,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PoolWalletInfo_LauncherCoin.md&amp;value=---%0Auid%3A%20chia.dotnet.PoolWalletInfo.LauncherCoin%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_PoolWalletInfo_LauncherCoin.md&amp;value=---%0Auid%3A%20chia.dotnet.PoolWalletInfo.LauncherCoin%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PoolWalletInfo_LauncherCoin.md&amp;value=---%0Auid%3A%20chia.dotnet.PoolWalletInfo.LauncherCoin%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/PoolWalletInfo.cs/#L11">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/PoolWalletInfo.cs/#L11">View Source</a>
   </span>
   <a id="chia_dotnet_PoolWalletInfo_LauncherCoin_" data-uid="chia.dotnet.PoolWalletInfo.LauncherCoin*"></a>
   <h4 id="chia_dotnet_PoolWalletInfo_LauncherCoin" data-uid="chia.dotnet.PoolWalletInfo.LauncherCoin">LauncherCoin</h4>
@@ -267,24 +211,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PoolWalletInfo_LauncherId.md&amp;value=---%0Auid%3A%20chia.dotnet.PoolWalletInfo.LauncherId%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_PoolWalletInfo_LauncherId.md&amp;value=---%0Auid%3A%20chia.dotnet.PoolWalletInfo.LauncherId%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PoolWalletInfo_LauncherId.md&amp;value=---%0Auid%3A%20chia.dotnet.PoolWalletInfo.LauncherId%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/PoolWalletInfo.cs/#L12">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/PoolWalletInfo.cs/#L12">View Source</a>
   </span>
   <a id="chia_dotnet_PoolWalletInfo_LauncherId_" data-uid="chia.dotnet.PoolWalletInfo.LauncherId*"></a>
   <h4 id="chia_dotnet_PoolWalletInfo_LauncherId" data-uid="chia.dotnet.PoolWalletInfo.LauncherId">LauncherId</h4>
@@ -311,24 +241,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PoolWalletInfo_P2SingletonPuzzleHash.md&amp;value=---%0Auid%3A%20chia.dotnet.PoolWalletInfo.P2SingletonPuzzleHash%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_PoolWalletInfo_P2SingletonPuzzleHash.md&amp;value=---%0Auid%3A%20chia.dotnet.PoolWalletInfo.P2SingletonPuzzleHash%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PoolWalletInfo_P2SingletonPuzzleHash.md&amp;value=---%0Auid%3A%20chia.dotnet.PoolWalletInfo.P2SingletonPuzzleHash%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/PoolWalletInfo.cs/#L13">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/PoolWalletInfo.cs/#L13">View Source</a>
   </span>
   <a id="chia_dotnet_PoolWalletInfo_P2SingletonPuzzleHash_" data-uid="chia.dotnet.PoolWalletInfo.P2SingletonPuzzleHash*"></a>
   <h4 id="chia_dotnet_PoolWalletInfo_P2SingletonPuzzleHash" data-uid="chia.dotnet.PoolWalletInfo.P2SingletonPuzzleHash">P2SingletonPuzzleHash</h4>
@@ -355,24 +271,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PoolWalletInfo_SingletonBlockHeight.md&amp;value=---%0Auid%3A%20chia.dotnet.PoolWalletInfo.SingletonBlockHeight%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_PoolWalletInfo_SingletonBlockHeight.md&amp;value=---%0Auid%3A%20chia.dotnet.PoolWalletInfo.SingletonBlockHeight%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PoolWalletInfo_SingletonBlockHeight.md&amp;value=---%0Auid%3A%20chia.dotnet.PoolWalletInfo.SingletonBlockHeight%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/PoolWalletInfo.cs/#L22">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/PoolWalletInfo.cs/#L22">View Source</a>
   </span>
   <a id="chia_dotnet_PoolWalletInfo_SingletonBlockHeight_" data-uid="chia.dotnet.PoolWalletInfo.SingletonBlockHeight*"></a>
   <h4 id="chia_dotnet_PoolWalletInfo_SingletonBlockHeight" data-uid="chia.dotnet.PoolWalletInfo.SingletonBlockHeight">SingletonBlockHeight</h4>
@@ -400,24 +302,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PoolWalletInfo_Target.md&amp;value=---%0Auid%3A%20chia.dotnet.PoolWalletInfo.Target%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_PoolWalletInfo_Target.md&amp;value=---%0Auid%3A%20chia.dotnet.PoolWalletInfo.Target%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PoolWalletInfo_Target.md&amp;value=---%0Auid%3A%20chia.dotnet.PoolWalletInfo.Target%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/PoolWalletInfo.cs/#L10">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/PoolWalletInfo.cs/#L10">View Source</a>
   </span>
   <a id="chia_dotnet_PoolWalletInfo_Target_" data-uid="chia.dotnet.PoolWalletInfo.Target*"></a>
   <h4 id="chia_dotnet_PoolWalletInfo_Target" data-uid="chia.dotnet.PoolWalletInfo.Target">Target</h4>
@@ -444,24 +332,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PoolWalletInfo_TipSingletonCoinId.md&amp;value=---%0Auid%3A%20chia.dotnet.PoolWalletInfo.TipSingletonCoinId%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_PoolWalletInfo_TipSingletonCoinId.md&amp;value=---%0Auid%3A%20chia.dotnet.PoolWalletInfo.TipSingletonCoinId%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PoolWalletInfo_TipSingletonCoinId.md&amp;value=---%0Auid%3A%20chia.dotnet.PoolWalletInfo.TipSingletonCoinId%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/PoolWalletInfo.cs/#L18">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/PoolWalletInfo.cs/#L18">View Source</a>
   </span>
   <a id="chia_dotnet_PoolWalletInfo_TipSingletonCoinId_" data-uid="chia.dotnet.PoolWalletInfo.TipSingletonCoinId*"></a>
   <h4 id="chia_dotnet_PoolWalletInfo_TipSingletonCoinId" data-uid="chia.dotnet.PoolWalletInfo.TipSingletonCoinId">TipSingletonCoinId</h4>
@@ -498,24 +372,10 @@ <h3 id="implements">Implements</h3>
               <div class="contribution">
                 <ul class="nav">
                   <li>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-                    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PoolWalletInfo.md&amp;value=---%0Auid%3A%20chia.dotnet.PoolWalletInfo%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-                    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_PoolWalletInfo.md&amp;value=---%0Auid%3A%20chia.dotnet.PoolWalletInfo%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-=======
                     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PoolWalletInfo.md&amp;value=---%0Auid%3A%20chia.dotnet.PoolWalletInfo%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
                   </li>
                   <li>
-                    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/PoolWalletInfo.cs/#L7" class="contribution-link">View Source</a>
+                    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/PoolWalletInfo.cs/#L7" class="contribution-link">View Source</a>
                   </li>
                 </ul>
               </div>
diff --git a/docs/api/chia.dotnet.PrivateKey.html b/docs/api/chia.dotnet.PrivateKey.html
index f544eba4..b0cbe120 100644
--- a/docs/api/chia.dotnet.PrivateKey.html
+++ b/docs/api/chia.dotnet.PrivateKey.html
@@ -90,21 +90,7 @@ <h5>Inherited Members</h5>
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object)">Object.Equals(Object)</a>
     </div>
     <div>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object-system-object)">Object.Equals(Object, Object)</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-      <span class="xref">System.Object.Equals(System.Object, System.Object)</span>
-=======
-      <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object-system-object)">Object.Equals(Object, Object)</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
     </div>
     <div>
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.gethashcode#system-object-gethashcode">Object.GetHashCode()</a>
@@ -132,24 +118,10 @@ <h3 id="properties">Properties
   </h3>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PrivateKey_FarmerPk.md&amp;value=---%0Auid%3A%20chia.dotnet.PrivateKey.FarmerPk%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_PrivateKey_FarmerPk.md&amp;value=---%0Auid%3A%20chia.dotnet.PrivateKey.FarmerPk%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PrivateKey_FarmerPk.md&amp;value=---%0Auid%3A%20chia.dotnet.PrivateKey.FarmerPk%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/PrivateKey.cs/#L8">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/PrivateKey.cs/#L8">View Source</a>
   </span>
   <a id="chia_dotnet_PrivateKey_FarmerPk_" data-uid="chia.dotnet.PrivateKey.FarmerPk*"></a>
   <h4 id="chia_dotnet_PrivateKey_FarmerPk" data-uid="chia.dotnet.PrivateKey.FarmerPk">FarmerPk</h4>
@@ -176,24 +148,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PrivateKey_Fingerprint.md&amp;value=---%0Auid%3A%20chia.dotnet.PrivateKey.Fingerprint%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_PrivateKey_Fingerprint.md&amp;value=---%0Auid%3A%20chia.dotnet.PrivateKey.Fingerprint%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PrivateKey_Fingerprint.md&amp;value=---%0Auid%3A%20chia.dotnet.PrivateKey.Fingerprint%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/PrivateKey.cs/#L5">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/PrivateKey.cs/#L5">View Source</a>
   </span>
   <a id="chia_dotnet_PrivateKey_Fingerprint_" data-uid="chia.dotnet.PrivateKey.Fingerprint*"></a>
   <h4 id="chia_dotnet_PrivateKey_Fingerprint" data-uid="chia.dotnet.PrivateKey.Fingerprint">Fingerprint</h4>
@@ -220,24 +178,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PrivateKey_Pk.md&amp;value=---%0Auid%3A%20chia.dotnet.PrivateKey.Pk%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_PrivateKey_Pk.md&amp;value=---%0Auid%3A%20chia.dotnet.PrivateKey.Pk%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PrivateKey_Pk.md&amp;value=---%0Auid%3A%20chia.dotnet.PrivateKey.Pk%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/PrivateKey.cs/#L7">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/PrivateKey.cs/#L7">View Source</a>
   </span>
   <a id="chia_dotnet_PrivateKey_Pk_" data-uid="chia.dotnet.PrivateKey.Pk*"></a>
   <h4 id="chia_dotnet_PrivateKey_Pk" data-uid="chia.dotnet.PrivateKey.Pk">Pk</h4>
@@ -264,24 +208,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PrivateKey_PoolPk.md&amp;value=---%0Auid%3A%20chia.dotnet.PrivateKey.PoolPk%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_PrivateKey_PoolPk.md&amp;value=---%0Auid%3A%20chia.dotnet.PrivateKey.PoolPk%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PrivateKey_PoolPk.md&amp;value=---%0Auid%3A%20chia.dotnet.PrivateKey.PoolPk%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/PrivateKey.cs/#L9">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/PrivateKey.cs/#L9">View Source</a>
   </span>
   <a id="chia_dotnet_PrivateKey_PoolPk_" data-uid="chia.dotnet.PrivateKey.PoolPk*"></a>
   <h4 id="chia_dotnet_PrivateKey_PoolPk" data-uid="chia.dotnet.PrivateKey.PoolPk">PoolPk</h4>
@@ -308,24 +238,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PrivateKey_Seed.md&amp;value=---%0Auid%3A%20chia.dotnet.PrivateKey.Seed%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_PrivateKey_Seed.md&amp;value=---%0Auid%3A%20chia.dotnet.PrivateKey.Seed%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PrivateKey_Seed.md&amp;value=---%0Auid%3A%20chia.dotnet.PrivateKey.Seed%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/PrivateKey.cs/#L10">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/PrivateKey.cs/#L10">View Source</a>
   </span>
   <a id="chia_dotnet_PrivateKey_Seed_" data-uid="chia.dotnet.PrivateKey.Seed*"></a>
   <h4 id="chia_dotnet_PrivateKey_Seed" data-uid="chia.dotnet.PrivateKey.Seed">Seed</h4>
@@ -352,24 +268,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PrivateKey_Sk.md&amp;value=---%0Auid%3A%20chia.dotnet.PrivateKey.Sk%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_PrivateKey_Sk.md&amp;value=---%0Auid%3A%20chia.dotnet.PrivateKey.Sk%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PrivateKey_Sk.md&amp;value=---%0Auid%3A%20chia.dotnet.PrivateKey.Sk%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/PrivateKey.cs/#L6">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/PrivateKey.cs/#L6">View Source</a>
   </span>
   <a id="chia_dotnet_PrivateKey_Sk_" data-uid="chia.dotnet.PrivateKey.Sk*"></a>
   <h4 id="chia_dotnet_PrivateKey_Sk" data-uid="chia.dotnet.PrivateKey.Sk">Sk</h4>
@@ -406,24 +308,10 @@ <h3 id="implements">Implements</h3>
               <div class="contribution">
                 <ul class="nav">
                   <li>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-                    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PrivateKey.md&amp;value=---%0Auid%3A%20chia.dotnet.PrivateKey%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-                    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_PrivateKey.md&amp;value=---%0Auid%3A%20chia.dotnet.PrivateKey%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-=======
                     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PrivateKey.md&amp;value=---%0Auid%3A%20chia.dotnet.PrivateKey%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
                   </li>
                   <li>
-                    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/PrivateKey.cs/#L3" class="contribution-link">View Source</a>
+                    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/PrivateKey.cs/#L3" class="contribution-link">View Source</a>
                   </li>
                 </ul>
               </div>
diff --git a/docs/api/chia.dotnet.PrivateKeyData.html b/docs/api/chia.dotnet.PrivateKeyData.html
index 7a6cb264..308d3205 100644
--- a/docs/api/chia.dotnet.PrivateKeyData.html
+++ b/docs/api/chia.dotnet.PrivateKeyData.html
@@ -90,21 +90,7 @@ <h5>Inherited Members</h5>
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object)">Object.Equals(Object)</a>
     </div>
     <div>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object-system-object)">Object.Equals(Object, Object)</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-      <span class="xref">System.Object.Equals(System.Object, System.Object)</span>
-=======
-      <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object-system-object)">Object.Equals(Object, Object)</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
     </div>
     <div>
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.gethashcode#system-object-gethashcode">Object.GetHashCode()</a>
@@ -132,24 +118,10 @@ <h3 id="properties">Properties
   </h3>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PrivateKeyData_Entropy.md&amp;value=---%0Auid%3A%20chia.dotnet.PrivateKeyData.Entropy%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_PrivateKeyData_Entropy.md&amp;value=---%0Auid%3A%20chia.dotnet.PrivateKeyData.Entropy%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PrivateKeyData_Entropy.md&amp;value=---%0Auid%3A%20chia.dotnet.PrivateKeyData.Entropy%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/PrivateKeyData.cs/#L7">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/PrivateKeyData.cs/#L7">View Source</a>
   </span>
   <a id="chia_dotnet_PrivateKeyData_Entropy_" data-uid="chia.dotnet.PrivateKeyData.Entropy*"></a>
   <h4 id="chia_dotnet_PrivateKeyData_Entropy" data-uid="chia.dotnet.PrivateKeyData.Entropy">Entropy</h4>
@@ -176,24 +148,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PrivateKeyData_PK.md&amp;value=---%0Auid%3A%20chia.dotnet.PrivateKeyData.PK%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_PrivateKeyData_PK.md&amp;value=---%0Auid%3A%20chia.dotnet.PrivateKeyData.PK%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PrivateKeyData_PK.md&amp;value=---%0Auid%3A%20chia.dotnet.PrivateKeyData.PK%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/PrivateKeyData.cs/#L5">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/PrivateKeyData.cs/#L5">View Source</a>
   </span>
   <a id="chia_dotnet_PrivateKeyData_PK_" data-uid="chia.dotnet.PrivateKeyData.PK*"></a>
   <h4 id="chia_dotnet_PrivateKeyData_PK" data-uid="chia.dotnet.PrivateKeyData.PK">PK</h4>
@@ -230,24 +188,10 @@ <h3 id="implements">Implements</h3>
               <div class="contribution">
                 <ul class="nav">
                   <li>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-                    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PrivateKeyData.md&amp;value=---%0Auid%3A%20chia.dotnet.PrivateKeyData%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-                    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_PrivateKeyData.md&amp;value=---%0Auid%3A%20chia.dotnet.PrivateKeyData%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-=======
                     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PrivateKeyData.md&amp;value=---%0Auid%3A%20chia.dotnet.PrivateKeyData%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
                   </li>
                   <li>
-                    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/PrivateKeyData.cs/#L3" class="contribution-link">View Source</a>
+                    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/PrivateKeyData.cs/#L3" class="contribution-link">View Source</a>
                   </li>
                 </ul>
               </div>
diff --git a/docs/api/chia.dotnet.Proof.html b/docs/api/chia.dotnet.Proof.html
index d773c0c6..3e9d5f56 100644
--- a/docs/api/chia.dotnet.Proof.html
+++ b/docs/api/chia.dotnet.Proof.html
@@ -90,21 +90,7 @@ <h5>Inherited Members</h5>
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object)">Object.Equals(Object)</a>
     </div>
     <div>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object-system-object)">Object.Equals(Object, Object)</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-      <span class="xref">System.Object.Equals(System.Object, System.Object)</span>
-=======
-      <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object-system-object)">Object.Equals(Object, Object)</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
     </div>
     <div>
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.gethashcode#system-object-gethashcode">Object.GetHashCode()</a>
@@ -132,24 +118,10 @@ <h3 id="properties">Properties
   </h3>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_Proof_Key.md&amp;value=---%0Auid%3A%20chia.dotnet.Proof.Key%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_Proof_Key.md&amp;value=---%0Auid%3A%20chia.dotnet.Proof.Key%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_Proof_Key.md&amp;value=---%0Auid%3A%20chia.dotnet.Proof.Key%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/Proof.cs/#L7">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/Proof.cs/#L7">View Source</a>
   </span>
   <a id="chia_dotnet_Proof_Key_" data-uid="chia.dotnet.Proof.Key*"></a>
   <h4 id="chia_dotnet_Proof_Key" data-uid="chia.dotnet.Proof.Key">Key</h4>
@@ -176,24 +148,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_Proof_Layers.md&amp;value=---%0Auid%3A%20chia.dotnet.Proof.Layers%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_Proof_Layers.md&amp;value=---%0Auid%3A%20chia.dotnet.Proof.Layers%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_Proof_Layers.md&amp;value=---%0Auid%3A%20chia.dotnet.Proof.Layers%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/Proof.cs/#L10">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/Proof.cs/#L10">View Source</a>
   </span>
   <a id="chia_dotnet_Proof_Layers_" data-uid="chia.dotnet.Proof.Layers*"></a>
   <h4 id="chia_dotnet_Proof_Layers" data-uid="chia.dotnet.Proof.Layers">Layers</h4>
@@ -220,24 +178,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_Proof_NodeHash.md&amp;value=---%0Auid%3A%20chia.dotnet.Proof.NodeHash%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_Proof_NodeHash.md&amp;value=---%0Auid%3A%20chia.dotnet.Proof.NodeHash%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_Proof_NodeHash.md&amp;value=---%0Auid%3A%20chia.dotnet.Proof.NodeHash%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/Proof.cs/#L9">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/Proof.cs/#L9">View Source</a>
   </span>
   <a id="chia_dotnet_Proof_NodeHash_" data-uid="chia.dotnet.Proof.NodeHash*"></a>
   <h4 id="chia_dotnet_Proof_NodeHash" data-uid="chia.dotnet.Proof.NodeHash">NodeHash</h4>
@@ -264,24 +208,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_Proof_Value.md&amp;value=---%0Auid%3A%20chia.dotnet.Proof.Value%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_Proof_Value.md&amp;value=---%0Auid%3A%20chia.dotnet.Proof.Value%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_Proof_Value.md&amp;value=---%0Auid%3A%20chia.dotnet.Proof.Value%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/Proof.cs/#L8">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/Proof.cs/#L8">View Source</a>
   </span>
   <a id="chia_dotnet_Proof_Value_" data-uid="chia.dotnet.Proof.Value*"></a>
   <h4 id="chia_dotnet_Proof_Value" data-uid="chia.dotnet.Proof.Value">Value</h4>
@@ -318,24 +248,10 @@ <h3 id="implements">Implements</h3>
               <div class="contribution">
                 <ul class="nav">
                   <li>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-                    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_Proof.md&amp;value=---%0Auid%3A%20chia.dotnet.Proof%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-                    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_Proof.md&amp;value=---%0Auid%3A%20chia.dotnet.Proof%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-=======
                     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_Proof.md&amp;value=---%0Auid%3A%20chia.dotnet.Proof%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
                   </li>
                   <li>
-                    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/Proof.cs/#L5" class="contribution-link">View Source</a>
+                    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/Proof.cs/#L5" class="contribution-link">View Source</a>
                   </li>
                 </ul>
               </div>
diff --git a/docs/api/chia.dotnet.ProofOfSpace.html b/docs/api/chia.dotnet.ProofOfSpace.html
index 8b15e520..fa4aa79a 100644
--- a/docs/api/chia.dotnet.ProofOfSpace.html
+++ b/docs/api/chia.dotnet.ProofOfSpace.html
@@ -90,21 +90,7 @@ <h5>Inherited Members</h5>
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object)">Object.Equals(Object)</a>
     </div>
     <div>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object-system-object)">Object.Equals(Object, Object)</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-      <span class="xref">System.Object.Equals(System.Object, System.Object)</span>
-=======
-      <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object-system-object)">Object.Equals(Object, Object)</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
     </div>
     <div>
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.gethashcode#system-object-gethashcode">Object.GetHashCode()</a>
@@ -132,24 +118,10 @@ <h3 id="properties">Properties
   </h3>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_ProofOfSpace_Challenge.md&amp;value=---%0Auid%3A%20chia.dotnet.ProofOfSpace.Challenge%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_ProofOfSpace_Challenge.md&amp;value=---%0Auid%3A%20chia.dotnet.ProofOfSpace.Challenge%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_ProofOfSpace_Challenge.md&amp;value=---%0Auid%3A%20chia.dotnet.ProofOfSpace.Challenge%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/ProofOfSpace.cs/#L5">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/ProofOfSpace.cs/#L5">View Source</a>
   </span>
   <a id="chia_dotnet_ProofOfSpace_Challenge_" data-uid="chia.dotnet.ProofOfSpace.Challenge*"></a>
   <h4 id="chia_dotnet_ProofOfSpace_Challenge" data-uid="chia.dotnet.ProofOfSpace.Challenge">Challenge</h4>
@@ -176,24 +148,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_ProofOfSpace_PlotPublicKey.md&amp;value=---%0Auid%3A%20chia.dotnet.ProofOfSpace.PlotPublicKey%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_ProofOfSpace_PlotPublicKey.md&amp;value=---%0Auid%3A%20chia.dotnet.ProofOfSpace.PlotPublicKey%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_ProofOfSpace_PlotPublicKey.md&amp;value=---%0Auid%3A%20chia.dotnet.ProofOfSpace.PlotPublicKey%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/ProofOfSpace.cs/#L11">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/ProofOfSpace.cs/#L11">View Source</a>
   </span>
   <a id="chia_dotnet_ProofOfSpace_PlotPublicKey_" data-uid="chia.dotnet.ProofOfSpace.PlotPublicKey*"></a>
   <h4 id="chia_dotnet_ProofOfSpace_PlotPublicKey" data-uid="chia.dotnet.ProofOfSpace.PlotPublicKey">PlotPublicKey</h4>
@@ -220,24 +178,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_ProofOfSpace_PoolContractPuzzleHash.md&amp;value=---%0Auid%3A%20chia.dotnet.ProofOfSpace.PoolContractPuzzleHash%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_ProofOfSpace_PoolContractPuzzleHash.md&amp;value=---%0Auid%3A%20chia.dotnet.ProofOfSpace.PoolContractPuzzleHash%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_ProofOfSpace_PoolContractPuzzleHash.md&amp;value=---%0Auid%3A%20chia.dotnet.ProofOfSpace.PoolContractPuzzleHash%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/ProofOfSpace.cs/#L10">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/ProofOfSpace.cs/#L10">View Source</a>
   </span>
   <a id="chia_dotnet_ProofOfSpace_PoolContractPuzzleHash_" data-uid="chia.dotnet.ProofOfSpace.PoolContractPuzzleHash*"></a>
   <h4 id="chia_dotnet_ProofOfSpace_PoolContractPuzzleHash" data-uid="chia.dotnet.ProofOfSpace.PoolContractPuzzleHash">PoolContractPuzzleHash</h4>
@@ -264,24 +208,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_ProofOfSpace_Proof.md&amp;value=---%0Auid%3A%20chia.dotnet.ProofOfSpace.Proof%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_ProofOfSpace_Proof.md&amp;value=---%0Auid%3A%20chia.dotnet.ProofOfSpace.Proof%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_ProofOfSpace_Proof.md&amp;value=---%0Auid%3A%20chia.dotnet.ProofOfSpace.Proof%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/ProofOfSpace.cs/#L13">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/ProofOfSpace.cs/#L13">View Source</a>
   </span>
   <a id="chia_dotnet_ProofOfSpace_Proof_" data-uid="chia.dotnet.ProofOfSpace.Proof*"></a>
   <h4 id="chia_dotnet_ProofOfSpace_Proof" data-uid="chia.dotnet.ProofOfSpace.Proof">Proof</h4>
@@ -308,24 +238,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_ProofOfSpace_PublicPoolKey.md&amp;value=---%0Auid%3A%20chia.dotnet.ProofOfSpace.PublicPoolKey%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_ProofOfSpace_PublicPoolKey.md&amp;value=---%0Auid%3A%20chia.dotnet.ProofOfSpace.PublicPoolKey%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_ProofOfSpace_PublicPoolKey.md&amp;value=---%0Auid%3A%20chia.dotnet.ProofOfSpace.PublicPoolKey%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/ProofOfSpace.cs/#L9">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/ProofOfSpace.cs/#L9">View Source</a>
   </span>
   <a id="chia_dotnet_ProofOfSpace_PublicPoolKey_" data-uid="chia.dotnet.ProofOfSpace.PublicPoolKey*"></a>
   <h4 id="chia_dotnet_ProofOfSpace_PublicPoolKey" data-uid="chia.dotnet.ProofOfSpace.PublicPoolKey">PublicPoolKey</h4>
@@ -353,24 +269,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_ProofOfSpace_Size.md&amp;value=---%0Auid%3A%20chia.dotnet.ProofOfSpace.Size%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_ProofOfSpace_Size.md&amp;value=---%0Auid%3A%20chia.dotnet.ProofOfSpace.Size%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_ProofOfSpace_Size.md&amp;value=---%0Auid%3A%20chia.dotnet.ProofOfSpace.Size%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/ProofOfSpace.cs/#L12">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/ProofOfSpace.cs/#L12">View Source</a>
   </span>
   <a id="chia_dotnet_ProofOfSpace_Size_" data-uid="chia.dotnet.ProofOfSpace.Size*"></a>
   <h4 id="chia_dotnet_ProofOfSpace_Size" data-uid="chia.dotnet.ProofOfSpace.Size">Size</h4>
@@ -407,24 +309,10 @@ <h3 id="implements">Implements</h3>
               <div class="contribution">
                 <ul class="nav">
                   <li>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-                    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_ProofOfSpace.md&amp;value=---%0Auid%3A%20chia.dotnet.ProofOfSpace%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-                    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_ProofOfSpace.md&amp;value=---%0Auid%3A%20chia.dotnet.ProofOfSpace%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-=======
                     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_ProofOfSpace.md&amp;value=---%0Auid%3A%20chia.dotnet.ProofOfSpace%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
                   </li>
                   <li>
-                    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/ProofOfSpace.cs/#L3" class="contribution-link">View Source</a>
+                    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/ProofOfSpace.cs/#L3" class="contribution-link">View Source</a>
                   </li>
                 </ul>
               </div>
diff --git a/docs/api/chia.dotnet.PuzzleAnnouncement.html b/docs/api/chia.dotnet.PuzzleAnnouncement.html
index e7af1fb5..0ac929fe 100644
--- a/docs/api/chia.dotnet.PuzzleAnnouncement.html
+++ b/docs/api/chia.dotnet.PuzzleAnnouncement.html
@@ -90,21 +90,7 @@ <h5>Inherited Members</h5>
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object)">Object.Equals(Object)</a>
     </div>
     <div>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object-system-object)">Object.Equals(Object, Object)</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-      <span class="xref">System.Object.Equals(System.Object, System.Object)</span>
-=======
-      <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object-system-object)">Object.Equals(Object, Object)</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
     </div>
     <div>
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.gethashcode#system-object-gethashcode">Object.GetHashCode()</a>
@@ -132,24 +118,10 @@ <h3 id="properties">Properties
   </h3>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PuzzleAnnouncement_Message.md&amp;value=---%0Auid%3A%20chia.dotnet.PuzzleAnnouncement.Message%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_PuzzleAnnouncement_Message.md&amp;value=---%0Auid%3A%20chia.dotnet.PuzzleAnnouncement.Message%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PuzzleAnnouncement_Message.md&amp;value=---%0Auid%3A%20chia.dotnet.PuzzleAnnouncement.Message%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/PuzzleAnnouncement.cs/#L6">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/PuzzleAnnouncement.cs/#L6">View Source</a>
   </span>
   <a id="chia_dotnet_PuzzleAnnouncement_Message_" data-uid="chia.dotnet.PuzzleAnnouncement.Message*"></a>
   <h4 id="chia_dotnet_PuzzleAnnouncement_Message" data-uid="chia.dotnet.PuzzleAnnouncement.Message">Message</h4>
@@ -176,24 +148,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PuzzleAnnouncement_MorphBytes.md&amp;value=---%0Auid%3A%20chia.dotnet.PuzzleAnnouncement.MorphBytes%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_PuzzleAnnouncement_MorphBytes.md&amp;value=---%0Auid%3A%20chia.dotnet.PuzzleAnnouncement.MorphBytes%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PuzzleAnnouncement_MorphBytes.md&amp;value=---%0Auid%3A%20chia.dotnet.PuzzleAnnouncement.MorphBytes%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/PuzzleAnnouncement.cs/#L7">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/PuzzleAnnouncement.cs/#L7">View Source</a>
   </span>
   <a id="chia_dotnet_PuzzleAnnouncement_MorphBytes_" data-uid="chia.dotnet.PuzzleAnnouncement.MorphBytes*"></a>
   <h4 id="chia_dotnet_PuzzleAnnouncement_MorphBytes" data-uid="chia.dotnet.PuzzleAnnouncement.MorphBytes">MorphBytes</h4>
@@ -220,24 +178,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PuzzleAnnouncement_PuzzleHash.md&amp;value=---%0Auid%3A%20chia.dotnet.PuzzleAnnouncement.PuzzleHash%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_PuzzleAnnouncement_PuzzleHash.md&amp;value=---%0Auid%3A%20chia.dotnet.PuzzleAnnouncement.PuzzleHash%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PuzzleAnnouncement_PuzzleHash.md&amp;value=---%0Auid%3A%20chia.dotnet.PuzzleAnnouncement.PuzzleHash%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/PuzzleAnnouncement.cs/#L5">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/PuzzleAnnouncement.cs/#L5">View Source</a>
   </span>
   <a id="chia_dotnet_PuzzleAnnouncement_PuzzleHash_" data-uid="chia.dotnet.PuzzleAnnouncement.PuzzleHash*"></a>
   <h4 id="chia_dotnet_PuzzleAnnouncement_PuzzleHash" data-uid="chia.dotnet.PuzzleAnnouncement.PuzzleHash">PuzzleHash</h4>
@@ -274,24 +218,10 @@ <h3 id="implements">Implements</h3>
               <div class="contribution">
                 <ul class="nav">
                   <li>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-                    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PuzzleAnnouncement.md&amp;value=---%0Auid%3A%20chia.dotnet.PuzzleAnnouncement%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-                    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_PuzzleAnnouncement.md&amp;value=---%0Auid%3A%20chia.dotnet.PuzzleAnnouncement%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-=======
                     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_PuzzleAnnouncement.md&amp;value=---%0Auid%3A%20chia.dotnet.PuzzleAnnouncement%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
                   </li>
                   <li>
-                    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/PuzzleAnnouncement.cs/#L3" class="contribution-link">View Source</a>
+                    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/PuzzleAnnouncement.cs/#L3" class="contribution-link">View Source</a>
                   </li>
                 </ul>
               </div>
diff --git a/docs/api/chia.dotnet.QueuedPlotInfo.html b/docs/api/chia.dotnet.QueuedPlotInfo.html
index c64ac903..161abef3 100644
--- a/docs/api/chia.dotnet.QueuedPlotInfo.html
+++ b/docs/api/chia.dotnet.QueuedPlotInfo.html
@@ -91,21 +91,7 @@ <h5>Inherited Members</h5>
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object)">Object.Equals(Object)</a>
     </div>
     <div>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object-system-object)">Object.Equals(Object, Object)</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-      <span class="xref">System.Object.Equals(System.Object, System.Object)</span>
-=======
-      <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object-system-object)">Object.Equals(Object, Object)</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
     </div>
     <div>
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.gethashcode#system-object-gethashcode">Object.GetHashCode()</a>
@@ -133,24 +119,10 @@ <h3 id="properties">Properties
   </h3>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_QueuedPlotInfo_Delay.md&amp;value=---%0Auid%3A%20chia.dotnet.QueuedPlotInfo.Delay%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_QueuedPlotInfo_Delay.md&amp;value=---%0Auid%3A%20chia.dotnet.QueuedPlotInfo.Delay%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_QueuedPlotInfo_Delay.md&amp;value=---%0Auid%3A%20chia.dotnet.QueuedPlotInfo.Delay%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/QueuedPlotInfo.cs/#L11">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/QueuedPlotInfo.cs/#L11">View Source</a>
   </span>
   <a id="chia_dotnet_QueuedPlotInfo_Delay_" data-uid="chia.dotnet.QueuedPlotInfo.Delay*"></a>
   <h4 id="chia_dotnet_QueuedPlotInfo_Delay" data-uid="chia.dotnet.QueuedPlotInfo.Delay">Delay</h4>
@@ -177,24 +149,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_QueuedPlotInfo_Deleted.md&amp;value=---%0Auid%3A%20chia.dotnet.QueuedPlotInfo.Deleted%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_QueuedPlotInfo_Deleted.md&amp;value=---%0Auid%3A%20chia.dotnet.QueuedPlotInfo.Deleted%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_QueuedPlotInfo_Deleted.md&amp;value=---%0Auid%3A%20chia.dotnet.QueuedPlotInfo.Deleted%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/QueuedPlotInfo.cs/#L12">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/QueuedPlotInfo.cs/#L12">View Source</a>
   </span>
   <a id="chia_dotnet_QueuedPlotInfo_Deleted_" data-uid="chia.dotnet.QueuedPlotInfo.Deleted*"></a>
   <h4 id="chia_dotnet_QueuedPlotInfo_Deleted" data-uid="chia.dotnet.QueuedPlotInfo.Deleted">Deleted</h4>
@@ -221,24 +179,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_QueuedPlotInfo_Error.md&amp;value=---%0Auid%3A%20chia.dotnet.QueuedPlotInfo.Error%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_QueuedPlotInfo_Error.md&amp;value=---%0Auid%3A%20chia.dotnet.QueuedPlotInfo.Error%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_QueuedPlotInfo_Error.md&amp;value=---%0Auid%3A%20chia.dotnet.QueuedPlotInfo.Error%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/QueuedPlotInfo.cs/#L13">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/QueuedPlotInfo.cs/#L13">View Source</a>
   </span>
   <a id="chia_dotnet_QueuedPlotInfo_Error_" data-uid="chia.dotnet.QueuedPlotInfo.Error*"></a>
   <h4 id="chia_dotnet_QueuedPlotInfo_Error" data-uid="chia.dotnet.QueuedPlotInfo.Error">Error</h4>
@@ -265,24 +209,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_QueuedPlotInfo_Id.md&amp;value=---%0Auid%3A%20chia.dotnet.QueuedPlotInfo.Id%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_QueuedPlotInfo_Id.md&amp;value=---%0Auid%3A%20chia.dotnet.QueuedPlotInfo.Id%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_QueuedPlotInfo_Id.md&amp;value=---%0Auid%3A%20chia.dotnet.QueuedPlotInfo.Id%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/QueuedPlotInfo.cs/#L14">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/QueuedPlotInfo.cs/#L14">View Source</a>
   </span>
   <a id="chia_dotnet_QueuedPlotInfo_Id_" data-uid="chia.dotnet.QueuedPlotInfo.Id*"></a>
   <h4 id="chia_dotnet_QueuedPlotInfo_Id" data-uid="chia.dotnet.QueuedPlotInfo.Id">Id</h4>
@@ -309,24 +239,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_QueuedPlotInfo_Log.md&amp;value=---%0Auid%3A%20chia.dotnet.QueuedPlotInfo.Log%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_QueuedPlotInfo_Log.md&amp;value=---%0Auid%3A%20chia.dotnet.QueuedPlotInfo.Log%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_QueuedPlotInfo_Log.md&amp;value=---%0Auid%3A%20chia.dotnet.QueuedPlotInfo.Log%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/QueuedPlotInfo.cs/#L15">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/QueuedPlotInfo.cs/#L15">View Source</a>
   </span>
   <a id="chia_dotnet_QueuedPlotInfo_Log_" data-uid="chia.dotnet.QueuedPlotInfo.Log*"></a>
   <h4 id="chia_dotnet_QueuedPlotInfo_Log" data-uid="chia.dotnet.QueuedPlotInfo.Log">Log</h4>
@@ -353,24 +269,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_QueuedPlotInfo_LogNew.md&amp;value=---%0Auid%3A%20chia.dotnet.QueuedPlotInfo.LogNew%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_QueuedPlotInfo_LogNew.md&amp;value=---%0Auid%3A%20chia.dotnet.QueuedPlotInfo.LogNew%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_QueuedPlotInfo_LogNew.md&amp;value=---%0Auid%3A%20chia.dotnet.QueuedPlotInfo.LogNew%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/QueuedPlotInfo.cs/#L16">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/QueuedPlotInfo.cs/#L16">View Source</a>
   </span>
   <a id="chia_dotnet_QueuedPlotInfo_LogNew_" data-uid="chia.dotnet.QueuedPlotInfo.LogNew*"></a>
   <h4 id="chia_dotnet_QueuedPlotInfo_LogNew" data-uid="chia.dotnet.QueuedPlotInfo.LogNew">LogNew</h4>
@@ -397,24 +299,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_QueuedPlotInfo_Parallel.md&amp;value=---%0Auid%3A%20chia.dotnet.QueuedPlotInfo.Parallel%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_QueuedPlotInfo_Parallel.md&amp;value=---%0Auid%3A%20chia.dotnet.QueuedPlotInfo.Parallel%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_QueuedPlotInfo_Parallel.md&amp;value=---%0Auid%3A%20chia.dotnet.QueuedPlotInfo.Parallel%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/QueuedPlotInfo.cs/#L17">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/QueuedPlotInfo.cs/#L17">View Source</a>
   </span>
   <a id="chia_dotnet_QueuedPlotInfo_Parallel_" data-uid="chia.dotnet.QueuedPlotInfo.Parallel*"></a>
   <h4 id="chia_dotnet_QueuedPlotInfo_Parallel" data-uid="chia.dotnet.QueuedPlotInfo.Parallel">Parallel</h4>
@@ -441,24 +329,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_QueuedPlotInfo_PlotState.md&amp;value=---%0Auid%3A%20chia.dotnet.QueuedPlotInfo.PlotState%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_QueuedPlotInfo_PlotState.md&amp;value=---%0Auid%3A%20chia.dotnet.QueuedPlotInfo.PlotState%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_QueuedPlotInfo_PlotState.md&amp;value=---%0Auid%3A%20chia.dotnet.QueuedPlotInfo.PlotState%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/QueuedPlotInfo.cs/#L21">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/QueuedPlotInfo.cs/#L21">View Source</a>
   </span>
   <a id="chia_dotnet_QueuedPlotInfo_PlotState_" data-uid="chia.dotnet.QueuedPlotInfo.PlotState*"></a>
   <h4 id="chia_dotnet_QueuedPlotInfo_PlotState" data-uid="chia.dotnet.QueuedPlotInfo.PlotState">PlotState</h4>
@@ -486,24 +360,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_QueuedPlotInfo_Queue.md&amp;value=---%0Auid%3A%20chia.dotnet.QueuedPlotInfo.Queue%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_QueuedPlotInfo_Queue.md&amp;value=---%0Auid%3A%20chia.dotnet.QueuedPlotInfo.Queue%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_QueuedPlotInfo_Queue.md&amp;value=---%0Auid%3A%20chia.dotnet.QueuedPlotInfo.Queue%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/QueuedPlotInfo.cs/#L18">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/QueuedPlotInfo.cs/#L18">View Source</a>
   </span>
   <a id="chia_dotnet_QueuedPlotInfo_Queue_" data-uid="chia.dotnet.QueuedPlotInfo.Queue*"></a>
   <h4 id="chia_dotnet_QueuedPlotInfo_Queue" data-uid="chia.dotnet.QueuedPlotInfo.Queue">Queue</h4>
@@ -530,24 +390,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_QueuedPlotInfo_Size.md&amp;value=---%0Auid%3A%20chia.dotnet.QueuedPlotInfo.Size%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_QueuedPlotInfo_Size.md&amp;value=---%0Auid%3A%20chia.dotnet.QueuedPlotInfo.Size%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_QueuedPlotInfo_Size.md&amp;value=---%0Auid%3A%20chia.dotnet.QueuedPlotInfo.Size%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/QueuedPlotInfo.cs/#L19">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/QueuedPlotInfo.cs/#L19">View Source</a>
   </span>
   <a id="chia_dotnet_QueuedPlotInfo_Size_" data-uid="chia.dotnet.QueuedPlotInfo.Size*"></a>
   <h4 id="chia_dotnet_QueuedPlotInfo_Size" data-uid="chia.dotnet.QueuedPlotInfo.Size">Size</h4>
@@ -574,24 +420,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_QueuedPlotInfo_State.md&amp;value=---%0Auid%3A%20chia.dotnet.QueuedPlotInfo.State%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_QueuedPlotInfo_State.md&amp;value=---%0Auid%3A%20chia.dotnet.QueuedPlotInfo.State%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_QueuedPlotInfo_State.md&amp;value=---%0Auid%3A%20chia.dotnet.QueuedPlotInfo.State%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/QueuedPlotInfo.cs/#L20">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/QueuedPlotInfo.cs/#L20">View Source</a>
   </span>
   <a id="chia_dotnet_QueuedPlotInfo_State_" data-uid="chia.dotnet.QueuedPlotInfo.State*"></a>
   <h4 id="chia_dotnet_QueuedPlotInfo_State" data-uid="chia.dotnet.QueuedPlotInfo.State">State</h4>
@@ -628,24 +460,10 @@ <h3 id="implements">Implements</h3>
               <div class="contribution">
                 <ul class="nav">
                   <li>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-                    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_QueuedPlotInfo.md&amp;value=---%0Auid%3A%20chia.dotnet.QueuedPlotInfo%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-                    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_QueuedPlotInfo.md&amp;value=---%0Auid%3A%20chia.dotnet.QueuedPlotInfo%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-=======
                     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_QueuedPlotInfo.md&amp;value=---%0Auid%3A%20chia.dotnet.QueuedPlotInfo%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
                   </li>
                   <li>
-                    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/QueuedPlotInfo.cs/#L9" class="contribution-link">View Source</a>
+                    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/QueuedPlotInfo.cs/#L9" class="contribution-link">View Source</a>
                   </li>
                 </ul>
               </div>
diff --git a/docs/api/chia.dotnet.ResponseException.html b/docs/api/chia.dotnet.ResponseException.html
index 8734cc65..25c8facb 100644
--- a/docs/api/chia.dotnet.ResponseException.html
+++ b/docs/api/chia.dotnet.ResponseException.html
@@ -132,21 +132,7 @@ <h5>Inherited Members</h5>
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object)">Object.Equals(Object)</a>
     </div>
     <div>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object-system-object)">Object.Equals(Object, Object)</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-      <span class="xref">System.Object.Equals(System.Object, System.Object)</span>
-=======
-      <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object-system-object)">Object.Equals(Object, Object)</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
     </div>
     <div>
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.gethashcode#system-object-gethashcode">Object.GetHashCode()</a>
@@ -168,24 +154,10 @@ <h3 id="constructors">Constructors
   </h3>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_ResponseException__ctor_chia_dotnet_Message_.md&amp;value=---%0Auid%3A%20chia.dotnet.ResponseException.%23ctor(chia.dotnet.Message)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_ResponseException__ctor_chia_dotnet_Message_.md&amp;value=---%0Auid%3A%20chia.dotnet.ResponseException.%23ctor(chia.dotnet.Message)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_ResponseException__ctor_chia_dotnet_Message_.md&amp;value=---%0Auid%3A%20chia.dotnet.ResponseException.%23ctor(chia.dotnet.Message)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ResponseException.cs/#L15">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ResponseException.cs/#L15">View Source</a>
   </span>
   <a id="chia_dotnet_ResponseException__ctor_" data-uid="chia.dotnet.ResponseException.#ctor*"></a>
   <h4 id="chia_dotnet_ResponseException__ctor_chia_dotnet_Message_" data-uid="chia.dotnet.ResponseException.#ctor(chia.dotnet.Message)">ResponseException(Message)</h4>
@@ -216,24 +188,10 @@ <h5 class="parameters">Parameters</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_ResponseException__ctor_chia_dotnet_Message_System_String_.md&amp;value=---%0Auid%3A%20chia.dotnet.ResponseException.%23ctor(chia.dotnet.Message%2CSystem.String)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_ResponseException__ctor_chia_dotnet_Message_System_String_.md&amp;value=---%0Auid%3A%20chia.dotnet.ResponseException.%23ctor(chia.dotnet.Message%2CSystem.String)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_ResponseException__ctor_chia_dotnet_Message_System_String_.md&amp;value=---%0Auid%3A%20chia.dotnet.ResponseException.%23ctor(chia.dotnet.Message%2CSystem.String)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ResponseException.cs/#L25">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ResponseException.cs/#L25">View Source</a>
   </span>
   <a id="chia_dotnet_ResponseException__ctor_" data-uid="chia.dotnet.ResponseException.#ctor*"></a>
   <h4 id="chia_dotnet_ResponseException__ctor_chia_dotnet_Message_System_String_" data-uid="chia.dotnet.ResponseException.#ctor(chia.dotnet.Message,System.String)">ResponseException(Message, String)</h4>
@@ -270,24 +228,10 @@ <h5 class="parameters">Parameters</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_ResponseException__ctor_chia_dotnet_Message_System_String_System_Exception_.md&amp;value=---%0Auid%3A%20chia.dotnet.ResponseException.%23ctor(chia.dotnet.Message%2CSystem.String%2CSystem.Exception)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_ResponseException__ctor_chia_dotnet_Message_System_String_System_Exception_.md&amp;value=---%0Auid%3A%20chia.dotnet.ResponseException.%23ctor(chia.dotnet.Message%2CSystem.String%2CSystem.Exception)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_ResponseException__ctor_chia_dotnet_Message_System_String_System_Exception_.md&amp;value=---%0Auid%3A%20chia.dotnet.ResponseException.%23ctor(chia.dotnet.Message%2CSystem.String%2CSystem.Exception)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ResponseException.cs/#L36">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ResponseException.cs/#L36">View Source</a>
   </span>
   <a id="chia_dotnet_ResponseException__ctor_" data-uid="chia.dotnet.ResponseException.#ctor*"></a>
   <h4 id="chia_dotnet_ResponseException__ctor_chia_dotnet_Message_System_String_System_Exception_" data-uid="chia.dotnet.ResponseException.#ctor(chia.dotnet.Message,System.String,System.Exception)">ResponseException(Message, String, Exception)</h4>
@@ -332,24 +276,10 @@ <h3 id="properties">Properties
   </h3>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_ResponseException_Request.md&amp;value=---%0Auid%3A%20chia.dotnet.ResponseException.Request%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_ResponseException_Request.md&amp;value=---%0Auid%3A%20chia.dotnet.ResponseException.Request%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_ResponseException_Request.md&amp;value=---%0Auid%3A%20chia.dotnet.ResponseException.Request%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ResponseException.cs/#L45">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ResponseException.cs/#L45">View Source</a>
   </span>
   <a id="chia_dotnet_ResponseException_Request_" data-uid="chia.dotnet.ResponseException.Request*"></a>
   <h4 id="chia_dotnet_ResponseException_Request" data-uid="chia.dotnet.ResponseException.Request">Request</h4>
@@ -387,24 +317,10 @@ <h3 id="implements">Implements</h3>
               <div class="contribution">
                 <ul class="nav">
                   <li>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-                    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_ResponseException.md&amp;value=---%0Auid%3A%20chia.dotnet.ResponseException%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-                    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_ResponseException.md&amp;value=---%0Auid%3A%20chia.dotnet.ResponseException%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-=======
                     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_ResponseException.md&amp;value=---%0Auid%3A%20chia.dotnet.ResponseException%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
                   </li>
                   <li>
-                    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ResponseException.cs/#L9" class="contribution-link">View Source</a>
+                    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ResponseException.cs/#L9" class="contribution-link">View Source</a>
                   </li>
                 </ul>
               </div>
diff --git a/docs/api/chia.dotnet.RewardChainBlock.html b/docs/api/chia.dotnet.RewardChainBlock.html
index 1214df5c..b162cea2 100644
--- a/docs/api/chia.dotnet.RewardChainBlock.html
+++ b/docs/api/chia.dotnet.RewardChainBlock.html
@@ -90,21 +90,7 @@ <h5>Inherited Members</h5>
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object)">Object.Equals(Object)</a>
     </div>
     <div>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object-system-object)">Object.Equals(Object, Object)</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-      <span class="xref">System.Object.Equals(System.Object, System.Object)</span>
-=======
-      <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object-system-object)">Object.Equals(Object, Object)</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
     </div>
     <div>
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.gethashcode#system-object-gethashcode">Object.GetHashCode()</a>
@@ -132,24 +118,10 @@ <h3 id="properties">Properties
   </h3>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_RewardChainBlock_ChallengeChainIpVdf.md&amp;value=---%0Auid%3A%20chia.dotnet.RewardChainBlock.ChallengeChainIpVdf%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_RewardChainBlock_ChallengeChainIpVdf.md&amp;value=---%0Auid%3A%20chia.dotnet.RewardChainBlock.ChallengeChainIpVdf%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_RewardChainBlock_ChallengeChainIpVdf.md&amp;value=---%0Auid%3A%20chia.dotnet.RewardChainBlock.ChallengeChainIpVdf%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/RewardChainBlock.cs/#L18">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/RewardChainBlock.cs/#L18">View Source</a>
   </span>
   <a id="chia_dotnet_RewardChainBlock_ChallengeChainIpVdf_" data-uid="chia.dotnet.RewardChainBlock.ChallengeChainIpVdf*"></a>
   <h4 id="chia_dotnet_RewardChainBlock_ChallengeChainIpVdf" data-uid="chia.dotnet.RewardChainBlock.ChallengeChainIpVdf">ChallengeChainIpVdf</h4>
@@ -176,24 +148,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_RewardChainBlock_ChallengeChainSpSignature.md&amp;value=---%0Auid%3A%20chia.dotnet.RewardChainBlock.ChallengeChainSpSignature%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_RewardChainBlock_ChallengeChainSpSignature.md&amp;value=---%0Auid%3A%20chia.dotnet.RewardChainBlock.ChallengeChainSpSignature%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_RewardChainBlock_ChallengeChainSpSignature.md&amp;value=---%0Auid%3A%20chia.dotnet.RewardChainBlock.ChallengeChainSpSignature%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/RewardChainBlock.cs/#L17">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/RewardChainBlock.cs/#L17">View Source</a>
   </span>
   <a id="chia_dotnet_RewardChainBlock_ChallengeChainSpSignature_" data-uid="chia.dotnet.RewardChainBlock.ChallengeChainSpSignature*"></a>
   <h4 id="chia_dotnet_RewardChainBlock_ChallengeChainSpSignature" data-uid="chia.dotnet.RewardChainBlock.ChallengeChainSpSignature">ChallengeChainSpSignature</h4>
@@ -220,24 +178,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_RewardChainBlock_ChallengeChainSpVdf.md&amp;value=---%0Auid%3A%20chia.dotnet.RewardChainBlock.ChallengeChainSpVdf%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_RewardChainBlock_ChallengeChainSpVdf.md&amp;value=---%0Auid%3A%20chia.dotnet.RewardChainBlock.ChallengeChainSpVdf%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_RewardChainBlock_ChallengeChainSpVdf.md&amp;value=---%0Auid%3A%20chia.dotnet.RewardChainBlock.ChallengeChainSpVdf%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/RewardChainBlock.cs/#L16">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/RewardChainBlock.cs/#L16">View Source</a>
   </span>
   <a id="chia_dotnet_RewardChainBlock_ChallengeChainSpVdf_" data-uid="chia.dotnet.RewardChainBlock.ChallengeChainSpVdf*"></a>
   <h4 id="chia_dotnet_RewardChainBlock_ChallengeChainSpVdf" data-uid="chia.dotnet.RewardChainBlock.ChallengeChainSpVdf">ChallengeChainSpVdf</h4>
@@ -265,24 +209,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_RewardChainBlock_Height.md&amp;value=---%0Auid%3A%20chia.dotnet.RewardChainBlock.Height%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_RewardChainBlock_Height.md&amp;value=---%0Auid%3A%20chia.dotnet.RewardChainBlock.Height%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_RewardChainBlock_Height.md&amp;value=---%0Auid%3A%20chia.dotnet.RewardChainBlock.Height%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/RewardChainBlock.cs/#L8">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/RewardChainBlock.cs/#L8">View Source</a>
   </span>
   <a id="chia_dotnet_RewardChainBlock_Height_" data-uid="chia.dotnet.RewardChainBlock.Height*"></a>
   <h4 id="chia_dotnet_RewardChainBlock_Height" data-uid="chia.dotnet.RewardChainBlock.Height">Height</h4>
@@ -309,24 +239,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_RewardChainBlock_InfusedChallengeChainIpVdf.md&amp;value=---%0Auid%3A%20chia.dotnet.RewardChainBlock.InfusedChallengeChainIpVdf%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_RewardChainBlock_InfusedChallengeChainIpVdf.md&amp;value=---%0Auid%3A%20chia.dotnet.RewardChainBlock.InfusedChallengeChainIpVdf%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_RewardChainBlock_InfusedChallengeChainIpVdf.md&amp;value=---%0Auid%3A%20chia.dotnet.RewardChainBlock.InfusedChallengeChainIpVdf%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/RewardChainBlock.cs/#L28">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/RewardChainBlock.cs/#L28">View Source</a>
   </span>
   <a id="chia_dotnet_RewardChainBlock_InfusedChallengeChainIpVdf_" data-uid="chia.dotnet.RewardChainBlock.InfusedChallengeChainIpVdf*"></a>
   <h4 id="chia_dotnet_RewardChainBlock_InfusedChallengeChainIpVdf" data-uid="chia.dotnet.RewardChainBlock.InfusedChallengeChainIpVdf">InfusedChallengeChainIpVdf</h4>
@@ -354,24 +270,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_RewardChainBlock_IsTransactionBlock.md&amp;value=---%0Auid%3A%20chia.dotnet.RewardChainBlock.IsTransactionBlock%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_RewardChainBlock_IsTransactionBlock.md&amp;value=---%0Auid%3A%20chia.dotnet.RewardChainBlock.IsTransactionBlock%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_RewardChainBlock_IsTransactionBlock.md&amp;value=---%0Auid%3A%20chia.dotnet.RewardChainBlock.IsTransactionBlock%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/RewardChainBlock.cs/#L29">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/RewardChainBlock.cs/#L29">View Source</a>
   </span>
   <a id="chia_dotnet_RewardChainBlock_IsTransactionBlock_" data-uid="chia.dotnet.RewardChainBlock.IsTransactionBlock*"></a>
   <h4 id="chia_dotnet_RewardChainBlock_IsTransactionBlock" data-uid="chia.dotnet.RewardChainBlock.IsTransactionBlock">IsTransactionBlock</h4>
@@ -398,24 +300,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_RewardChainBlock_PosSsCcChallengeHash.md&amp;value=---%0Auid%3A%20chia.dotnet.RewardChainBlock.PosSsCcChallengeHash%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_RewardChainBlock_PosSsCcChallengeHash.md&amp;value=---%0Auid%3A%20chia.dotnet.RewardChainBlock.PosSsCcChallengeHash%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_RewardChainBlock_PosSsCcChallengeHash.md&amp;value=---%0Auid%3A%20chia.dotnet.RewardChainBlock.PosSsCcChallengeHash%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/RewardChainBlock.cs/#L11">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/RewardChainBlock.cs/#L11">View Source</a>
   </span>
   <a id="chia_dotnet_RewardChainBlock_PosSsCcChallengeHash_" data-uid="chia.dotnet.RewardChainBlock.PosSsCcChallengeHash*"></a>
   <h4 id="chia_dotnet_RewardChainBlock_PosSsCcChallengeHash" data-uid="chia.dotnet.RewardChainBlock.PosSsCcChallengeHash">PosSsCcChallengeHash</h4>
@@ -442,24 +330,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_RewardChainBlock_ProofOfSpace.md&amp;value=---%0Auid%3A%20chia.dotnet.RewardChainBlock.ProofOfSpace%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_RewardChainBlock_ProofOfSpace.md&amp;value=---%0Auid%3A%20chia.dotnet.RewardChainBlock.ProofOfSpace%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_RewardChainBlock_ProofOfSpace.md&amp;value=---%0Auid%3A%20chia.dotnet.RewardChainBlock.ProofOfSpace%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/RewardChainBlock.cs/#L12">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/RewardChainBlock.cs/#L12">View Source</a>
   </span>
   <a id="chia_dotnet_RewardChainBlock_ProofOfSpace_" data-uid="chia.dotnet.RewardChainBlock.ProofOfSpace*"></a>
   <h4 id="chia_dotnet_RewardChainBlock_ProofOfSpace" data-uid="chia.dotnet.RewardChainBlock.ProofOfSpace">ProofOfSpace</h4>
@@ -486,24 +360,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_RewardChainBlock_RewardChainIpVdf.md&amp;value=---%0Auid%3A%20chia.dotnet.RewardChainBlock.RewardChainIpVdf%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_RewardChainBlock_RewardChainIpVdf.md&amp;value=---%0Auid%3A%20chia.dotnet.RewardChainBlock.RewardChainIpVdf%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_RewardChainBlock_RewardChainIpVdf.md&amp;value=---%0Auid%3A%20chia.dotnet.RewardChainBlock.RewardChainIpVdf%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/RewardChainBlock.cs/#L24">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/RewardChainBlock.cs/#L24">View Source</a>
   </span>
   <a id="chia_dotnet_RewardChainBlock_RewardChainIpVdf_" data-uid="chia.dotnet.RewardChainBlock.RewardChainIpVdf*"></a>
   <h4 id="chia_dotnet_RewardChainBlock_RewardChainIpVdf" data-uid="chia.dotnet.RewardChainBlock.RewardChainIpVdf">RewardChainIpVdf</h4>
@@ -530,24 +390,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_RewardChainBlock_RewardChainSpSignature.md&amp;value=---%0Auid%3A%20chia.dotnet.RewardChainBlock.RewardChainSpSignature%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_RewardChainBlock_RewardChainSpSignature.md&amp;value=---%0Auid%3A%20chia.dotnet.RewardChainBlock.RewardChainSpSignature%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_RewardChainBlock_RewardChainSpSignature.md&amp;value=---%0Auid%3A%20chia.dotnet.RewardChainBlock.RewardChainSpSignature%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/RewardChainBlock.cs/#L23">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/RewardChainBlock.cs/#L23">View Source</a>
   </span>
   <a id="chia_dotnet_RewardChainBlock_RewardChainSpSignature_" data-uid="chia.dotnet.RewardChainBlock.RewardChainSpSignature*"></a>
   <h4 id="chia_dotnet_RewardChainBlock_RewardChainSpSignature" data-uid="chia.dotnet.RewardChainBlock.RewardChainSpSignature">RewardChainSpSignature</h4>
@@ -574,24 +420,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_RewardChainBlock_RewardChainSpVdf.md&amp;value=---%0Auid%3A%20chia.dotnet.RewardChainBlock.RewardChainSpVdf%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_RewardChainBlock_RewardChainSpVdf.md&amp;value=---%0Auid%3A%20chia.dotnet.RewardChainBlock.RewardChainSpVdf%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_RewardChainBlock_RewardChainSpVdf.md&amp;value=---%0Auid%3A%20chia.dotnet.RewardChainBlock.RewardChainSpVdf%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/RewardChainBlock.cs/#L22">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/RewardChainBlock.cs/#L22">View Source</a>
   </span>
   <a id="chia_dotnet_RewardChainBlock_RewardChainSpVdf_" data-uid="chia.dotnet.RewardChainBlock.RewardChainSpVdf*"></a>
   <h4 id="chia_dotnet_RewardChainBlock_RewardChainSpVdf" data-uid="chia.dotnet.RewardChainBlock.RewardChainSpVdf">RewardChainSpVdf</h4>
@@ -619,24 +451,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_RewardChainBlock_SignagePointIndex.md&amp;value=---%0Auid%3A%20chia.dotnet.RewardChainBlock.SignagePointIndex%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_RewardChainBlock_SignagePointIndex.md&amp;value=---%0Auid%3A%20chia.dotnet.RewardChainBlock.SignagePointIndex%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_RewardChainBlock_SignagePointIndex.md&amp;value=---%0Auid%3A%20chia.dotnet.RewardChainBlock.SignagePointIndex%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/RewardChainBlock.cs/#L10">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/RewardChainBlock.cs/#L10">View Source</a>
   </span>
   <a id="chia_dotnet_RewardChainBlock_SignagePointIndex_" data-uid="chia.dotnet.RewardChainBlock.SignagePointIndex*"></a>
   <h4 id="chia_dotnet_RewardChainBlock_SignagePointIndex" data-uid="chia.dotnet.RewardChainBlock.SignagePointIndex">SignagePointIndex</h4>
@@ -663,24 +481,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_RewardChainBlock_TotalIters.md&amp;value=---%0Auid%3A%20chia.dotnet.RewardChainBlock.TotalIters%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_RewardChainBlock_TotalIters.md&amp;value=---%0Auid%3A%20chia.dotnet.RewardChainBlock.TotalIters%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_RewardChainBlock_TotalIters.md&amp;value=---%0Auid%3A%20chia.dotnet.RewardChainBlock.TotalIters%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/RewardChainBlock.cs/#L9">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/RewardChainBlock.cs/#L9">View Source</a>
   </span>
   <a id="chia_dotnet_RewardChainBlock_TotalIters_" data-uid="chia.dotnet.RewardChainBlock.TotalIters*"></a>
   <h4 id="chia_dotnet_RewardChainBlock_TotalIters" data-uid="chia.dotnet.RewardChainBlock.TotalIters">TotalIters</h4>
@@ -707,24 +511,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_RewardChainBlock_Weight.md&amp;value=---%0Auid%3A%20chia.dotnet.RewardChainBlock.Weight%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_RewardChainBlock_Weight.md&amp;value=---%0Auid%3A%20chia.dotnet.RewardChainBlock.Weight%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_RewardChainBlock_Weight.md&amp;value=---%0Auid%3A%20chia.dotnet.RewardChainBlock.Weight%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/RewardChainBlock.cs/#L7">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/RewardChainBlock.cs/#L7">View Source</a>
   </span>
   <a id="chia_dotnet_RewardChainBlock_Weight_" data-uid="chia.dotnet.RewardChainBlock.Weight*"></a>
   <h4 id="chia_dotnet_RewardChainBlock_Weight" data-uid="chia.dotnet.RewardChainBlock.Weight">Weight</h4>
@@ -761,24 +551,10 @@ <h3 id="implements">Implements</h3>
               <div class="contribution">
                 <ul class="nav">
                   <li>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-                    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_RewardChainBlock.md&amp;value=---%0Auid%3A%20chia.dotnet.RewardChainBlock%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-                    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_RewardChainBlock.md&amp;value=---%0Auid%3A%20chia.dotnet.RewardChainBlock%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-=======
                     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_RewardChainBlock.md&amp;value=---%0Auid%3A%20chia.dotnet.RewardChainBlock%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
                   </li>
                   <li>
-                    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/RewardChainBlock.cs/#L5" class="contribution-link">View Source</a>
+                    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/RewardChainBlock.cs/#L5" class="contribution-link">View Source</a>
                   </li>
                 </ul>
               </div>
diff --git a/docs/api/chia.dotnet.RewardChainBlockUnfinished.html b/docs/api/chia.dotnet.RewardChainBlockUnfinished.html
index d66cc051..3c78d4a8 100644
--- a/docs/api/chia.dotnet.RewardChainBlockUnfinished.html
+++ b/docs/api/chia.dotnet.RewardChainBlockUnfinished.html
@@ -90,21 +90,7 @@ <h5>Inherited Members</h5>
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object)">Object.Equals(Object)</a>
     </div>
     <div>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object-system-object)">Object.Equals(Object, Object)</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-      <span class="xref">System.Object.Equals(System.Object, System.Object)</span>
-=======
-      <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object-system-object)">Object.Equals(Object, Object)</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
     </div>
     <div>
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.gethashcode#system-object-gethashcode">Object.GetHashCode()</a>
@@ -132,24 +118,10 @@ <h3 id="properties">Properties
   </h3>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_RewardChainBlockUnfinished_ChallengeChainSpSignature.md&amp;value=---%0Auid%3A%20chia.dotnet.RewardChainBlockUnfinished.ChallengeChainSpSignature%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_RewardChainBlockUnfinished_ChallengeChainSpSignature.md&amp;value=---%0Auid%3A%20chia.dotnet.RewardChainBlockUnfinished.ChallengeChainSpSignature%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_RewardChainBlockUnfinished_ChallengeChainSpSignature.md&amp;value=---%0Auid%3A%20chia.dotnet.RewardChainBlockUnfinished.ChallengeChainSpSignature%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/RewardChainBlockUnfinished.cs/#L15">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/RewardChainBlockUnfinished.cs/#L15">View Source</a>
   </span>
   <a id="chia_dotnet_RewardChainBlockUnfinished_ChallengeChainSpSignature_" data-uid="chia.dotnet.RewardChainBlockUnfinished.ChallengeChainSpSignature*"></a>
   <h4 id="chia_dotnet_RewardChainBlockUnfinished_ChallengeChainSpSignature" data-uid="chia.dotnet.RewardChainBlockUnfinished.ChallengeChainSpSignature">ChallengeChainSpSignature</h4>
@@ -176,24 +148,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_RewardChainBlockUnfinished_ChallengeChainSpVdf.md&amp;value=---%0Auid%3A%20chia.dotnet.RewardChainBlockUnfinished.ChallengeChainSpVdf%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_RewardChainBlockUnfinished_ChallengeChainSpVdf.md&amp;value=---%0Auid%3A%20chia.dotnet.RewardChainBlockUnfinished.ChallengeChainSpVdf%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_RewardChainBlockUnfinished_ChallengeChainSpVdf.md&amp;value=---%0Auid%3A%20chia.dotnet.RewardChainBlockUnfinished.ChallengeChainSpVdf%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/RewardChainBlockUnfinished.cs/#L14">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/RewardChainBlockUnfinished.cs/#L14">View Source</a>
   </span>
   <a id="chia_dotnet_RewardChainBlockUnfinished_ChallengeChainSpVdf_" data-uid="chia.dotnet.RewardChainBlockUnfinished.ChallengeChainSpVdf*"></a>
   <h4 id="chia_dotnet_RewardChainBlockUnfinished_ChallengeChainSpVdf" data-uid="chia.dotnet.RewardChainBlockUnfinished.ChallengeChainSpVdf">ChallengeChainSpVdf</h4>
@@ -221,24 +179,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_RewardChainBlockUnfinished_PosSsCcChallengeHash.md&amp;value=---%0Auid%3A%20chia.dotnet.RewardChainBlockUnfinished.PosSsCcChallengeHash%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_RewardChainBlockUnfinished_PosSsCcChallengeHash.md&amp;value=---%0Auid%3A%20chia.dotnet.RewardChainBlockUnfinished.PosSsCcChallengeHash%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_RewardChainBlockUnfinished_PosSsCcChallengeHash.md&amp;value=---%0Auid%3A%20chia.dotnet.RewardChainBlockUnfinished.PosSsCcChallengeHash%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/RewardChainBlockUnfinished.cs/#L9">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/RewardChainBlockUnfinished.cs/#L9">View Source</a>
   </span>
   <a id="chia_dotnet_RewardChainBlockUnfinished_PosSsCcChallengeHash_" data-uid="chia.dotnet.RewardChainBlockUnfinished.PosSsCcChallengeHash*"></a>
   <h4 id="chia_dotnet_RewardChainBlockUnfinished_PosSsCcChallengeHash" data-uid="chia.dotnet.RewardChainBlockUnfinished.PosSsCcChallengeHash">PosSsCcChallengeHash</h4>
@@ -265,24 +209,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_RewardChainBlockUnfinished_ProofOfSpace.md&amp;value=---%0Auid%3A%20chia.dotnet.RewardChainBlockUnfinished.ProofOfSpace%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_RewardChainBlockUnfinished_ProofOfSpace.md&amp;value=---%0Auid%3A%20chia.dotnet.RewardChainBlockUnfinished.ProofOfSpace%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_RewardChainBlockUnfinished_ProofOfSpace.md&amp;value=---%0Auid%3A%20chia.dotnet.RewardChainBlockUnfinished.ProofOfSpace%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/RewardChainBlockUnfinished.cs/#L10">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/RewardChainBlockUnfinished.cs/#L10">View Source</a>
   </span>
   <a id="chia_dotnet_RewardChainBlockUnfinished_ProofOfSpace_" data-uid="chia.dotnet.RewardChainBlockUnfinished.ProofOfSpace*"></a>
   <h4 id="chia_dotnet_RewardChainBlockUnfinished_ProofOfSpace" data-uid="chia.dotnet.RewardChainBlockUnfinished.ProofOfSpace">ProofOfSpace</h4>
@@ -309,24 +239,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_RewardChainBlockUnfinished_RewardChainSpSignature.md&amp;value=---%0Auid%3A%20chia.dotnet.RewardChainBlockUnfinished.RewardChainSpSignature%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_RewardChainBlockUnfinished_RewardChainSpSignature.md&amp;value=---%0Auid%3A%20chia.dotnet.RewardChainBlockUnfinished.RewardChainSpSignature%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_RewardChainBlockUnfinished_RewardChainSpSignature.md&amp;value=---%0Auid%3A%20chia.dotnet.RewardChainBlockUnfinished.RewardChainSpSignature%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/RewardChainBlockUnfinished.cs/#L20">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/RewardChainBlockUnfinished.cs/#L20">View Source</a>
   </span>
   <a id="chia_dotnet_RewardChainBlockUnfinished_RewardChainSpSignature_" data-uid="chia.dotnet.RewardChainBlockUnfinished.RewardChainSpSignature*"></a>
   <h4 id="chia_dotnet_RewardChainBlockUnfinished_RewardChainSpSignature" data-uid="chia.dotnet.RewardChainBlockUnfinished.RewardChainSpSignature">RewardChainSpSignature</h4>
@@ -353,24 +269,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_RewardChainBlockUnfinished_RewardChainSpVdf.md&amp;value=---%0Auid%3A%20chia.dotnet.RewardChainBlockUnfinished.RewardChainSpVdf%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_RewardChainBlockUnfinished_RewardChainSpVdf.md&amp;value=---%0Auid%3A%20chia.dotnet.RewardChainBlockUnfinished.RewardChainSpVdf%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_RewardChainBlockUnfinished_RewardChainSpVdf.md&amp;value=---%0Auid%3A%20chia.dotnet.RewardChainBlockUnfinished.RewardChainSpVdf%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/RewardChainBlockUnfinished.cs/#L19">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/RewardChainBlockUnfinished.cs/#L19">View Source</a>
   </span>
   <a id="chia_dotnet_RewardChainBlockUnfinished_RewardChainSpVdf_" data-uid="chia.dotnet.RewardChainBlockUnfinished.RewardChainSpVdf*"></a>
   <h4 id="chia_dotnet_RewardChainBlockUnfinished_RewardChainSpVdf" data-uid="chia.dotnet.RewardChainBlockUnfinished.RewardChainSpVdf">RewardChainSpVdf</h4>
@@ -398,24 +300,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_RewardChainBlockUnfinished_SignagePointIndex.md&amp;value=---%0Auid%3A%20chia.dotnet.RewardChainBlockUnfinished.SignagePointIndex%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_RewardChainBlockUnfinished_SignagePointIndex.md&amp;value=---%0Auid%3A%20chia.dotnet.RewardChainBlockUnfinished.SignagePointIndex%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_RewardChainBlockUnfinished_SignagePointIndex.md&amp;value=---%0Auid%3A%20chia.dotnet.RewardChainBlockUnfinished.SignagePointIndex%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/RewardChainBlockUnfinished.cs/#L8">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/RewardChainBlockUnfinished.cs/#L8">View Source</a>
   </span>
   <a id="chia_dotnet_RewardChainBlockUnfinished_SignagePointIndex_" data-uid="chia.dotnet.RewardChainBlockUnfinished.SignagePointIndex*"></a>
   <h4 id="chia_dotnet_RewardChainBlockUnfinished_SignagePointIndex" data-uid="chia.dotnet.RewardChainBlockUnfinished.SignagePointIndex">SignagePointIndex</h4>
@@ -442,24 +330,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_RewardChainBlockUnfinished_TotalIters.md&amp;value=---%0Auid%3A%20chia.dotnet.RewardChainBlockUnfinished.TotalIters%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_RewardChainBlockUnfinished_TotalIters.md&amp;value=---%0Auid%3A%20chia.dotnet.RewardChainBlockUnfinished.TotalIters%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_RewardChainBlockUnfinished_TotalIters.md&amp;value=---%0Auid%3A%20chia.dotnet.RewardChainBlockUnfinished.TotalIters%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/RewardChainBlockUnfinished.cs/#L7">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/RewardChainBlockUnfinished.cs/#L7">View Source</a>
   </span>
   <a id="chia_dotnet_RewardChainBlockUnfinished_TotalIters_" data-uid="chia.dotnet.RewardChainBlockUnfinished.TotalIters*"></a>
   <h4 id="chia_dotnet_RewardChainBlockUnfinished_TotalIters" data-uid="chia.dotnet.RewardChainBlockUnfinished.TotalIters">TotalIters</h4>
@@ -496,24 +370,10 @@ <h3 id="implements">Implements</h3>
               <div class="contribution">
                 <ul class="nav">
                   <li>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-                    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_RewardChainBlockUnfinished.md&amp;value=---%0Auid%3A%20chia.dotnet.RewardChainBlockUnfinished%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-                    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_RewardChainBlockUnfinished.md&amp;value=---%0Auid%3A%20chia.dotnet.RewardChainBlockUnfinished%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-=======
                     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_RewardChainBlockUnfinished.md&amp;value=---%0Auid%3A%20chia.dotnet.RewardChainBlockUnfinished%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
                   </li>
                   <li>
-                    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/RewardChainBlockUnfinished.cs/#L5" class="contribution-link">View Source</a>
+                    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/RewardChainBlockUnfinished.cs/#L5" class="contribution-link">View Source</a>
                   </li>
                 </ul>
               </div>
diff --git a/docs/api/chia.dotnet.RewardChainSubSlot.html b/docs/api/chia.dotnet.RewardChainSubSlot.html
index 2696edbe..68b4c06b 100644
--- a/docs/api/chia.dotnet.RewardChainSubSlot.html
+++ b/docs/api/chia.dotnet.RewardChainSubSlot.html
@@ -90,21 +90,7 @@ <h5>Inherited Members</h5>
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object)">Object.Equals(Object)</a>
     </div>
     <div>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object-system-object)">Object.Equals(Object, Object)</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-      <span class="xref">System.Object.Equals(System.Object, System.Object)</span>
-=======
-      <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object-system-object)">Object.Equals(Object, Object)</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
     </div>
     <div>
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.gethashcode#system-object-gethashcode">Object.GetHashCode()</a>
@@ -132,24 +118,10 @@ <h3 id="properties">Properties
   </h3>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_RewardChainSubSlot_ChallengeChainSubSlotHash.md&amp;value=---%0Auid%3A%20chia.dotnet.RewardChainSubSlot.ChallengeChainSubSlotHash%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_RewardChainSubSlot_ChallengeChainSubSlotHash.md&amp;value=---%0Auid%3A%20chia.dotnet.RewardChainSubSlot.ChallengeChainSubSlotHash%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_RewardChainSubSlot_ChallengeChainSubSlotHash.md&amp;value=---%0Auid%3A%20chia.dotnet.RewardChainSubSlot.ChallengeChainSubSlotHash%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/RewardChainSubSlot.cs/#L6">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/RewardChainSubSlot.cs/#L6">View Source</a>
   </span>
   <a id="chia_dotnet_RewardChainSubSlot_ChallengeChainSubSlotHash_" data-uid="chia.dotnet.RewardChainSubSlot.ChallengeChainSubSlotHash*"></a>
   <h4 id="chia_dotnet_RewardChainSubSlot_ChallengeChainSubSlotHash" data-uid="chia.dotnet.RewardChainSubSlot.ChallengeChainSubSlotHash">ChallengeChainSubSlotHash</h4>
@@ -176,24 +148,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_RewardChainSubSlot_Deficit.md&amp;value=---%0Auid%3A%20chia.dotnet.RewardChainSubSlot.Deficit%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_RewardChainSubSlot_Deficit.md&amp;value=---%0Auid%3A%20chia.dotnet.RewardChainSubSlot.Deficit%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_RewardChainSubSlot_Deficit.md&amp;value=---%0Auid%3A%20chia.dotnet.RewardChainSubSlot.Deficit%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/RewardChainSubSlot.cs/#L11">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/RewardChainSubSlot.cs/#L11">View Source</a>
   </span>
   <a id="chia_dotnet_RewardChainSubSlot_Deficit_" data-uid="chia.dotnet.RewardChainSubSlot.Deficit*"></a>
   <h4 id="chia_dotnet_RewardChainSubSlot_Deficit" data-uid="chia.dotnet.RewardChainSubSlot.Deficit">Deficit</h4>
@@ -221,24 +179,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_RewardChainSubSlot_EndOfSlotVdf.md&amp;value=---%0Auid%3A%20chia.dotnet.RewardChainSubSlot.EndOfSlotVdf%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_RewardChainSubSlot_EndOfSlotVdf.md&amp;value=---%0Auid%3A%20chia.dotnet.RewardChainSubSlot.EndOfSlotVdf%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_RewardChainSubSlot_EndOfSlotVdf.md&amp;value=---%0Auid%3A%20chia.dotnet.RewardChainSubSlot.EndOfSlotVdf%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/RewardChainSubSlot.cs/#L5">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/RewardChainSubSlot.cs/#L5">View Source</a>
   </span>
   <a id="chia_dotnet_RewardChainSubSlot_EndOfSlotVdf_" data-uid="chia.dotnet.RewardChainSubSlot.EndOfSlotVdf*"></a>
   <h4 id="chia_dotnet_RewardChainSubSlot_EndOfSlotVdf" data-uid="chia.dotnet.RewardChainSubSlot.EndOfSlotVdf">EndOfSlotVdf</h4>
@@ -265,24 +209,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_RewardChainSubSlot_InfusedChallengeChainSubSlotHash.md&amp;value=---%0Auid%3A%20chia.dotnet.RewardChainSubSlot.InfusedChallengeChainSubSlotHash%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_RewardChainSubSlot_InfusedChallengeChainSubSlotHash.md&amp;value=---%0Auid%3A%20chia.dotnet.RewardChainSubSlot.InfusedChallengeChainSubSlotHash%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_RewardChainSubSlot_InfusedChallengeChainSubSlotHash.md&amp;value=---%0Auid%3A%20chia.dotnet.RewardChainSubSlot.InfusedChallengeChainSubSlotHash%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/RewardChainSubSlot.cs/#L7">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/RewardChainSubSlot.cs/#L7">View Source</a>
   </span>
   <a id="chia_dotnet_RewardChainSubSlot_InfusedChallengeChainSubSlotHash_" data-uid="chia.dotnet.RewardChainSubSlot.InfusedChallengeChainSubSlotHash*"></a>
   <h4 id="chia_dotnet_RewardChainSubSlot_InfusedChallengeChainSubSlotHash" data-uid="chia.dotnet.RewardChainSubSlot.InfusedChallengeChainSubSlotHash">InfusedChallengeChainSubSlotHash</h4>
@@ -319,24 +249,10 @@ <h3 id="implements">Implements</h3>
               <div class="contribution">
                 <ul class="nav">
                   <li>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-                    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_RewardChainSubSlot.md&amp;value=---%0Auid%3A%20chia.dotnet.RewardChainSubSlot%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-                    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_RewardChainSubSlot.md&amp;value=---%0Auid%3A%20chia.dotnet.RewardChainSubSlot%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-=======
                     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_RewardChainSubSlot.md&amp;value=---%0Auid%3A%20chia.dotnet.RewardChainSubSlot%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
                   </li>
                   <li>
-                    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/RewardChainSubSlot.cs/#L3" class="contribution-link">View Source</a>
+                    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/RewardChainSubSlot.cs/#L3" class="contribution-link">View Source</a>
                   </li>
                 </ul>
               </div>
diff --git a/docs/api/chia.dotnet.Root.html b/docs/api/chia.dotnet.Root.html
index 6eb23d1e..19d4512f 100644
--- a/docs/api/chia.dotnet.Root.html
+++ b/docs/api/chia.dotnet.Root.html
@@ -90,21 +90,7 @@ <h5>Inherited Members</h5>
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object)">Object.Equals(Object)</a>
     </div>
     <div>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object-system-object)">Object.Equals(Object, Object)</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-      <span class="xref">System.Object.Equals(System.Object, System.Object)</span>
-=======
-      <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object-system-object)">Object.Equals(Object, Object)</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
     </div>
     <div>
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.gethashcode#system-object-gethashcode">Object.GetHashCode()</a>
@@ -132,24 +118,10 @@ <h3 id="properties">Properties
   </h3>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_Root_Confirmed.md&amp;value=---%0Auid%3A%20chia.dotnet.Root.Confirmed%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_Root_Confirmed.md&amp;value=---%0Auid%3A%20chia.dotnet.Root.Confirmed%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_Root_Confirmed.md&amp;value=---%0Auid%3A%20chia.dotnet.Root.Confirmed%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/Root.cs/#L9">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/Root.cs/#L9">View Source</a>
   </span>
   <a id="chia_dotnet_Root_Confirmed_" data-uid="chia.dotnet.Root.Confirmed*"></a>
   <h4 id="chia_dotnet_Root_Confirmed" data-uid="chia.dotnet.Root.Confirmed">Confirmed</h4>
@@ -176,24 +148,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_Root_DateTimestamp.md&amp;value=---%0Auid%3A%20chia.dotnet.Root.DateTimestamp%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_Root_DateTimestamp.md&amp;value=---%0Auid%3A%20chia.dotnet.Root.DateTimestamp%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_Root_DateTimestamp.md&amp;value=---%0Auid%3A%20chia.dotnet.Root.DateTimestamp%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/Root.cs/#L11">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/Root.cs/#L11">View Source</a>
   </span>
   <a id="chia_dotnet_Root_DateTimestamp_" data-uid="chia.dotnet.Root.DateTimestamp*"></a>
   <h4 id="chia_dotnet_Root_DateTimestamp" data-uid="chia.dotnet.Root.DateTimestamp">DateTimestamp</h4>
@@ -221,24 +179,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_Root_Hash.md&amp;value=---%0Auid%3A%20chia.dotnet.Root.Hash%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_Root_Hash.md&amp;value=---%0Auid%3A%20chia.dotnet.Root.Hash%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_Root_Hash.md&amp;value=---%0Auid%3A%20chia.dotnet.Root.Hash%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/Root.cs/#L8">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/Root.cs/#L8">View Source</a>
   </span>
   <a id="chia_dotnet_Root_Hash_" data-uid="chia.dotnet.Root.Hash*"></a>
   <h4 id="chia_dotnet_Root_Hash" data-uid="chia.dotnet.Root.Hash">Hash</h4>
@@ -265,24 +209,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_Root_Timestamp.md&amp;value=---%0Auid%3A%20chia.dotnet.Root.Timestamp%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_Root_Timestamp.md&amp;value=---%0Auid%3A%20chia.dotnet.Root.Timestamp%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_Root_Timestamp.md&amp;value=---%0Auid%3A%20chia.dotnet.Root.Timestamp%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/Root.cs/#L10">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/Root.cs/#L10">View Source</a>
   </span>
   <a id="chia_dotnet_Root_Timestamp_" data-uid="chia.dotnet.Root.Timestamp*"></a>
   <h4 id="chia_dotnet_Root_Timestamp" data-uid="chia.dotnet.Root.Timestamp">Timestamp</h4>
@@ -319,24 +249,10 @@ <h3 id="implements">Implements</h3>
               <div class="contribution">
                 <ul class="nav">
                   <li>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-                    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_Root.md&amp;value=---%0Auid%3A%20chia.dotnet.Root%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-                    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_Root.md&amp;value=---%0Auid%3A%20chia.dotnet.Root%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-=======
                     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_Root.md&amp;value=---%0Auid%3A%20chia.dotnet.Root%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
                   </li>
                   <li>
-                    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/Root.cs/#L6" class="contribution-link">View Source</a>
+                    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/Root.cs/#L6" class="contribution-link">View Source</a>
                   </li>
                 </ul>
               </div>
diff --git a/docs/api/chia.dotnet.RootHash.html b/docs/api/chia.dotnet.RootHash.html
index c2646343..2551ceec 100644
--- a/docs/api/chia.dotnet.RootHash.html
+++ b/docs/api/chia.dotnet.RootHash.html
@@ -90,21 +90,7 @@ <h5>Inherited Members</h5>
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object)">Object.Equals(Object)</a>
     </div>
     <div>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object-system-object)">Object.Equals(Object, Object)</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-      <span class="xref">System.Object.Equals(System.Object, System.Object)</span>
-=======
-      <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object-system-object)">Object.Equals(Object, Object)</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
     </div>
     <div>
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.gethashcode#system-object-gethashcode">Object.GetHashCode()</a>
@@ -132,24 +118,10 @@ <h3 id="properties">Properties
   </h3>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_RootHash_Confirmed.md&amp;value=---%0Auid%3A%20chia.dotnet.RootHash.Confirmed%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_RootHash_Confirmed.md&amp;value=---%0Auid%3A%20chia.dotnet.RootHash.Confirmed%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_RootHash_Confirmed.md&amp;value=---%0Auid%3A%20chia.dotnet.RootHash.Confirmed%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/Root.cs/#L28">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/Root.cs/#L28">View Source</a>
   </span>
   <a id="chia_dotnet_RootHash_Confirmed_" data-uid="chia.dotnet.RootHash.Confirmed*"></a>
   <h4 id="chia_dotnet_RootHash_Confirmed" data-uid="chia.dotnet.RootHash.Confirmed">Confirmed</h4>
@@ -176,24 +148,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_RootHash_DateTimestamp.md&amp;value=---%0Auid%3A%20chia.dotnet.RootHash.DateTimestamp%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_RootHash_DateTimestamp.md&amp;value=---%0Auid%3A%20chia.dotnet.RootHash.DateTimestamp%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_RootHash_DateTimestamp.md&amp;value=---%0Auid%3A%20chia.dotnet.RootHash.DateTimestamp%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/Root.cs/#L30">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/Root.cs/#L30">View Source</a>
   </span>
   <a id="chia_dotnet_RootHash_DateTimestamp_" data-uid="chia.dotnet.RootHash.DateTimestamp*"></a>
   <h4 id="chia_dotnet_RootHash_DateTimestamp" data-uid="chia.dotnet.RootHash.DateTimestamp">DateTimestamp</h4>
@@ -221,24 +179,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_RootHash_Hash.md&amp;value=---%0Auid%3A%20chia.dotnet.RootHash.Hash%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_RootHash_Hash.md&amp;value=---%0Auid%3A%20chia.dotnet.RootHash.Hash%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_RootHash_Hash.md&amp;value=---%0Auid%3A%20chia.dotnet.RootHash.Hash%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/Root.cs/#L27">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/Root.cs/#L27">View Source</a>
   </span>
   <a id="chia_dotnet_RootHash_Hash_" data-uid="chia.dotnet.RootHash.Hash*"></a>
   <h4 id="chia_dotnet_RootHash_Hash" data-uid="chia.dotnet.RootHash.Hash">Hash</h4>
@@ -265,24 +209,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_RootHash_Id.md&amp;value=---%0Auid%3A%20chia.dotnet.RootHash.Id%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_RootHash_Id.md&amp;value=---%0Auid%3A%20chia.dotnet.RootHash.Id%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_RootHash_Id.md&amp;value=---%0Auid%3A%20chia.dotnet.RootHash.Id%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/Root.cs/#L26">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/Root.cs/#L26">View Source</a>
   </span>
   <a id="chia_dotnet_RootHash_Id_" data-uid="chia.dotnet.RootHash.Id*"></a>
   <h4 id="chia_dotnet_RootHash_Id" data-uid="chia.dotnet.RootHash.Id">Id</h4>
@@ -309,24 +239,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_RootHash_Timestamp.md&amp;value=---%0Auid%3A%20chia.dotnet.RootHash.Timestamp%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_RootHash_Timestamp.md&amp;value=---%0Auid%3A%20chia.dotnet.RootHash.Timestamp%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_RootHash_Timestamp.md&amp;value=---%0Auid%3A%20chia.dotnet.RootHash.Timestamp%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/Root.cs/#L29">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/Root.cs/#L29">View Source</a>
   </span>
   <a id="chia_dotnet_RootHash_Timestamp_" data-uid="chia.dotnet.RootHash.Timestamp*"></a>
   <h4 id="chia_dotnet_RootHash_Timestamp" data-uid="chia.dotnet.RootHash.Timestamp">Timestamp</h4>
@@ -363,24 +279,10 @@ <h3 id="implements">Implements</h3>
               <div class="contribution">
                 <ul class="nav">
                   <li>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-                    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_RootHash.md&amp;value=---%0Auid%3A%20chia.dotnet.RootHash%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-                    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_RootHash.md&amp;value=---%0Auid%3A%20chia.dotnet.RootHash%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-=======
                     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_RootHash.md&amp;value=---%0Auid%3A%20chia.dotnet.RootHash%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
                   </li>
                   <li>
-                    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/Root.cs/#L24" class="contribution-link">View Source</a>
+                    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/Root.cs/#L24" class="contribution-link">View Source</a>
                   </li>
                 </ul>
               </div>
diff --git a/docs/api/chia.dotnet.RootHistory.html b/docs/api/chia.dotnet.RootHistory.html
index 100f3cc0..a567990f 100644
--- a/docs/api/chia.dotnet.RootHistory.html
+++ b/docs/api/chia.dotnet.RootHistory.html
@@ -90,21 +90,7 @@ <h5>Inherited Members</h5>
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object)">Object.Equals(Object)</a>
     </div>
     <div>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object-system-object)">Object.Equals(Object, Object)</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-      <span class="xref">System.Object.Equals(System.Object, System.Object)</span>
-=======
-      <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object-system-object)">Object.Equals(Object, Object)</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
     </div>
     <div>
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.gethashcode#system-object-gethashcode">Object.GetHashCode()</a>
@@ -132,24 +118,10 @@ <h3 id="properties">Properties
   </h3>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_RootHistory_Confirmed.md&amp;value=---%0Auid%3A%20chia.dotnet.RootHistory.Confirmed%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_RootHistory_Confirmed.md&amp;value=---%0Auid%3A%20chia.dotnet.RootHistory.Confirmed%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_RootHistory_Confirmed.md&amp;value=---%0Auid%3A%20chia.dotnet.RootHistory.Confirmed%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/Root.cs/#L18">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/Root.cs/#L18">View Source</a>
   </span>
   <a id="chia_dotnet_RootHistory_Confirmed_" data-uid="chia.dotnet.RootHistory.Confirmed*"></a>
   <h4 id="chia_dotnet_RootHistory_Confirmed" data-uid="chia.dotnet.RootHistory.Confirmed">Confirmed</h4>
@@ -176,24 +148,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_RootHistory_DateTimestamp.md&amp;value=---%0Auid%3A%20chia.dotnet.RootHistory.DateTimestamp%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_RootHistory_DateTimestamp.md&amp;value=---%0Auid%3A%20chia.dotnet.RootHistory.DateTimestamp%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_RootHistory_DateTimestamp.md&amp;value=---%0Auid%3A%20chia.dotnet.RootHistory.DateTimestamp%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/Root.cs/#L20">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/Root.cs/#L20">View Source</a>
   </span>
   <a id="chia_dotnet_RootHistory_DateTimestamp_" data-uid="chia.dotnet.RootHistory.DateTimestamp*"></a>
   <h4 id="chia_dotnet_RootHistory_DateTimestamp" data-uid="chia.dotnet.RootHistory.DateTimestamp">DateTimestamp</h4>
@@ -221,24 +179,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_RootHistory_RootHash.md&amp;value=---%0Auid%3A%20chia.dotnet.RootHistory.RootHash%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_RootHistory_RootHash.md&amp;value=---%0Auid%3A%20chia.dotnet.RootHistory.RootHash%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_RootHistory_RootHash.md&amp;value=---%0Auid%3A%20chia.dotnet.RootHistory.RootHash%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/Root.cs/#L17">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/Root.cs/#L17">View Source</a>
   </span>
   <a id="chia_dotnet_RootHistory_RootHash_" data-uid="chia.dotnet.RootHistory.RootHash*"></a>
   <h4 id="chia_dotnet_RootHistory_RootHash" data-uid="chia.dotnet.RootHistory.RootHash">RootHash</h4>
@@ -265,24 +209,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_RootHistory_Timestamp.md&amp;value=---%0Auid%3A%20chia.dotnet.RootHistory.Timestamp%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_RootHistory_Timestamp.md&amp;value=---%0Auid%3A%20chia.dotnet.RootHistory.Timestamp%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_RootHistory_Timestamp.md&amp;value=---%0Auid%3A%20chia.dotnet.RootHistory.Timestamp%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/Root.cs/#L19">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/Root.cs/#L19">View Source</a>
   </span>
   <a id="chia_dotnet_RootHistory_Timestamp_" data-uid="chia.dotnet.RootHistory.Timestamp*"></a>
   <h4 id="chia_dotnet_RootHistory_Timestamp" data-uid="chia.dotnet.RootHistory.Timestamp">Timestamp</h4>
@@ -319,24 +249,10 @@ <h3 id="implements">Implements</h3>
               <div class="contribution">
                 <ul class="nav">
                   <li>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-                    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_RootHistory.md&amp;value=---%0Auid%3A%20chia.dotnet.RootHistory%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-                    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_RootHistory.md&amp;value=---%0Auid%3A%20chia.dotnet.RootHistory%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-=======
                     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_RootHistory.md&amp;value=---%0Auid%3A%20chia.dotnet.RootHistory%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
                   </li>
                   <li>
-                    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/Root.cs/#L15" class="contribution-link">View Source</a>
+                    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/Root.cs/#L15" class="contribution-link">View Source</a>
                   </li>
                 </ul>
               </div>
diff --git a/docs/api/chia.dotnet.RoyaltyAsset.html b/docs/api/chia.dotnet.RoyaltyAsset.html
index 1ce3498d..26814743 100644
--- a/docs/api/chia.dotnet.RoyaltyAsset.html
+++ b/docs/api/chia.dotnet.RoyaltyAsset.html
@@ -90,21 +90,7 @@ <h5>Inherited Members</h5>
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object)">Object.Equals(Object)</a>
     </div>
     <div>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object-system-object)">Object.Equals(Object, Object)</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-      <span class="xref">System.Object.Equals(System.Object, System.Object)</span>
-=======
-      <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object-system-object)">Object.Equals(Object, Object)</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
     </div>
     <div>
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.gethashcode#system-object-gethashcode">Object.GetHashCode()</a>
@@ -132,24 +118,10 @@ <h3 id="properties">Properties
   </h3>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_RoyaltyAsset_Asset.md&amp;value=---%0Auid%3A%20chia.dotnet.RoyaltyAsset.Asset%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_RoyaltyAsset_Asset.md&amp;value=---%0Auid%3A%20chia.dotnet.RoyaltyAsset.Asset%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_RoyaltyAsset_Asset.md&amp;value=---%0Auid%3A%20chia.dotnet.RoyaltyAsset.Asset%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/Asset.cs/#L18">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/Asset.cs/#L18">View Source</a>
   </span>
   <a id="chia_dotnet_RoyaltyAsset_Asset_" data-uid="chia.dotnet.RoyaltyAsset.Asset*"></a>
   <h4 id="chia_dotnet_RoyaltyAsset_Asset" data-uid="chia.dotnet.RoyaltyAsset.Asset">Asset</h4>
@@ -176,24 +148,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_RoyaltyAsset_RoyaltyAddress.md&amp;value=---%0Auid%3A%20chia.dotnet.RoyaltyAsset.RoyaltyAddress%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_RoyaltyAsset_RoyaltyAddress.md&amp;value=---%0Auid%3A%20chia.dotnet.RoyaltyAsset.RoyaltyAddress%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_RoyaltyAsset_RoyaltyAddress.md&amp;value=---%0Auid%3A%20chia.dotnet.RoyaltyAsset.RoyaltyAddress%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/Asset.cs/#L19">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/Asset.cs/#L19">View Source</a>
   </span>
   <a id="chia_dotnet_RoyaltyAsset_RoyaltyAddress_" data-uid="chia.dotnet.RoyaltyAsset.RoyaltyAddress*"></a>
   <h4 id="chia_dotnet_RoyaltyAsset_RoyaltyAddress" data-uid="chia.dotnet.RoyaltyAsset.RoyaltyAddress">RoyaltyAddress</h4>
@@ -220,24 +178,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_RoyaltyAsset_RoyaltyPercentage.md&amp;value=---%0Auid%3A%20chia.dotnet.RoyaltyAsset.RoyaltyPercentage%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_RoyaltyAsset_RoyaltyPercentage.md&amp;value=---%0Auid%3A%20chia.dotnet.RoyaltyAsset.RoyaltyPercentage%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_RoyaltyAsset_RoyaltyPercentage.md&amp;value=---%0Auid%3A%20chia.dotnet.RoyaltyAsset.RoyaltyPercentage%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/Asset.cs/#L20">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/Asset.cs/#L20">View Source</a>
   </span>
   <a id="chia_dotnet_RoyaltyAsset_RoyaltyPercentage_" data-uid="chia.dotnet.RoyaltyAsset.RoyaltyPercentage*"></a>
   <h4 id="chia_dotnet_RoyaltyAsset_RoyaltyPercentage" data-uid="chia.dotnet.RoyaltyAsset.RoyaltyPercentage">RoyaltyPercentage</h4>
@@ -274,24 +218,10 @@ <h3 id="implements">Implements</h3>
               <div class="contribution">
                 <ul class="nav">
                   <li>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-                    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_RoyaltyAsset.md&amp;value=---%0Auid%3A%20chia.dotnet.RoyaltyAsset%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-                    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_RoyaltyAsset.md&amp;value=---%0Auid%3A%20chia.dotnet.RoyaltyAsset%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-=======
                     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_RoyaltyAsset.md&amp;value=---%0Auid%3A%20chia.dotnet.RoyaltyAsset%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
                   </li>
                   <li>
-                    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/Asset.cs/#L16" class="contribution-link">View Source</a>
+                    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/Asset.cs/#L16" class="contribution-link">View Source</a>
                   </li>
                 </ul>
               </div>
diff --git a/docs/api/chia.dotnet.SendPeer.html b/docs/api/chia.dotnet.SendPeer.html
index dfa0c485..3c37d257 100644
--- a/docs/api/chia.dotnet.SendPeer.html
+++ b/docs/api/chia.dotnet.SendPeer.html
@@ -92,21 +92,7 @@ <h5>Inherited Members</h5>
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object)">Object.Equals(Object)</a>
     </div>
     <div>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object-system-object)">Object.Equals(Object, Object)</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-      <span class="xref">System.Object.Equals(System.Object, System.Object)</span>
-=======
-      <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object-system-object)">Object.Equals(Object, Object)</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
     </div>
     <div>
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.gethashcode#system-object-gethashcode">Object.GetHashCode()</a>
@@ -138,24 +124,10 @@ <h3 id="properties">Properties
   </h3>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_SendPeer_ErrorMessage.md&amp;value=---%0Auid%3A%20chia.dotnet.SendPeer.ErrorMessage%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_SendPeer_ErrorMessage.md&amp;value=---%0Auid%3A%20chia.dotnet.SendPeer.ErrorMessage%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_SendPeer_ErrorMessage.md&amp;value=---%0Auid%3A%20chia.dotnet.SendPeer.ErrorMessage%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/SendPeer.cs/#L16">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/SendPeer.cs/#L16">View Source</a>
   </span>
   <a id="chia_dotnet_SendPeer_ErrorMessage_" data-uid="chia.dotnet.SendPeer.ErrorMessage*"></a>
   <h4 id="chia_dotnet_SendPeer_ErrorMessage" data-uid="chia.dotnet.SendPeer.ErrorMessage">ErrorMessage</h4>
@@ -182,24 +154,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_SendPeer_MempoolInclusionStatus.md&amp;value=---%0Auid%3A%20chia.dotnet.SendPeer.MempoolInclusionStatus%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_SendPeer_MempoolInclusionStatus.md&amp;value=---%0Auid%3A%20chia.dotnet.SendPeer.MempoolInclusionStatus%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_SendPeer_MempoolInclusionStatus.md&amp;value=---%0Auid%3A%20chia.dotnet.SendPeer.MempoolInclusionStatus%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/SendPeer.cs/#L15">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/SendPeer.cs/#L15">View Source</a>
   </span>
   <a id="chia_dotnet_SendPeer_MempoolInclusionStatus_" data-uid="chia.dotnet.SendPeer.MempoolInclusionStatus*"></a>
   <h4 id="chia_dotnet_SendPeer_MempoolInclusionStatus" data-uid="chia.dotnet.SendPeer.MempoolInclusionStatus">MempoolInclusionStatus</h4>
@@ -226,24 +184,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_SendPeer_Peer.md&amp;value=---%0Auid%3A%20chia.dotnet.SendPeer.Peer%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_SendPeer_Peer.md&amp;value=---%0Auid%3A%20chia.dotnet.SendPeer.Peer%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_SendPeer_Peer.md&amp;value=---%0Auid%3A%20chia.dotnet.SendPeer.Peer%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/SendPeer.cs/#L14">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/SendPeer.cs/#L14">View Source</a>
   </span>
   <a id="chia_dotnet_SendPeer_Peer_" data-uid="chia.dotnet.SendPeer.Peer*"></a>
   <h4 id="chia_dotnet_SendPeer_Peer" data-uid="chia.dotnet.SendPeer.Peer">Peer</h4>
@@ -280,24 +224,10 @@ <h3 id="implements">Implements</h3>
               <div class="contribution">
                 <ul class="nav">
                   <li>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-                    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_SendPeer.md&amp;value=---%0Auid%3A%20chia.dotnet.SendPeer%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-                    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_SendPeer.md&amp;value=---%0Auid%3A%20chia.dotnet.SendPeer%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-=======
                     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_SendPeer.md&amp;value=---%0Auid%3A%20chia.dotnet.SendPeer%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
                   </li>
                   <li>
-                    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/SendPeer.cs/#L11" class="contribution-link">View Source</a>
+                    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/SendPeer.cs/#L11" class="contribution-link">View Source</a>
                   </li>
                 </ul>
               </div>
diff --git a/docs/api/chia.dotnet.ServiceNames.html b/docs/api/chia.dotnet.ServiceNames.html
index d30ec45b..14dbf2ab 100644
--- a/docs/api/chia.dotnet.ServiceNames.html
+++ b/docs/api/chia.dotnet.ServiceNames.html
@@ -88,21 +88,7 @@ <h5>Inherited Members</h5>
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.valuetype.tostring#system-valuetype-tostring">ValueType.ToString()</a>
     </div>
     <div>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object-system-object)">Object.Equals(Object, Object)</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-      <span class="xref">System.Object.Equals(System.Object, System.Object)</span>
-=======
-      <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object-system-object)">Object.Equals(Object, Object)</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
     </div>
     <div>
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.gettype#system-object-gettype">Object.GetType()</a>
@@ -121,24 +107,10 @@ <h3 id="fields">Fields
   </h3>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_ServiceNames_Crawler.md&amp;value=---%0Auid%3A%20chia.dotnet.ServiceNames.Crawler%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_ServiceNames_Crawler.md&amp;value=---%0Auid%3A%20chia.dotnet.ServiceNames.Crawler%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_ServiceNames_Crawler.md&amp;value=---%0Auid%3A%20chia.dotnet.ServiceNames.Crawler%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ServiceNames.cs/#L15">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ServiceNames.cs/#L15">View Source</a>
   </span>
   <h4 id="chia_dotnet_ServiceNames_Crawler" data-uid="chia.dotnet.ServiceNames.Crawler">Crawler</h4>
   <div class="markdown level1 summary"></div>
@@ -164,24 +136,10 @@ <h5 class="fieldValue">Field Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_ServiceNames_Daemon.md&amp;value=---%0Auid%3A%20chia.dotnet.ServiceNames.Daemon%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_ServiceNames_Daemon.md&amp;value=---%0Auid%3A%20chia.dotnet.ServiceNames.Daemon%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_ServiceNames_Daemon.md&amp;value=---%0Auid%3A%20chia.dotnet.ServiceNames.Daemon%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ServiceNames.cs/#L14">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ServiceNames.cs/#L14">View Source</a>
   </span>
   <h4 id="chia_dotnet_ServiceNames_Daemon" data-uid="chia.dotnet.ServiceNames.Daemon">Daemon</h4>
   <div class="markdown level1 summary"></div>
@@ -207,24 +165,10 @@ <h5 class="fieldValue">Field Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_ServiceNames_DataLayer.md&amp;value=---%0Auid%3A%20chia.dotnet.ServiceNames.DataLayer%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_ServiceNames_DataLayer.md&amp;value=---%0Auid%3A%20chia.dotnet.ServiceNames.DataLayer%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_ServiceNames_DataLayer.md&amp;value=---%0Auid%3A%20chia.dotnet.ServiceNames.DataLayer%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ServiceNames.cs/#L16">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ServiceNames.cs/#L16">View Source</a>
   </span>
   <h4 id="chia_dotnet_ServiceNames_DataLayer" data-uid="chia.dotnet.ServiceNames.DataLayer">DataLayer</h4>
   <div class="markdown level1 summary"></div>
@@ -250,24 +194,10 @@ <h5 class="fieldValue">Field Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_ServiceNames_Farmer.md&amp;value=---%0Auid%3A%20chia.dotnet.ServiceNames.Farmer%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_ServiceNames_Farmer.md&amp;value=---%0Auid%3A%20chia.dotnet.ServiceNames.Farmer%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_ServiceNames_Farmer.md&amp;value=---%0Auid%3A%20chia.dotnet.ServiceNames.Farmer%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ServiceNames.cs/#L10">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ServiceNames.cs/#L10">View Source</a>
   </span>
   <h4 id="chia_dotnet_ServiceNames_Farmer" data-uid="chia.dotnet.ServiceNames.Farmer">Farmer</h4>
   <div class="markdown level1 summary"></div>
@@ -293,24 +223,10 @@ <h5 class="fieldValue">Field Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_ServiceNames_FullNode.md&amp;value=---%0Auid%3A%20chia.dotnet.ServiceNames.FullNode%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_ServiceNames_FullNode.md&amp;value=---%0Auid%3A%20chia.dotnet.ServiceNames.FullNode%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_ServiceNames_FullNode.md&amp;value=---%0Auid%3A%20chia.dotnet.ServiceNames.FullNode%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ServiceNames.cs/#L8">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ServiceNames.cs/#L8">View Source</a>
   </span>
   <h4 id="chia_dotnet_ServiceNames_FullNode" data-uid="chia.dotnet.ServiceNames.FullNode">FullNode</h4>
   <div class="markdown level1 summary"></div>
@@ -336,24 +252,10 @@ <h5 class="fieldValue">Field Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_ServiceNames_Harvester.md&amp;value=---%0Auid%3A%20chia.dotnet.ServiceNames.Harvester%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_ServiceNames_Harvester.md&amp;value=---%0Auid%3A%20chia.dotnet.ServiceNames.Harvester%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_ServiceNames_Harvester.md&amp;value=---%0Auid%3A%20chia.dotnet.ServiceNames.Harvester%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ServiceNames.cs/#L11">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ServiceNames.cs/#L11">View Source</a>
   </span>
   <h4 id="chia_dotnet_ServiceNames_Harvester" data-uid="chia.dotnet.ServiceNames.Harvester">Harvester</h4>
   <div class="markdown level1 summary"></div>
@@ -379,24 +281,10 @@ <h5 class="fieldValue">Field Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_ServiceNames_Plotter.md&amp;value=---%0Auid%3A%20chia.dotnet.ServiceNames.Plotter%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_ServiceNames_Plotter.md&amp;value=---%0Auid%3A%20chia.dotnet.ServiceNames.Plotter%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_ServiceNames_Plotter.md&amp;value=---%0Auid%3A%20chia.dotnet.ServiceNames.Plotter%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ServiceNames.cs/#L13">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ServiceNames.cs/#L13">View Source</a>
   </span>
   <h4 id="chia_dotnet_ServiceNames_Plotter" data-uid="chia.dotnet.ServiceNames.Plotter">Plotter</h4>
   <div class="markdown level1 summary"></div>
@@ -422,24 +310,10 @@ <h5 class="fieldValue">Field Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_ServiceNames_Simulator.md&amp;value=---%0Auid%3A%20chia.dotnet.ServiceNames.Simulator%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_ServiceNames_Simulator.md&amp;value=---%0Auid%3A%20chia.dotnet.ServiceNames.Simulator%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_ServiceNames_Simulator.md&amp;value=---%0Auid%3A%20chia.dotnet.ServiceNames.Simulator%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ServiceNames.cs/#L12">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ServiceNames.cs/#L12">View Source</a>
   </span>
   <h4 id="chia_dotnet_ServiceNames_Simulator" data-uid="chia.dotnet.ServiceNames.Simulator">Simulator</h4>
   <div class="markdown level1 summary"></div>
@@ -465,24 +339,10 @@ <h5 class="fieldValue">Field Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_ServiceNames_Wallet.md&amp;value=---%0Auid%3A%20chia.dotnet.ServiceNames.Wallet%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_ServiceNames_Wallet.md&amp;value=---%0Auid%3A%20chia.dotnet.ServiceNames.Wallet%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_ServiceNames_Wallet.md&amp;value=---%0Auid%3A%20chia.dotnet.ServiceNames.Wallet%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ServiceNames.cs/#L9">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ServiceNames.cs/#L9">View Source</a>
   </span>
   <h4 id="chia_dotnet_ServiceNames_Wallet" data-uid="chia.dotnet.ServiceNames.Wallet">Wallet</h4>
   <div class="markdown level1 summary"></div>
@@ -514,24 +374,10 @@ <h5 class="fieldValue">Field Value</h5>
               <div class="contribution">
                 <ul class="nav">
                   <li>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-                    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_ServiceNames.md&amp;value=---%0Auid%3A%20chia.dotnet.ServiceNames%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-                    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_ServiceNames.md&amp;value=---%0Auid%3A%20chia.dotnet.ServiceNames%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-=======
                     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_ServiceNames.md&amp;value=---%0Auid%3A%20chia.dotnet.ServiceNames%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
                   </li>
                   <li>
-                    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ServiceNames.cs/#L6" class="contribution-link">View Source</a>
+                    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ServiceNames.cs/#L6" class="contribution-link">View Source</a>
                   </li>
                 </ul>
               </div>
diff --git a/docs/api/chia.dotnet.ServiceProxy.html b/docs/api/chia.dotnet.ServiceProxy.html
index ba195472..efe6341a 100644
--- a/docs/api/chia.dotnet.ServiceProxy.html
+++ b/docs/api/chia.dotnet.ServiceProxy.html
@@ -126,24 +126,10 @@ <h3 id="constructors">Constructors
   </h3>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_ServiceProxy__ctor_chia_dotnet_IRpcClient_System_String_System_String_.md&amp;value=---%0Auid%3A%20chia.dotnet.ServiceProxy.%23ctor(chia.dotnet.IRpcClient%2CSystem.String%2CSystem.String)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_ServiceProxy__ctor_chia_dotnet_IRpcClient_System_String_System_String_.md&amp;value=---%0Auid%3A%20chia.dotnet.ServiceProxy.%23ctor(chia.dotnet.IRpcClient%2CSystem.String%2CSystem.String)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_ServiceProxy__ctor_chia_dotnet_IRpcClient_System_String_System_String_.md&amp;value=---%0Auid%3A%20chia.dotnet.ServiceProxy.%23ctor(chia.dotnet.IRpcClient%2CSystem.String%2CSystem.String)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ServiceProxy.cs/#L21">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ServiceProxy.cs/#L21">View Source</a>
   </span>
   <a id="chia_dotnet_ServiceProxy__ctor_" data-uid="chia.dotnet.ServiceProxy.#ctor*"></a>
   <h4 id="chia_dotnet_ServiceProxy__ctor_chia_dotnet_IRpcClient_System_String_System_String_" data-uid="chia.dotnet.ServiceProxy.#ctor(chia.dotnet.IRpcClient,System.String,System.String)">ServiceProxy(IRpcClient, String, String)</h4>
@@ -188,24 +174,10 @@ <h3 id="properties">Properties
   </h3>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_ServiceProxy_DestinationService.md&amp;value=---%0Auid%3A%20chia.dotnet.ServiceProxy.DestinationService%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_ServiceProxy_DestinationService.md&amp;value=---%0Auid%3A%20chia.dotnet.ServiceProxy.DestinationService%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_ServiceProxy_DestinationService.md&amp;value=---%0Auid%3A%20chia.dotnet.ServiceProxy.DestinationService%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ServiceProxy.cs/#L48">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ServiceProxy.cs/#L48">View Source</a>
   </span>
   <a id="chia_dotnet_ServiceProxy_DestinationService_" data-uid="chia.dotnet.ServiceProxy.DestinationService*"></a>
   <h4 id="chia_dotnet_ServiceProxy_DestinationService" data-uid="chia.dotnet.ServiceProxy.DestinationService">DestinationService</h4>
@@ -233,24 +205,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_ServiceProxy_OriginService.md&amp;value=---%0Auid%3A%20chia.dotnet.ServiceProxy.OriginService%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_ServiceProxy_OriginService.md&amp;value=---%0Auid%3A%20chia.dotnet.ServiceProxy.OriginService%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_ServiceProxy_OriginService.md&amp;value=---%0Auid%3A%20chia.dotnet.ServiceProxy.OriginService%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ServiceProxy.cs/#L43">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ServiceProxy.cs/#L43">View Source</a>
   </span>
   <a id="chia_dotnet_ServiceProxy_OriginService_" data-uid="chia.dotnet.ServiceProxy.OriginService*"></a>
   <h4 id="chia_dotnet_ServiceProxy_OriginService" data-uid="chia.dotnet.ServiceProxy.OriginService">OriginService</h4>
@@ -279,24 +237,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_ServiceProxy_RpcClient.md&amp;value=---%0Auid%3A%20chia.dotnet.ServiceProxy.RpcClient%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_ServiceProxy_RpcClient.md&amp;value=---%0Auid%3A%20chia.dotnet.ServiceProxy.RpcClient%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_ServiceProxy_RpcClient.md&amp;value=---%0Auid%3A%20chia.dotnet.ServiceProxy.RpcClient%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ServiceProxy.cs/#L53">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ServiceProxy.cs/#L53">View Source</a>
   </span>
   <a id="chia_dotnet_ServiceProxy_RpcClient_" data-uid="chia.dotnet.ServiceProxy.RpcClient*"></a>
   <h4 id="chia_dotnet_ServiceProxy_RpcClient" data-uid="chia.dotnet.ServiceProxy.RpcClient">RpcClient</h4>
@@ -326,24 +270,10 @@ <h3 id="methods">Methods
   </h3>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_ServiceProxy_CloseConnection_System_String_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.ServiceProxy.CloseConnection(System.String%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_ServiceProxy_CloseConnection_System_String_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.ServiceProxy.CloseConnection(System.String%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_ServiceProxy_CloseConnection_System_String_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.ServiceProxy.CloseConnection(System.String%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ServiceProxy.cs/#L123">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ServiceProxy.cs/#L123">View Source</a>
   </span>
   <a id="chia_dotnet_ServiceProxy_CloseConnection_" data-uid="chia.dotnet.ServiceProxy.CloseConnection*"></a>
   <h4 id="chia_dotnet_ServiceProxy_CloseConnection_System_String_System_Threading_CancellationToken_" data-uid="chia.dotnet.ServiceProxy.CloseConnection(System.String,System.Threading.CancellationToken)">CloseConnection(String, CancellationToken)</h4>
@@ -396,24 +326,10 @@ <h5 class="returns">Returns</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_ServiceProxy_GetConnections_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.ServiceProxy.GetConnections(System.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_ServiceProxy_GetConnections_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.ServiceProxy.GetConnections(System.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_ServiceProxy_GetConnections_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.ServiceProxy.GetConnections(System.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ServiceProxy.cs/#L81">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ServiceProxy.cs/#L81">View Source</a>
   </span>
   <a id="chia_dotnet_ServiceProxy_GetConnections_" data-uid="chia.dotnet.ServiceProxy.GetConnections*"></a>
   <h4 id="chia_dotnet_ServiceProxy_GetConnections_System_Threading_CancellationToken_" data-uid="chia.dotnet.ServiceProxy.GetConnections(System.Threading.CancellationToken)">GetConnections(CancellationToken)</h4>
@@ -460,24 +376,10 @@ <h5 class="returns">Returns</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_ServiceProxy_GetRoutes_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.ServiceProxy.GetRoutes(System.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_ServiceProxy_GetRoutes_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.ServiceProxy.GetRoutes(System.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_ServiceProxy_GetRoutes_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.ServiceProxy.GetRoutes(System.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ServiceProxy.cs/#L91">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ServiceProxy.cs/#L91">View Source</a>
   </span>
   <a id="chia_dotnet_ServiceProxy_GetRoutes_" data-uid="chia.dotnet.ServiceProxy.GetRoutes*"></a>
   <h4 id="chia_dotnet_ServiceProxy_GetRoutes_System_Threading_CancellationToken_" data-uid="chia.dotnet.ServiceProxy.GetRoutes(System.Threading.CancellationToken)">GetRoutes(CancellationToken)</h4>
@@ -524,24 +426,10 @@ <h5 class="returns">Returns</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_ServiceProxy_HealthZ_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.ServiceProxy.HealthZ(System.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_ServiceProxy_HealthZ_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.ServiceProxy.HealthZ(System.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_ServiceProxy_HealthZ_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.ServiceProxy.HealthZ(System.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ServiceProxy.cs/#L61">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ServiceProxy.cs/#L61">View Source</a>
   </span>
   <a id="chia_dotnet_ServiceProxy_HealthZ_" data-uid="chia.dotnet.ServiceProxy.HealthZ*"></a>
   <h4 id="chia_dotnet_ServiceProxy_HealthZ_System_Threading_CancellationToken_" data-uid="chia.dotnet.ServiceProxy.HealthZ(System.Threading.CancellationToken)">HealthZ(CancellationToken)</h4>
@@ -591,24 +479,10 @@ <h5 id="chia_dotnet_ServiceProxy_HealthZ_System_Threading_CancellationToken__rem
 </div>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_ServiceProxy_OpenConnection_System_String_System_Int32_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.ServiceProxy.OpenConnection(System.String%2CSystem.Int32%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_ServiceProxy_OpenConnection_System_String_System_Int32_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.ServiceProxy.OpenConnection(System.String%2CSystem.Int32%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_ServiceProxy_OpenConnection_System_String_System_Int32_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.ServiceProxy.OpenConnection(System.String%2CSystem.Int32%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ServiceProxy.cs/#L103">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ServiceProxy.cs/#L103">View Source</a>
   </span>
   <a id="chia_dotnet_ServiceProxy_OpenConnection_" data-uid="chia.dotnet.ServiceProxy.OpenConnection*"></a>
   <h4 id="chia_dotnet_ServiceProxy_OpenConnection_System_String_System_Int32_System_Threading_CancellationToken_" data-uid="chia.dotnet.ServiceProxy.OpenConnection(System.String,System.Int32,System.Threading.CancellationToken)">OpenConnection(String, Int32, CancellationToken)</h4>
@@ -667,24 +541,10 @@ <h5 class="returns">Returns</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_ServiceProxy_StopNode_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.ServiceProxy.StopNode(System.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_ServiceProxy_StopNode_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.ServiceProxy.StopNode(System.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_ServiceProxy_StopNode_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.ServiceProxy.StopNode(System.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ServiceProxy.cs/#L71">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ServiceProxy.cs/#L71">View Source</a>
   </span>
   <a id="chia_dotnet_ServiceProxy_StopNode_" data-uid="chia.dotnet.ServiceProxy.StopNode*"></a>
   <h4 id="chia_dotnet_ServiceProxy_StopNode_System_Threading_CancellationToken_" data-uid="chia.dotnet.ServiceProxy.StopNode(System.Threading.CancellationToken)">StopNode(CancellationToken)</h4>
@@ -737,24 +597,10 @@ <h5 class="returns">Returns</h5>
               <div class="contribution">
                 <ul class="nav">
                   <li>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-                    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_ServiceProxy.md&amp;value=---%0Auid%3A%20chia.dotnet.ServiceProxy%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-                    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_ServiceProxy.md&amp;value=---%0Auid%3A%20chia.dotnet.ServiceProxy%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-=======
                     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_ServiceProxy.md&amp;value=---%0Auid%3A%20chia.dotnet.ServiceProxy%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
                   </li>
                   <li>
-                    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ServiceProxy.cs/#L13" class="contribution-link">View Source</a>
+                    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ServiceProxy.cs/#L13" class="contribution-link">View Source</a>
                   </li>
                 </ul>
               </div>
diff --git a/docs/api/chia.dotnet.Side.html b/docs/api/chia.dotnet.Side.html
index 9400d340..574b116e 100644
--- a/docs/api/chia.dotnet.Side.html
+++ b/docs/api/chia.dotnet.Side.html
@@ -109,24 +109,10 @@ <h3 id="fields">Fields
               <div class="contribution">
                 <ul class="nav">
                   <li>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
                     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_Side.md&amp;value=---%0Auid%3A%20chia.dotnet.Side%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-                    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_Side.md&amp;value=---%0Auid%3A%20chia.dotnet.Side%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-=======
-                    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_Side.md&amp;value=---%0Auid%3A%20chia.dotnet.Side%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
                   </li>
                   <li>
-                    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/Side.cs/#L3" class="contribution-link">View Source</a>
+                    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/Side.cs/#L3" class="contribution-link">View Source</a>
                   </li>
                 </ul>
               </div>
diff --git a/docs/api/chia.dotnet.SignagePoint.html b/docs/api/chia.dotnet.SignagePoint.html
index f9bcf7a9..149d7a5d 100644
--- a/docs/api/chia.dotnet.SignagePoint.html
+++ b/docs/api/chia.dotnet.SignagePoint.html
@@ -90,21 +90,7 @@ <h5>Inherited Members</h5>
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object)">Object.Equals(Object)</a>
     </div>
     <div>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object-system-object)">Object.Equals(Object, Object)</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-      <span class="xref">System.Object.Equals(System.Object, System.Object)</span>
-=======
-      <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object-system-object)">Object.Equals(Object, Object)</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
     </div>
     <div>
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.gethashcode#system-object-gethashcode">Object.GetHashCode()</a>
@@ -132,24 +118,10 @@ <h3 id="properties">Properties
   </h3>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_SignagePoint_CcProof.md&amp;value=---%0Auid%3A%20chia.dotnet.SignagePoint.CcProof%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_SignagePoint_CcProof.md&amp;value=---%0Auid%3A%20chia.dotnet.SignagePoint.CcProof%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_SignagePoint_CcProof.md&amp;value=---%0Auid%3A%20chia.dotnet.SignagePoint.CcProof%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/SignagePoint.cs/#L6">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/SignagePoint.cs/#L6">View Source</a>
   </span>
   <a id="chia_dotnet_SignagePoint_CcProof_" data-uid="chia.dotnet.SignagePoint.CcProof*"></a>
   <h4 id="chia_dotnet_SignagePoint_CcProof" data-uid="chia.dotnet.SignagePoint.CcProof">CcProof</h4>
@@ -176,24 +148,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_SignagePoint_CcVdf.md&amp;value=---%0Auid%3A%20chia.dotnet.SignagePoint.CcVdf%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_SignagePoint_CcVdf.md&amp;value=---%0Auid%3A%20chia.dotnet.SignagePoint.CcVdf%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_SignagePoint_CcVdf.md&amp;value=---%0Auid%3A%20chia.dotnet.SignagePoint.CcVdf%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/SignagePoint.cs/#L5">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/SignagePoint.cs/#L5">View Source</a>
   </span>
   <a id="chia_dotnet_SignagePoint_CcVdf_" data-uid="chia.dotnet.SignagePoint.CcVdf*"></a>
   <h4 id="chia_dotnet_SignagePoint_CcVdf" data-uid="chia.dotnet.SignagePoint.CcVdf">CcVdf</h4>
@@ -220,24 +178,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_SignagePoint_RcProof.md&amp;value=---%0Auid%3A%20chia.dotnet.SignagePoint.RcProof%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_SignagePoint_RcProof.md&amp;value=---%0Auid%3A%20chia.dotnet.SignagePoint.RcProof%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_SignagePoint_RcProof.md&amp;value=---%0Auid%3A%20chia.dotnet.SignagePoint.RcProof%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/SignagePoint.cs/#L8">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/SignagePoint.cs/#L8">View Source</a>
   </span>
   <a id="chia_dotnet_SignagePoint_RcProof_" data-uid="chia.dotnet.SignagePoint.RcProof*"></a>
   <h4 id="chia_dotnet_SignagePoint_RcProof" data-uid="chia.dotnet.SignagePoint.RcProof">RcProof</h4>
@@ -264,24 +208,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_SignagePoint_RcVdf.md&amp;value=---%0Auid%3A%20chia.dotnet.SignagePoint.RcVdf%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_SignagePoint_RcVdf.md&amp;value=---%0Auid%3A%20chia.dotnet.SignagePoint.RcVdf%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_SignagePoint_RcVdf.md&amp;value=---%0Auid%3A%20chia.dotnet.SignagePoint.RcVdf%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/SignagePoint.cs/#L7">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/SignagePoint.cs/#L7">View Source</a>
   </span>
   <a id="chia_dotnet_SignagePoint_RcVdf_" data-uid="chia.dotnet.SignagePoint.RcVdf*"></a>
   <h4 id="chia_dotnet_SignagePoint_RcVdf" data-uid="chia.dotnet.SignagePoint.RcVdf">RcVdf</h4>
@@ -318,24 +248,10 @@ <h3 id="implements">Implements</h3>
               <div class="contribution">
                 <ul class="nav">
                   <li>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-                    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_SignagePoint.md&amp;value=---%0Auid%3A%20chia.dotnet.SignagePoint%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-                    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_SignagePoint.md&amp;value=---%0Auid%3A%20chia.dotnet.SignagePoint%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-=======
                     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_SignagePoint.md&amp;value=---%0Auid%3A%20chia.dotnet.SignagePoint%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
                   </li>
                   <li>
-                    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/SignagePoint.cs/#L3" class="contribution-link">View Source</a>
+                    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/SignagePoint.cs/#L3" class="contribution-link">View Source</a>
                   </li>
                 </ul>
               </div>
diff --git a/docs/api/chia.dotnet.SingletonInfo.html b/docs/api/chia.dotnet.SingletonInfo.html
index 8e1471f0..df80bed7 100644
--- a/docs/api/chia.dotnet.SingletonInfo.html
+++ b/docs/api/chia.dotnet.SingletonInfo.html
@@ -90,21 +90,7 @@ <h5>Inherited Members</h5>
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object)">Object.Equals(Object)</a>
     </div>
     <div>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object-system-object)">Object.Equals(Object, Object)</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-      <span class="xref">System.Object.Equals(System.Object, System.Object)</span>
-=======
-      <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object-system-object)">Object.Equals(Object, Object)</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
     </div>
     <div>
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.gethashcode#system-object-gethashcode">Object.GetHashCode()</a>
@@ -132,21 +118,10 @@ <h3 id="properties">Properties
   </h3>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_SingletonInfo_Launcher.md&amp;value=---%0Auid%3A%20chia.dotnet.SingletonInfo.Launcher%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
   </span>
   <span class="small pull-right mobile-hide">
     <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/SingletonRecord.cs/#L8">View Source</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_SingletonInfo_Launcher.md&amp;value=---%0Auid%3A%20chia.dotnet.SingletonInfo.Launcher%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/SingletonRecord.cs/#L8">View Source</a>
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
   </span>
   <a id="chia_dotnet_SingletonInfo_Launcher_" data-uid="chia.dotnet.SingletonInfo.Launcher*"></a>
   <h4 id="chia_dotnet_SingletonInfo_Launcher" data-uid="chia.dotnet.SingletonInfo.Launcher">Launcher</h4>
@@ -173,53 +148,7 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_SingletonInfo_LauncRootherId.md&amp;value=---%0Auid%3A%20chia.dotnet.SingletonInfo.LauncRootherId%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_SingletonInfo_Launcher.md&amp;value=---%0Auid%3A%20chia.dotnet.SingletonInfo.Launcher%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/SingletonRecord.cs/#L9">View Source</a>
-  </span>
-  <a id="chia_dotnet_SingletonInfo_LauncRootherId_" data-uid="chia.dotnet.SingletonInfo.LauncRootherId*"></a>
-  <h4 id="chia_dotnet_SingletonInfo_LauncRootherId" data-uid="chia.dotnet.SingletonInfo.LauncRootherId">LauncRootherId</h4>
-  <div class="markdown level1 summary"></div>
-  <div class="markdown level1 conceptual"></div>
-  <h5 class="decalaration">Declaration</h5>
-  <div class="codewrapper">
-<<<<<<< HEAD
-    <pre><code class="lang-csharp hljs">public string LauncRootherId { get; set; }</code></pre>
-=======
-    <pre><code class="lang-csharp hljs">public string Launcher { get; set; }</code></pre>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-  </div>
-  <h5 class="propertyValue">Property Value</h5>
-  <table class="table table-bordered table-striped table-condensed">
-    <thead>
-      <tr>
-        <th>Type</th>
-        <th>Description</th>
-      </tr>
-    </thead>
-    <tbody>
-      <tr>
-        <td><a class="xref" href="https://learn.microsoft.com/dotnet/api/system.string">String</a></td>
-<<<<<<< HEAD
-=======
-        <td></td>
-      </tr>
-    </tbody>
-  </table>
-  <span class="small pull-right mobile-hide">
-    <span class="divider">|</span>
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_SingletonInfo_LauncRootherId.md&amp;value=---%0Auid%3A%20chia.dotnet.SingletonInfo.LauncRootherId%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_SingletonInfo_Root.md&amp;value=---%0Auid%3A%20chia.dotnet.SingletonInfo.Root%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> main
   </span>
   <span class="small pull-right mobile-hide">
     <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/SingletonRecord.cs/#L9">View Source</a>
@@ -243,14 +172,6 @@ <h5 class="propertyValue">Property Value</h5>
     <tbody>
       <tr>
         <td><a class="xref" href="https://learn.microsoft.com/dotnet/api/system.string">String</a></td>
-<<<<<<< HEAD
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-=======
-<<<<<<< HEAD
-=======
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
         <td></td>
       </tr>
     </tbody>
@@ -267,24 +188,10 @@ <h3 id="implements">Implements</h3>
               <div class="contribution">
                 <ul class="nav">
                   <li>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-                    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_SingletonInfo.md&amp;value=---%0Auid%3A%20chia.dotnet.SingletonInfo%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-                    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_SingletonInfo.md&amp;value=---%0Auid%3A%20chia.dotnet.SingletonInfo%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-=======
                     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_SingletonInfo.md&amp;value=---%0Auid%3A%20chia.dotnet.SingletonInfo%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
                   </li>
                   <li>
-                    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/SingletonRecord.cs/#L6" class="contribution-link">View Source</a>
+                    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/SingletonRecord.cs/#L6" class="contribution-link">View Source</a>
                   </li>
                 </ul>
               </div>
diff --git a/docs/api/chia.dotnet.SingletonRecord.html b/docs/api/chia.dotnet.SingletonRecord.html
index 788aacf1..25a571e0 100644
--- a/docs/api/chia.dotnet.SingletonRecord.html
+++ b/docs/api/chia.dotnet.SingletonRecord.html
@@ -90,21 +90,7 @@ <h5>Inherited Members</h5>
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object)">Object.Equals(Object)</a>
     </div>
     <div>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object-system-object)">Object.Equals(Object, Object)</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-      <span class="xref">System.Object.Equals(System.Object, System.Object)</span>
-=======
-      <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object-system-object)">Object.Equals(Object, Object)</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
     </div>
     <div>
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.gethashcode#system-object-gethashcode">Object.GetHashCode()</a>
@@ -132,24 +118,10 @@ <h3 id="properties">Properties
   </h3>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_SingletonRecord_CoinId.md&amp;value=---%0Auid%3A%20chia.dotnet.SingletonRecord.CoinId%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_SingletonRecord_CoinId.md&amp;value=---%0Auid%3A%20chia.dotnet.SingletonRecord.CoinId%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_SingletonRecord_CoinId.md&amp;value=---%0Auid%3A%20chia.dotnet.SingletonRecord.CoinId%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/SingletonRecord.cs/#L14">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/SingletonRecord.cs/#L14">View Source</a>
   </span>
   <a id="chia_dotnet_SingletonRecord_CoinId_" data-uid="chia.dotnet.SingletonRecord.CoinId*"></a>
   <h4 id="chia_dotnet_SingletonRecord_CoinId" data-uid="chia.dotnet.SingletonRecord.CoinId">CoinId</h4>
@@ -176,24 +148,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_SingletonRecord_Confirmed.md&amp;value=---%0Auid%3A%20chia.dotnet.SingletonRecord.Confirmed%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_SingletonRecord_Confirmed.md&amp;value=---%0Auid%3A%20chia.dotnet.SingletonRecord.Confirmed%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_SingletonRecord_Confirmed.md&amp;value=---%0Auid%3A%20chia.dotnet.SingletonRecord.Confirmed%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/SingletonRecord.cs/#L18">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/SingletonRecord.cs/#L18">View Source</a>
   </span>
   <a id="chia_dotnet_SingletonRecord_Confirmed_" data-uid="chia.dotnet.SingletonRecord.Confirmed*"></a>
   <h4 id="chia_dotnet_SingletonRecord_Confirmed" data-uid="chia.dotnet.SingletonRecord.Confirmed">Confirmed</h4>
@@ -220,24 +178,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_SingletonRecord_ConfirmedAtHeight.md&amp;value=---%0Auid%3A%20chia.dotnet.SingletonRecord.ConfirmedAtHeight%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_SingletonRecord_ConfirmedAtHeight.md&amp;value=---%0Auid%3A%20chia.dotnet.SingletonRecord.ConfirmedAtHeight%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_SingletonRecord_ConfirmedAtHeight.md&amp;value=---%0Auid%3A%20chia.dotnet.SingletonRecord.ConfirmedAtHeight%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/SingletonRecord.cs/#L19">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/SingletonRecord.cs/#L19">View Source</a>
   </span>
   <a id="chia_dotnet_SingletonRecord_ConfirmedAtHeight_" data-uid="chia.dotnet.SingletonRecord.ConfirmedAtHeight*"></a>
   <h4 id="chia_dotnet_SingletonRecord_ConfirmedAtHeight" data-uid="chia.dotnet.SingletonRecord.ConfirmedAtHeight">ConfirmedAtHeight</h4>
@@ -264,24 +208,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_SingletonRecord_DateTimestamp.md&amp;value=---%0Auid%3A%20chia.dotnet.SingletonRecord.DateTimestamp%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_SingletonRecord_DateTimestamp.md&amp;value=---%0Auid%3A%20chia.dotnet.SingletonRecord.DateTimestamp%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_SingletonRecord_DateTimestamp.md&amp;value=---%0Auid%3A%20chia.dotnet.SingletonRecord.DateTimestamp%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/SingletonRecord.cs/#L23">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/SingletonRecord.cs/#L23">View Source</a>
   </span>
   <a id="chia_dotnet_SingletonRecord_DateTimestamp_" data-uid="chia.dotnet.SingletonRecord.DateTimestamp*"></a>
   <h4 id="chia_dotnet_SingletonRecord_DateTimestamp" data-uid="chia.dotnet.SingletonRecord.DateTimestamp">DateTimestamp</h4>
@@ -309,24 +239,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_SingletonRecord_Generation.md&amp;value=---%0Auid%3A%20chia.dotnet.SingletonRecord.Generation%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_SingletonRecord_Generation.md&amp;value=---%0Auid%3A%20chia.dotnet.SingletonRecord.Generation%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_SingletonRecord_Generation.md&amp;value=---%0Auid%3A%20chia.dotnet.SingletonRecord.Generation%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/SingletonRecord.cs/#L21">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/SingletonRecord.cs/#L21">View Source</a>
   </span>
   <a id="chia_dotnet_SingletonRecord_Generation_" data-uid="chia.dotnet.SingletonRecord.Generation*"></a>
   <h4 id="chia_dotnet_SingletonRecord_Generation" data-uid="chia.dotnet.SingletonRecord.Generation">Generation</h4>
@@ -353,24 +269,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_SingletonRecord_InnerPuzzleHash.md&amp;value=---%0Auid%3A%20chia.dotnet.SingletonRecord.InnerPuzzleHash%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_SingletonRecord_InnerPuzzleHash.md&amp;value=---%0Auid%3A%20chia.dotnet.SingletonRecord.InnerPuzzleHash%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_SingletonRecord_InnerPuzzleHash.md&amp;value=---%0Auid%3A%20chia.dotnet.SingletonRecord.InnerPuzzleHash%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/SingletonRecord.cs/#L17">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/SingletonRecord.cs/#L17">View Source</a>
   </span>
   <a id="chia_dotnet_SingletonRecord_InnerPuzzleHash_" data-uid="chia.dotnet.SingletonRecord.InnerPuzzleHash*"></a>
   <h4 id="chia_dotnet_SingletonRecord_InnerPuzzleHash" data-uid="chia.dotnet.SingletonRecord.InnerPuzzleHash">InnerPuzzleHash</h4>
@@ -397,24 +299,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_SingletonRecord_LauncherId.md&amp;value=---%0Auid%3A%20chia.dotnet.SingletonRecord.LauncherId%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_SingletonRecord_LauncherId.md&amp;value=---%0Auid%3A%20chia.dotnet.SingletonRecord.LauncherId%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_SingletonRecord_LauncherId.md&amp;value=---%0Auid%3A%20chia.dotnet.SingletonRecord.LauncherId%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/SingletonRecord.cs/#L15">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/SingletonRecord.cs/#L15">View Source</a>
   </span>
   <a id="chia_dotnet_SingletonRecord_LauncherId_" data-uid="chia.dotnet.SingletonRecord.LauncherId*"></a>
   <h4 id="chia_dotnet_SingletonRecord_LauncherId" data-uid="chia.dotnet.SingletonRecord.LauncherId">LauncherId</h4>
@@ -441,24 +329,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_SingletonRecord_LineageProof.md&amp;value=---%0Auid%3A%20chia.dotnet.SingletonRecord.LineageProof%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_SingletonRecord_LineageProof.md&amp;value=---%0Auid%3A%20chia.dotnet.SingletonRecord.LineageProof%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_SingletonRecord_LineageProof.md&amp;value=---%0Auid%3A%20chia.dotnet.SingletonRecord.LineageProof%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/SingletonRecord.cs/#L20">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/SingletonRecord.cs/#L20">View Source</a>
   </span>
   <a id="chia_dotnet_SingletonRecord_LineageProof_" data-uid="chia.dotnet.SingletonRecord.LineageProof*"></a>
   <h4 id="chia_dotnet_SingletonRecord_LineageProof" data-uid="chia.dotnet.SingletonRecord.LineageProof">LineageProof</h4>
@@ -485,24 +359,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_SingletonRecord_Root.md&amp;value=---%0Auid%3A%20chia.dotnet.SingletonRecord.Root%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_SingletonRecord_Root.md&amp;value=---%0Auid%3A%20chia.dotnet.SingletonRecord.Root%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_SingletonRecord_Root.md&amp;value=---%0Auid%3A%20chia.dotnet.SingletonRecord.Root%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/SingletonRecord.cs/#L16">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/SingletonRecord.cs/#L16">View Source</a>
   </span>
   <a id="chia_dotnet_SingletonRecord_Root_" data-uid="chia.dotnet.SingletonRecord.Root*"></a>
   <h4 id="chia_dotnet_SingletonRecord_Root" data-uid="chia.dotnet.SingletonRecord.Root">Root</h4>
@@ -529,24 +389,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_SingletonRecord_Timestamp.md&amp;value=---%0Auid%3A%20chia.dotnet.SingletonRecord.Timestamp%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_SingletonRecord_Timestamp.md&amp;value=---%0Auid%3A%20chia.dotnet.SingletonRecord.Timestamp%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_SingletonRecord_Timestamp.md&amp;value=---%0Auid%3A%20chia.dotnet.SingletonRecord.Timestamp%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/SingletonRecord.cs/#L22">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/SingletonRecord.cs/#L22">View Source</a>
   </span>
   <a id="chia_dotnet_SingletonRecord_Timestamp_" data-uid="chia.dotnet.SingletonRecord.Timestamp*"></a>
   <h4 id="chia_dotnet_SingletonRecord_Timestamp" data-uid="chia.dotnet.SingletonRecord.Timestamp">Timestamp</h4>
@@ -583,24 +429,10 @@ <h3 id="implements">Implements</h3>
               <div class="contribution">
                 <ul class="nav">
                   <li>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-                    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_SingletonRecord.md&amp;value=---%0Auid%3A%20chia.dotnet.SingletonRecord%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-                    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_SingletonRecord.md&amp;value=---%0Auid%3A%20chia.dotnet.SingletonRecord%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-=======
                     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_SingletonRecord.md&amp;value=---%0Auid%3A%20chia.dotnet.SingletonRecord%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
                   </li>
                   <li>
-                    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/SingletonRecord.cs/#L12" class="contribution-link">View Source</a>
+                    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/SingletonRecord.cs/#L12" class="contribution-link">View Source</a>
                   </li>
                 </ul>
               </div>
diff --git a/docs/api/chia.dotnet.SpendBundle.html b/docs/api/chia.dotnet.SpendBundle.html
index a22f56d2..f2c8e7b4 100644
--- a/docs/api/chia.dotnet.SpendBundle.html
+++ b/docs/api/chia.dotnet.SpendBundle.html
@@ -94,21 +94,7 @@ <h5>Inherited Members</h5>
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object)">Object.Equals(Object)</a>
     </div>
     <div>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object-system-object)">Object.Equals(Object, Object)</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-      <span class="xref">System.Object.Equals(System.Object, System.Object)</span>
-=======
-      <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object-system-object)">Object.Equals(Object, Object)</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
     </div>
     <div>
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.gethashcode#system-object-gethashcode">Object.GetHashCode()</a>
@@ -136,24 +122,10 @@ <h3 id="properties">Properties
   </h3>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_SpendBundle_AggregatedSignature.md&amp;value=---%0Auid%3A%20chia.dotnet.SpendBundle.AggregatedSignature%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_SpendBundle_AggregatedSignature.md&amp;value=---%0Auid%3A%20chia.dotnet.SpendBundle.AggregatedSignature%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_SpendBundle_AggregatedSignature.md&amp;value=---%0Auid%3A%20chia.dotnet.SpendBundle.AggregatedSignature%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/SpendBundle.cs/#L13">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/SpendBundle.cs/#L13">View Source</a>
   </span>
   <a id="chia_dotnet_SpendBundle_AggregatedSignature_" data-uid="chia.dotnet.SpendBundle.AggregatedSignature*"></a>
   <h4 id="chia_dotnet_SpendBundle_AggregatedSignature" data-uid="chia.dotnet.SpendBundle.AggregatedSignature">AggregatedSignature</h4>
@@ -180,24 +152,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_SpendBundle_CoinSpends.md&amp;value=---%0Auid%3A%20chia.dotnet.SpendBundle.CoinSpends%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_SpendBundle_CoinSpends.md&amp;value=---%0Auid%3A%20chia.dotnet.SpendBundle.CoinSpends%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_SpendBundle_CoinSpends.md&amp;value=---%0Auid%3A%20chia.dotnet.SpendBundle.CoinSpends%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/SpendBundle.cs/#L14">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/SpendBundle.cs/#L14">View Source</a>
   </span>
   <a id="chia_dotnet_SpendBundle_CoinSpends_" data-uid="chia.dotnet.SpendBundle.CoinSpends*"></a>
   <h4 id="chia_dotnet_SpendBundle_CoinSpends" data-uid="chia.dotnet.SpendBundle.CoinSpends">CoinSpends</h4>
@@ -205,21 +163,7 @@ <h4 id="chia_dotnet_SpendBundle_CoinSpends" data-uid="chia.dotnet.SpendBundle.Co
   <div class="markdown level1 conceptual"></div>
   <h5 class="decalaration">Declaration</h5>
   <div class="codewrapper">
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <pre><code class="lang-csharp hljs">public IEnumerable&lt;CoinSpend&gt; CoinSpends { get; set; }</code></pre>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <pre><code class="lang-csharp hljs">public ICollection&lt;CoinSpend&gt; CoinSpends { get; set; }</code></pre>
-=======
-    <pre><code class="lang-csharp hljs">public IEnumerable&lt;CoinSpend&gt; CoinSpends { get; set; }</code></pre>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </div>
   <h5 class="propertyValue">Property Value</h5>
   <table class="table table-bordered table-striped table-condensed">
@@ -248,24 +192,10 @@ <h3 id="implements">Implements</h3>
               <div class="contribution">
                 <ul class="nav">
                   <li>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-                    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_SpendBundle.md&amp;value=---%0Auid%3A%20chia.dotnet.SpendBundle%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-                    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_SpendBundle.md&amp;value=---%0Auid%3A%20chia.dotnet.SpendBundle%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-=======
                     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_SpendBundle.md&amp;value=---%0Auid%3A%20chia.dotnet.SpendBundle%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
                   </li>
                   <li>
-                    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/SpendBundle.cs/#L11" class="contribution-link">View Source</a>
+                    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/SpendBundle.cs/#L11" class="contribution-link">View Source</a>
                   </li>
                 </ul>
               </div>
diff --git a/docs/api/chia.dotnet.StoreProofs.html b/docs/api/chia.dotnet.StoreProofs.html
index 63752dac..6a87b243 100644
--- a/docs/api/chia.dotnet.StoreProofs.html
+++ b/docs/api/chia.dotnet.StoreProofs.html
@@ -90,21 +90,7 @@ <h5>Inherited Members</h5>
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object)">Object.Equals(Object)</a>
     </div>
     <div>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object-system-object)">Object.Equals(Object, Object)</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-      <span class="xref">System.Object.Equals(System.Object, System.Object)</span>
-=======
-      <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object-system-object)">Object.Equals(Object, Object)</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
     </div>
     <div>
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.gethashcode#system-object-gethashcode">Object.GetHashCode()</a>
@@ -132,24 +118,10 @@ <h3 id="properties">Properties
   </h3>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_StoreProofs_Proofs.md&amp;value=---%0Auid%3A%20chia.dotnet.StoreProofs.Proofs%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_StoreProofs_Proofs.md&amp;value=---%0Auid%3A%20chia.dotnet.StoreProofs.Proofs%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_StoreProofs_Proofs.md&amp;value=---%0Auid%3A%20chia.dotnet.StoreProofs.Proofs%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/StoreProofs.cs/#L8">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/StoreProofs.cs/#L8">View Source</a>
   </span>
   <a id="chia_dotnet_StoreProofs_Proofs_" data-uid="chia.dotnet.StoreProofs.Proofs*"></a>
   <h4 id="chia_dotnet_StoreProofs_Proofs" data-uid="chia.dotnet.StoreProofs.Proofs">Proofs</h4>
@@ -176,24 +148,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_StoreProofs_StoreId.md&amp;value=---%0Auid%3A%20chia.dotnet.StoreProofs.StoreId%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_StoreProofs_StoreId.md&amp;value=---%0Auid%3A%20chia.dotnet.StoreProofs.StoreId%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_StoreProofs_StoreId.md&amp;value=---%0Auid%3A%20chia.dotnet.StoreProofs.StoreId%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/StoreProofs.cs/#L7">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/StoreProofs.cs/#L7">View Source</a>
   </span>
   <a id="chia_dotnet_StoreProofs_StoreId_" data-uid="chia.dotnet.StoreProofs.StoreId*"></a>
   <h4 id="chia_dotnet_StoreProofs_StoreId" data-uid="chia.dotnet.StoreProofs.StoreId">StoreId</h4>
@@ -230,24 +188,10 @@ <h3 id="implements">Implements</h3>
               <div class="contribution">
                 <ul class="nav">
                   <li>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-                    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_StoreProofs.md&amp;value=---%0Auid%3A%20chia.dotnet.StoreProofs%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-                    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_StoreProofs.md&amp;value=---%0Auid%3A%20chia.dotnet.StoreProofs%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-=======
                     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_StoreProofs.md&amp;value=---%0Auid%3A%20chia.dotnet.StoreProofs%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
                   </li>
                   <li>
-                    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/StoreProofs.cs/#L5" class="contribution-link">View Source</a>
+                    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/StoreProofs.cs/#L5" class="contribution-link">View Source</a>
                   </li>
                 </ul>
               </div>
diff --git a/docs/api/chia.dotnet.SubEpochSummary.html b/docs/api/chia.dotnet.SubEpochSummary.html
index 254e7d47..436f89bf 100644
--- a/docs/api/chia.dotnet.SubEpochSummary.html
+++ b/docs/api/chia.dotnet.SubEpochSummary.html
@@ -90,21 +90,7 @@ <h5>Inherited Members</h5>
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object)">Object.Equals(Object)</a>
     </div>
     <div>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object-system-object)">Object.Equals(Object, Object)</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-      <span class="xref">System.Object.Equals(System.Object, System.Object)</span>
-=======
-      <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object-system-object)">Object.Equals(Object, Object)</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
     </div>
     <div>
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.gethashcode#system-object-gethashcode">Object.GetHashCode()</a>
@@ -132,24 +118,10 @@ <h3 id="properties">Properties
   </h3>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_SubEpochSummary_NewDifficulty.md&amp;value=---%0Auid%3A%20chia.dotnet.SubEpochSummary.NewDifficulty%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_SubEpochSummary_NewDifficulty.md&amp;value=---%0Auid%3A%20chia.dotnet.SubEpochSummary.NewDifficulty%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_SubEpochSummary_NewDifficulty.md&amp;value=---%0Auid%3A%20chia.dotnet.SubEpochSummary.NewDifficulty%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/SubEpochSummary.cs/#L17">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/SubEpochSummary.cs/#L17">View Source</a>
   </span>
   <a id="chia_dotnet_SubEpochSummary_NewDifficulty_" data-uid="chia.dotnet.SubEpochSummary.NewDifficulty*"></a>
   <h4 id="chia_dotnet_SubEpochSummary_NewDifficulty" data-uid="chia.dotnet.SubEpochSummary.NewDifficulty">NewDifficulty</h4>
@@ -177,24 +149,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_SubEpochSummary_NewSubSlotIters.md&amp;value=---%0Auid%3A%20chia.dotnet.SubEpochSummary.NewSubSlotIters%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_SubEpochSummary_NewSubSlotIters.md&amp;value=---%0Auid%3A%20chia.dotnet.SubEpochSummary.NewSubSlotIters%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_SubEpochSummary_NewSubSlotIters.md&amp;value=---%0Auid%3A%20chia.dotnet.SubEpochSummary.NewSubSlotIters%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/SubEpochSummary.cs/#L21">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/SubEpochSummary.cs/#L21">View Source</a>
   </span>
   <a id="chia_dotnet_SubEpochSummary_NewSubSlotIters_" data-uid="chia.dotnet.SubEpochSummary.NewSubSlotIters*"></a>
   <h4 id="chia_dotnet_SubEpochSummary_NewSubSlotIters" data-uid="chia.dotnet.SubEpochSummary.NewSubSlotIters">NewSubSlotIters</h4>
@@ -222,24 +180,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_SubEpochSummary_NumBlocksOverflow.md&amp;value=---%0Auid%3A%20chia.dotnet.SubEpochSummary.NumBlocksOverflow%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_SubEpochSummary_NumBlocksOverflow.md&amp;value=---%0Auid%3A%20chia.dotnet.SubEpochSummary.NumBlocksOverflow%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_SubEpochSummary_NumBlocksOverflow.md&amp;value=---%0Auid%3A%20chia.dotnet.SubEpochSummary.NumBlocksOverflow%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/SubEpochSummary.cs/#L13">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/SubEpochSummary.cs/#L13">View Source</a>
   </span>
   <a id="chia_dotnet_SubEpochSummary_NumBlocksOverflow_" data-uid="chia.dotnet.SubEpochSummary.NumBlocksOverflow*"></a>
   <h4 id="chia_dotnet_SubEpochSummary_NumBlocksOverflow" data-uid="chia.dotnet.SubEpochSummary.NumBlocksOverflow">NumBlocksOverflow</h4>
@@ -267,24 +211,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_SubEpochSummary_PrevSubepochSummaryHash.md&amp;value=---%0Auid%3A%20chia.dotnet.SubEpochSummary.PrevSubepochSummaryHash%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_SubEpochSummary_PrevSubepochSummaryHash.md&amp;value=---%0Auid%3A%20chia.dotnet.SubEpochSummary.PrevSubepochSummaryHash%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_SubEpochSummary_PrevSubepochSummaryHash.md&amp;value=---%0Auid%3A%20chia.dotnet.SubEpochSummary.PrevSubepochSummaryHash%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/SubEpochSummary.cs/#L5">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/SubEpochSummary.cs/#L5">View Source</a>
   </span>
   <a id="chia_dotnet_SubEpochSummary_PrevSubepochSummaryHash_" data-uid="chia.dotnet.SubEpochSummary.PrevSubepochSummaryHash*"></a>
   <h4 id="chia_dotnet_SubEpochSummary_PrevSubepochSummaryHash" data-uid="chia.dotnet.SubEpochSummary.PrevSubepochSummaryHash">PrevSubepochSummaryHash</h4>
@@ -311,24 +241,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_SubEpochSummary_RewardChainHash.md&amp;value=---%0Auid%3A%20chia.dotnet.SubEpochSummary.RewardChainHash%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_SubEpochSummary_RewardChainHash.md&amp;value=---%0Auid%3A%20chia.dotnet.SubEpochSummary.RewardChainHash%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_SubEpochSummary_RewardChainHash.md&amp;value=---%0Auid%3A%20chia.dotnet.SubEpochSummary.RewardChainHash%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/SubEpochSummary.cs/#L9">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/SubEpochSummary.cs/#L9">View Source</a>
   </span>
   <a id="chia_dotnet_SubEpochSummary_RewardChainHash_" data-uid="chia.dotnet.SubEpochSummary.RewardChainHash*"></a>
   <h4 id="chia_dotnet_SubEpochSummary_RewardChainHash" data-uid="chia.dotnet.SubEpochSummary.RewardChainHash">RewardChainHash</h4>
@@ -366,24 +282,10 @@ <h3 id="implements">Implements</h3>
               <div class="contribution">
                 <ul class="nav">
                   <li>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-                    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_SubEpochSummary.md&amp;value=---%0Auid%3A%20chia.dotnet.SubEpochSummary%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-                    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_SubEpochSummary.md&amp;value=---%0Auid%3A%20chia.dotnet.SubEpochSummary%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-=======
                     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_SubEpochSummary.md&amp;value=---%0Auid%3A%20chia.dotnet.SubEpochSummary%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
                   </li>
                   <li>
-                    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/SubEpochSummary.cs/#L3" class="contribution-link">View Source</a>
+                    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/SubEpochSummary.cs/#L3" class="contribution-link">View Source</a>
                   </li>
                 </ul>
               </div>
diff --git a/docs/api/chia.dotnet.SubSlotProofs.html b/docs/api/chia.dotnet.SubSlotProofs.html
index 55a94097..ba4f22dd 100644
--- a/docs/api/chia.dotnet.SubSlotProofs.html
+++ b/docs/api/chia.dotnet.SubSlotProofs.html
@@ -90,21 +90,7 @@ <h5>Inherited Members</h5>
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object)">Object.Equals(Object)</a>
     </div>
     <div>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object-system-object)">Object.Equals(Object, Object)</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-      <span class="xref">System.Object.Equals(System.Object, System.Object)</span>
-=======
-      <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object-system-object)">Object.Equals(Object, Object)</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
     </div>
     <div>
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.gethashcode#system-object-gethashcode">Object.GetHashCode()</a>
@@ -132,24 +118,10 @@ <h3 id="properties">Properties
   </h3>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_SubSlotProofs_ChallengeChainSlotProof.md&amp;value=---%0Auid%3A%20chia.dotnet.SubSlotProofs.ChallengeChainSlotProof%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_SubSlotProofs_ChallengeChainSlotProof.md&amp;value=---%0Auid%3A%20chia.dotnet.SubSlotProofs.ChallengeChainSlotProof%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_SubSlotProofs_ChallengeChainSlotProof.md&amp;value=---%0Auid%3A%20chia.dotnet.SubSlotProofs.ChallengeChainSlotProof%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/SubSlotProofs.cs/#L5">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/SubSlotProofs.cs/#L5">View Source</a>
   </span>
   <a id="chia_dotnet_SubSlotProofs_ChallengeChainSlotProof_" data-uid="chia.dotnet.SubSlotProofs.ChallengeChainSlotProof*"></a>
   <h4 id="chia_dotnet_SubSlotProofs_ChallengeChainSlotProof" data-uid="chia.dotnet.SubSlotProofs.ChallengeChainSlotProof">ChallengeChainSlotProof</h4>
@@ -176,24 +148,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_SubSlotProofs_InfusedChallengeChainSlotProof.md&amp;value=---%0Auid%3A%20chia.dotnet.SubSlotProofs.InfusedChallengeChainSlotProof%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_SubSlotProofs_InfusedChallengeChainSlotProof.md&amp;value=---%0Auid%3A%20chia.dotnet.SubSlotProofs.InfusedChallengeChainSlotProof%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_SubSlotProofs_InfusedChallengeChainSlotProof.md&amp;value=---%0Auid%3A%20chia.dotnet.SubSlotProofs.InfusedChallengeChainSlotProof%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/SubSlotProofs.cs/#L6">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/SubSlotProofs.cs/#L6">View Source</a>
   </span>
   <a id="chia_dotnet_SubSlotProofs_InfusedChallengeChainSlotProof_" data-uid="chia.dotnet.SubSlotProofs.InfusedChallengeChainSlotProof*"></a>
   <h4 id="chia_dotnet_SubSlotProofs_InfusedChallengeChainSlotProof" data-uid="chia.dotnet.SubSlotProofs.InfusedChallengeChainSlotProof">InfusedChallengeChainSlotProof</h4>
@@ -220,24 +178,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_SubSlotProofs_RewardChainSlotProof.md&amp;value=---%0Auid%3A%20chia.dotnet.SubSlotProofs.RewardChainSlotProof%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_SubSlotProofs_RewardChainSlotProof.md&amp;value=---%0Auid%3A%20chia.dotnet.SubSlotProofs.RewardChainSlotProof%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_SubSlotProofs_RewardChainSlotProof.md&amp;value=---%0Auid%3A%20chia.dotnet.SubSlotProofs.RewardChainSlotProof%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/SubSlotProofs.cs/#L7">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/SubSlotProofs.cs/#L7">View Source</a>
   </span>
   <a id="chia_dotnet_SubSlotProofs_RewardChainSlotProof_" data-uid="chia.dotnet.SubSlotProofs.RewardChainSlotProof*"></a>
   <h4 id="chia_dotnet_SubSlotProofs_RewardChainSlotProof" data-uid="chia.dotnet.SubSlotProofs.RewardChainSlotProof">RewardChainSlotProof</h4>
@@ -274,24 +218,10 @@ <h3 id="implements">Implements</h3>
               <div class="contribution">
                 <ul class="nav">
                   <li>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-                    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_SubSlotProofs.md&amp;value=---%0Auid%3A%20chia.dotnet.SubSlotProofs%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-                    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_SubSlotProofs.md&amp;value=---%0Auid%3A%20chia.dotnet.SubSlotProofs%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-=======
                     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_SubSlotProofs.md&amp;value=---%0Auid%3A%20chia.dotnet.SubSlotProofs%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
                   </li>
                   <li>
-                    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/SubSlotProofs.cs/#L3" class="contribution-link">View Source</a>
+                    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/SubSlotProofs.cs/#L3" class="contribution-link">View Source</a>
                   </li>
                 </ul>
               </div>
diff --git a/docs/api/chia.dotnet.SyncState.html b/docs/api/chia.dotnet.SyncState.html
index deb4d8d4..bd4880e4 100644
--- a/docs/api/chia.dotnet.SyncState.html
+++ b/docs/api/chia.dotnet.SyncState.html
@@ -90,21 +90,7 @@ <h5>Inherited Members</h5>
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object)">Object.Equals(Object)</a>
     </div>
     <div>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object-system-object)">Object.Equals(Object, Object)</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-      <span class="xref">System.Object.Equals(System.Object, System.Object)</span>
-=======
-      <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object-system-object)">Object.Equals(Object, Object)</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
     </div>
     <div>
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.gethashcode#system-object-gethashcode">Object.GetHashCode()</a>
@@ -132,26 +118,10 @@ <h3 id="properties">Properties
   </h3>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_SyncState_Synced.md&amp;value=---%0Auid%3A%20chia.dotnet.SyncState.Synced%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/SyncState.cs/#L10">View Source</a>
-=======
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_SyncState_Synced.md&amp;value=---%0Auid%3A%20chia.dotnet.SyncState.Synced%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
   </span>
   <span class="small pull-right mobile-hide">
     <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/SyncState.cs/#L10">View Source</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
   </span>
   <a id="chia_dotnet_SyncState_Synced_" data-uid="chia.dotnet.SyncState.Synced*"></a>
   <h4 id="chia_dotnet_SyncState_Synced" data-uid="chia.dotnet.SyncState.Synced">Synced</h4>
@@ -178,33 +148,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_SyncState_SyncMode.md&amp;value=---%0Auid%3A%20chia.dotnet.SyncState.SyncMode%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/SyncState.cs/#L7">View Source</a>
-=======
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_SyncState_SyncMode.md&amp;value=---%0Auid%3A%20chia.dotnet.SyncState.SyncMode%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
   </span>
   <span class="small pull-right mobile-hide">
     <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/SyncState.cs/#L7">View Source</a>
-<<<<<<< HEAD
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-=======
-<<<<<<< HEAD
-=======
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <a id="chia_dotnet_SyncState_SyncMode_" data-uid="chia.dotnet.SyncState.SyncMode*"></a>
   <h4 id="chia_dotnet_SyncState_SyncMode" data-uid="chia.dotnet.SyncState.SyncMode">SyncMode</h4>
@@ -231,33 +178,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_SyncState_SyncProgressHeight.md&amp;value=---%0Auid%3A%20chia.dotnet.SyncState.SyncProgressHeight%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/SyncState.cs/#L8">View Source</a>
-=======
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_SyncState_SyncProgressHeight.md&amp;value=---%0Auid%3A%20chia.dotnet.SyncState.SyncProgressHeight%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
   </span>
   <span class="small pull-right mobile-hide">
     <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/SyncState.cs/#L8">View Source</a>
-<<<<<<< HEAD
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-=======
-<<<<<<< HEAD
-=======
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <a id="chia_dotnet_SyncState_SyncProgressHeight_" data-uid="chia.dotnet.SyncState.SyncProgressHeight*"></a>
   <h4 id="chia_dotnet_SyncState_SyncProgressHeight" data-uid="chia.dotnet.SyncState.SyncProgressHeight">SyncProgressHeight</h4>
@@ -284,33 +208,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_SyncState_SyncProgressPercent.md&amp;value=---%0Auid%3A%20chia.dotnet.SyncState.SyncProgressPercent%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/SyncState.cs/#L11">View Source</a>
-=======
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_SyncState_SyncProgressPercent.md&amp;value=---%0Auid%3A%20chia.dotnet.SyncState.SyncProgressPercent%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
   </span>
   <span class="small pull-right mobile-hide">
     <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/SyncState.cs/#L11">View Source</a>
-<<<<<<< HEAD
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-=======
-<<<<<<< HEAD
-=======
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <a id="chia_dotnet_SyncState_SyncProgressPercent_" data-uid="chia.dotnet.SyncState.SyncProgressPercent*"></a>
   <h4 id="chia_dotnet_SyncState_SyncProgressPercent" data-uid="chia.dotnet.SyncState.SyncProgressPercent">SyncProgressPercent</h4>
@@ -338,33 +239,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_SyncState_SyncTipHeight.md&amp;value=---%0Auid%3A%20chia.dotnet.SyncState.SyncTipHeight%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/SyncState.cs/#L9">View Source</a>
-=======
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_SyncState_SyncTipHeight.md&amp;value=---%0Auid%3A%20chia.dotnet.SyncState.SyncTipHeight%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
   </span>
   <span class="small pull-right mobile-hide">
     <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/SyncState.cs/#L9">View Source</a>
-<<<<<<< HEAD
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-=======
-<<<<<<< HEAD
-=======
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <a id="chia_dotnet_SyncState_SyncTipHeight_" data-uid="chia.dotnet.SyncState.SyncTipHeight*"></a>
   <h4 id="chia_dotnet_SyncState_SyncTipHeight" data-uid="chia.dotnet.SyncState.SyncTipHeight">SyncTipHeight</h4>
@@ -401,24 +279,10 @@ <h3 id="implements">Implements</h3>
               <div class="contribution">
                 <ul class="nav">
                   <li>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-                    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_SyncState.md&amp;value=---%0Auid%3A%20chia.dotnet.SyncState%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-                    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_SyncState.md&amp;value=---%0Auid%3A%20chia.dotnet.SyncState%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-=======
                     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_SyncState.md&amp;value=---%0Auid%3A%20chia.dotnet.SyncState%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
                   </li>
                   <li>
-                    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/SyncState.cs/#L5" class="contribution-link">View Source</a>
+                    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/SyncState.cs/#L5" class="contribution-link">View Source</a>
                   </li>
                 </ul>
               </div>
diff --git a/docs/api/chia.dotnet.TerminalNode.html b/docs/api/chia.dotnet.TerminalNode.html
index 75a6bd1d..f173e653 100644
--- a/docs/api/chia.dotnet.TerminalNode.html
+++ b/docs/api/chia.dotnet.TerminalNode.html
@@ -90,21 +90,7 @@ <h5>Inherited Members</h5>
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object)">Object.Equals(Object)</a>
     </div>
     <div>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object-system-object)">Object.Equals(Object, Object)</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-      <span class="xref">System.Object.Equals(System.Object, System.Object)</span>
-=======
-      <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object-system-object)">Object.Equals(Object, Object)</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
     </div>
     <div>
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.gethashcode#system-object-gethashcode">Object.GetHashCode()</a>
@@ -132,24 +118,10 @@ <h3 id="properties">Properties
   </h3>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_TerminalNode_Hash.md&amp;value=---%0Auid%3A%20chia.dotnet.TerminalNode.Hash%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_TerminalNode_Hash.md&amp;value=---%0Auid%3A%20chia.dotnet.TerminalNode.Hash%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_TerminalNode_Hash.md&amp;value=---%0Auid%3A%20chia.dotnet.TerminalNode.Hash%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/TerminalNode.cs/#L5">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/TerminalNode.cs/#L5">View Source</a>
   </span>
   <a id="chia_dotnet_TerminalNode_Hash_" data-uid="chia.dotnet.TerminalNode.Hash*"></a>
   <h4 id="chia_dotnet_TerminalNode_Hash" data-uid="chia.dotnet.TerminalNode.Hash">Hash</h4>
@@ -176,24 +148,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_TerminalNode_Key.md&amp;value=---%0Auid%3A%20chia.dotnet.TerminalNode.Key%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_TerminalNode_Key.md&amp;value=---%0Auid%3A%20chia.dotnet.TerminalNode.Key%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_TerminalNode_Key.md&amp;value=---%0Auid%3A%20chia.dotnet.TerminalNode.Key%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/TerminalNode.cs/#L6">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/TerminalNode.cs/#L6">View Source</a>
   </span>
   <a id="chia_dotnet_TerminalNode_Key_" data-uid="chia.dotnet.TerminalNode.Key*"></a>
   <h4 id="chia_dotnet_TerminalNode_Key" data-uid="chia.dotnet.TerminalNode.Key">Key</h4>
@@ -220,24 +178,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_TerminalNode_Value.md&amp;value=---%0Auid%3A%20chia.dotnet.TerminalNode.Value%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_TerminalNode_Value.md&amp;value=---%0Auid%3A%20chia.dotnet.TerminalNode.Value%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_TerminalNode_Value.md&amp;value=---%0Auid%3A%20chia.dotnet.TerminalNode.Value%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/TerminalNode.cs/#L7">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/TerminalNode.cs/#L7">View Source</a>
   </span>
   <a id="chia_dotnet_TerminalNode_Value_" data-uid="chia.dotnet.TerminalNode.Value*"></a>
   <h4 id="chia_dotnet_TerminalNode_Value" data-uid="chia.dotnet.TerminalNode.Value">Value</h4>
@@ -274,24 +218,10 @@ <h3 id="implements">Implements</h3>
               <div class="contribution">
                 <ul class="nav">
                   <li>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-                    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_TerminalNode.md&amp;value=---%0Auid%3A%20chia.dotnet.TerminalNode%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-                    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_TerminalNode.md&amp;value=---%0Auid%3A%20chia.dotnet.TerminalNode%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-=======
                     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_TerminalNode.md&amp;value=---%0Auid%3A%20chia.dotnet.TerminalNode%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
                   </li>
                   <li>
-                    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/TerminalNode.cs/#L3" class="contribution-link">View Source</a>
+                    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/TerminalNode.cs/#L3" class="contribution-link">View Source</a>
                   </li>
                 </ul>
               </div>
diff --git a/docs/api/chia.dotnet.Token.html b/docs/api/chia.dotnet.Token.html
index b934c63f..d0fecec6 100644
--- a/docs/api/chia.dotnet.Token.html
+++ b/docs/api/chia.dotnet.Token.html
@@ -90,21 +90,7 @@ <h5>Inherited Members</h5>
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object)">Object.Equals(Object)</a>
     </div>
     <div>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object-system-object)">Object.Equals(Object, Object)</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-      <span class="xref">System.Object.Equals(System.Object, System.Object)</span>
-=======
-      <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object-system-object)">Object.Equals(Object, Object)</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
     </div>
     <div>
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.gethashcode#system-object-gethashcode">Object.GetHashCode()</a>
@@ -132,24 +118,10 @@ <h3 id="properties">Properties
   </h3>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_Token_AssetId.md&amp;value=---%0Auid%3A%20chia.dotnet.Token.AssetId%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_Token_AssetId.md&amp;value=---%0Auid%3A%20chia.dotnet.Token.AssetId%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_Token_AssetId.md&amp;value=---%0Auid%3A%20chia.dotnet.Token.AssetId%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/Token.cs/#L5">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/Token.cs/#L5">View Source</a>
   </span>
   <a id="chia_dotnet_Token_AssetId_" data-uid="chia.dotnet.Token.AssetId*"></a>
   <h4 id="chia_dotnet_Token_AssetId" data-uid="chia.dotnet.Token.AssetId">AssetId</h4>
@@ -176,24 +148,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_Token_FirstSeenHeight.md&amp;value=---%0Auid%3A%20chia.dotnet.Token.FirstSeenHeight%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_Token_FirstSeenHeight.md&amp;value=---%0Auid%3A%20chia.dotnet.Token.FirstSeenHeight%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_Token_FirstSeenHeight.md&amp;value=---%0Auid%3A%20chia.dotnet.Token.FirstSeenHeight%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/Token.cs/#L7">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/Token.cs/#L7">View Source</a>
   </span>
   <a id="chia_dotnet_Token_FirstSeenHeight_" data-uid="chia.dotnet.Token.FirstSeenHeight*"></a>
   <h4 id="chia_dotnet_Token_FirstSeenHeight" data-uid="chia.dotnet.Token.FirstSeenHeight">FirstSeenHeight</h4>
@@ -220,24 +178,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_Token_Name.md&amp;value=---%0Auid%3A%20chia.dotnet.Token.Name%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_Token_Name.md&amp;value=---%0Auid%3A%20chia.dotnet.Token.Name%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_Token_Name.md&amp;value=---%0Auid%3A%20chia.dotnet.Token.Name%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/Token.cs/#L6">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/Token.cs/#L6">View Source</a>
   </span>
   <a id="chia_dotnet_Token_Name_" data-uid="chia.dotnet.Token.Name*"></a>
   <h4 id="chia_dotnet_Token_Name" data-uid="chia.dotnet.Token.Name">Name</h4>
@@ -264,24 +208,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_Token_SenderPuzzleHash.md&amp;value=---%0Auid%3A%20chia.dotnet.Token.SenderPuzzleHash%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_Token_SenderPuzzleHash.md&amp;value=---%0Auid%3A%20chia.dotnet.Token.SenderPuzzleHash%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_Token_SenderPuzzleHash.md&amp;value=---%0Auid%3A%20chia.dotnet.Token.SenderPuzzleHash%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/Token.cs/#L8">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/Token.cs/#L8">View Source</a>
   </span>
   <a id="chia_dotnet_Token_SenderPuzzleHash_" data-uid="chia.dotnet.Token.SenderPuzzleHash*"></a>
   <h4 id="chia_dotnet_Token_SenderPuzzleHash" data-uid="chia.dotnet.Token.SenderPuzzleHash">SenderPuzzleHash</h4>
@@ -318,24 +248,10 @@ <h3 id="implements">Implements</h3>
               <div class="contribution">
                 <ul class="nav">
                   <li>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-                    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_Token.md&amp;value=---%0Auid%3A%20chia.dotnet.Token%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-                    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_Token.md&amp;value=---%0Auid%3A%20chia.dotnet.Token%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-=======
                     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_Token.md&amp;value=---%0Auid%3A%20chia.dotnet.Token%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
                   </li>
                   <li>
-                    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/Token.cs/#L3" class="contribution-link">View Source</a>
+                    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/Token.cs/#L3" class="contribution-link">View Source</a>
                   </li>
                 </ul>
               </div>
diff --git a/docs/api/chia.dotnet.TradeManager.html b/docs/api/chia.dotnet.TradeManager.html
index ecccbefd..9b213dee 100644
--- a/docs/api/chia.dotnet.TradeManager.html
+++ b/docs/api/chia.dotnet.TradeManager.html
@@ -115,24 +115,10 @@ <h3 id="constructors">Constructors
   </h3>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_TradeManager__ctor_chia_dotnet_WalletProxy_.md&amp;value=---%0Auid%3A%20chia.dotnet.TradeManager.%23ctor(chia.dotnet.WalletProxy)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_TradeManager__ctor_chia_dotnet_WalletProxy_.md&amp;value=---%0Auid%3A%20chia.dotnet.TradeManager.%23ctor(chia.dotnet.WalletProxy)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_TradeManager__ctor_chia_dotnet_WalletProxy_.md&amp;value=---%0Auid%3A%20chia.dotnet.TradeManager.%23ctor(chia.dotnet.WalletProxy)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/TradeManager.cs/#L17">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/TradeManager.cs/#L17">View Source</a>
   </span>
   <a id="chia_dotnet_TradeManager__ctor_" data-uid="chia.dotnet.TradeManager.#ctor*"></a>
   <h4 id="chia_dotnet_TradeManager__ctor_chia_dotnet_WalletProxy_" data-uid="chia.dotnet.TradeManager.#ctor(chia.dotnet.WalletProxy)">TradeManager(WalletProxy)</h4>
@@ -163,24 +149,10 @@ <h3 id="properties">Properties
   </h3>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_TradeManager_WalletProxy.md&amp;value=---%0Auid%3A%20chia.dotnet.TradeManager.WalletProxy%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_TradeManager_WalletProxy.md&amp;value=---%0Auid%3A%20chia.dotnet.TradeManager.WalletProxy%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_TradeManager_WalletProxy.md&amp;value=---%0Auid%3A%20chia.dotnet.TradeManager.WalletProxy%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/TradeManager.cs/#L15">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/TradeManager.cs/#L15">View Source</a>
   </span>
   <a id="chia_dotnet_TradeManager_WalletProxy_" data-uid="chia.dotnet.TradeManager.WalletProxy*"></a>
   <h4 id="chia_dotnet_TradeManager_WalletProxy" data-uid="chia.dotnet.TradeManager.WalletProxy">WalletProxy</h4>
@@ -209,24 +181,10 @@ <h3 id="methods">Methods
   </h3>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_TradeManager_AssetIdToName_System_String_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.TradeManager.AssetIdToName(System.String%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_TradeManager_AssetIdToName_System_String_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.TradeManager.AssetIdToName(System.String%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_TradeManager_AssetIdToName_System_String_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.TradeManager.AssetIdToName(System.String%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/TradeManager.cs/#L119">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/TradeManager.cs/#L119">View Source</a>
   </span>
   <a id="chia_dotnet_TradeManager_AssetIdToName_" data-uid="chia.dotnet.TradeManager.AssetIdToName*"></a>
   <h4 id="chia_dotnet_TradeManager_AssetIdToName_System_String_System_Threading_CancellationToken_" data-uid="chia.dotnet.TradeManager.AssetIdToName(System.String,System.Threading.CancellationToken)">AssetIdToName(String, CancellationToken)</h4>
@@ -279,24 +237,10 @@ <h5 class="returns">Returns</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_TradeManager_CancelOffer_System_String_System_Boolean_System_UInt64_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.TradeManager.CancelOffer(System.String%2CSystem.Boolean%2CSystem.UInt64%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_TradeManager_CancelOffer_System_String_System_Boolean_System_UInt64_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.TradeManager.CancelOffer(System.String%2CSystem.Boolean%2CSystem.UInt64%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_TradeManager_CancelOffer_System_String_System_Boolean_System_UInt64_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.TradeManager.CancelOffer(System.String%2CSystem.Boolean%2CSystem.UInt64%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/TradeManager.cs/#L199">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/TradeManager.cs/#L199">View Source</a>
   </span>
   <a id="chia_dotnet_TradeManager_CancelOffer_" data-uid="chia.dotnet.TradeManager.CancelOffer*"></a>
   <h4 id="chia_dotnet_TradeManager_CancelOffer_System_String_System_Boolean_System_UInt64_System_Threading_CancellationToken_" data-uid="chia.dotnet.TradeManager.CancelOffer(System.String,System.Boolean,System.UInt64,System.Threading.CancellationToken)">CancelOffer(String, Boolean, UInt64, CancellationToken)</h4>
@@ -361,24 +305,10 @@ <h5 class="returns">Returns</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_TradeManager_CancelOffers_System_Boolean_System_String_System_Boolean_System_Int32_System_UInt64_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.TradeManager.CancelOffers(System.Boolean%2CSystem.String%2CSystem.Boolean%2CSystem.Int32%2CSystem.UInt64%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_TradeManager_CancelOffers_System_Boolean_System_String_System_Boolean_System_Int32_System_UInt64_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.TradeManager.CancelOffers(System.Boolean%2CSystem.String%2CSystem.Boolean%2CSystem.Int32%2CSystem.UInt64%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_TradeManager_CancelOffers_System_Boolean_System_String_System_Boolean_System_Int32_System_UInt64_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.TradeManager.CancelOffers(System.Boolean%2CSystem.String%2CSystem.Boolean%2CSystem.Int32%2CSystem.UInt64%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/TradeManager.cs/#L148">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/TradeManager.cs/#L148">View Source</a>
   </span>
   <a id="chia_dotnet_TradeManager_CancelOffers_" data-uid="chia.dotnet.TradeManager.CancelOffers*"></a>
   <h4 id="chia_dotnet_TradeManager_CancelOffers_System_Boolean_System_String_System_Boolean_System_Int32_System_UInt64_System_Threading_CancellationToken_" data-uid="chia.dotnet.TradeManager.CancelOffers(System.Boolean,System.String,System.Boolean,System.Int32,System.UInt64,System.Threading.CancellationToken)">CancelOffers(Boolean, String, Boolean, Int32, UInt64, CancellationToken)</h4>
@@ -450,24 +380,10 @@ <h5 class="returns">Returns</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_TradeManager_CheckOfferValidity_System_String_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.TradeManager.CheckOfferValidity(System.String%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_TradeManager_CheckOfferValidity_System_String_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.TradeManager.CheckOfferValidity(System.String%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_TradeManager_CheckOfferValidity_System_String_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.TradeManager.CheckOfferValidity(System.String%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/TradeManager.cs/#L165">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/TradeManager.cs/#L165">View Source</a>
   </span>
   <a id="chia_dotnet_TradeManager_CheckOfferValidity_" data-uid="chia.dotnet.TradeManager.CheckOfferValidity*"></a>
   <h4 id="chia_dotnet_TradeManager_CheckOfferValidity_System_String_System_Threading_CancellationToken_" data-uid="chia.dotnet.TradeManager.CheckOfferValidity(System.String,System.Threading.CancellationToken)">CheckOfferValidity(String, CancellationToken)</h4>
@@ -520,30 +436,10 @@ <h5 class="returns">Returns</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_TradeManager_CreateOffer_chia_dotnet_OfferSummary_System_UInt64_System_UInt64_System_Boolean_System_Collections_Generic_IDictionary_System_String_System_String__System_Collections_Generic_IDictionary_System_String_System_String__System_Nullable_System_Boolean__System_UInt64_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.TradeManager.CreateOffer(chia.dotnet.OfferSummary%2CSystem.UInt64%2CSystem.UInt64%2CSystem.Boolean%2CSystem.Collections.Generic.IDictionary%7BSystem.String%2CSystem.String%7D%2CSystem.Collections.Generic.IDictionary%7BSystem.String%2CSystem.String%7D%2CSystem.Nullable%7BSystem.Boolean%7D%2CSystem.UInt64%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/TradeManager.cs/#L303">View Source</a>
-=======
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_TradeManager_CreateOffer_chia_dotnet_OfferSummary_System_UInt64_System_UInt64_System_Boolean_System_Collections_Generic_IDictionary_System_String_System_String__System_Collections_Generic_IDictionary_System_String_System_String__System_Nullable_System_Boolean__System_UInt64_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.TradeManager.CreateOffer(chia.dotnet.OfferSummary%2CSystem.UInt64%2CSystem.UInt64%2CSystem.Boolean%2CSystem.Collections.Generic.IDictionary%7BSystem.String%2CSystem.String%7D%2CSystem.Collections.Generic.IDictionary%7BSystem.String%2CSystem.String%7D%2CSystem.Nullable%7BSystem.Boolean%7D%2CSystem.UInt64%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
   </span>
   <span class="small pull-right mobile-hide">
-<<<<<<< HEAD
-    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/TradeManager.cs/#L303">View Source</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-=======
     <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/TradeManager.cs/#L294">View Source</a>
->>>>>>> main
   </span>
   <a id="chia_dotnet_TradeManager_CreateOffer_" data-uid="chia.dotnet.TradeManager.CreateOffer*"></a>
   <h4 id="chia_dotnet_TradeManager_CreateOffer_chia_dotnet_OfferSummary_System_UInt64_System_UInt64_System_Boolean_System_Collections_Generic_IDictionary_System_String_System_String__System_Collections_Generic_IDictionary_System_String_System_String__System_Nullable_System_Boolean__System_UInt64_System_Threading_CancellationToken_" data-uid="chia.dotnet.TradeManager.CreateOffer(chia.dotnet.OfferSummary,System.UInt64,System.UInt64,System.Boolean,System.Collections.Generic.IDictionary{System.String,System.String},System.Collections.Generic.IDictionary{System.String,System.String},System.Nullable{System.Boolean},System.UInt64,System.Threading.CancellationToken)">CreateOffer(OfferSummary, UInt64, UInt64, Boolean, IDictionary&lt;String, String&gt;, IDictionary&lt;String, String&gt;, Nullable&lt;Boolean&gt;, UInt64, CancellationToken)</h4>
@@ -634,12 +530,6 @@ <h5 class="returns">Returns</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_TradeManager_CreateOffer_System_Collections_Generic_IDictionary_System_UInt32_System_Int64__System_UInt64_System_UInt64_System_Boolean_System_Collections_Generic_IDictionary_System_String_System_String__System_Collections_Generic_IDictionary_System_String_System_String__System_Nullable_System_Boolean__System_UInt64_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.TradeManager.CreateOffer(System.Collections.Generic.IDictionary%7BSystem.UInt32%2CSystem.Int64%7D%2CSystem.UInt64%2CSystem.UInt64%2CSystem.Boolean%2CSystem.Collections.Generic.IDictionary%7BSystem.String%2CSystem.String%7D%2CSystem.Collections.Generic.IDictionary%7BSystem.String%2CSystem.String%7D%2CSystem.Nullable%7BSystem.Boolean%7D%2CSystem.UInt64%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-=======
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_TradeManager_CreateOffer_System_Collections_Generic_IDictionary_System_UInt32_System_Int64__System_UInt64_System_UInt64_System_Boolean_System_Collections_Generic_IDictionary_System_String_System_String__System_Collections_Generic_IDictionary_System_String_System_String__System_Nullable_System_Boolean__System_UInt64_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.TradeManager.CreateOffer(System.Collections.Generic.IDictionary%7BSystem.UInt32%2CSystem.Int64%7D%2CSystem.UInt64%2CSystem.UInt64%2CSystem.Boolean%2CSystem.Collections.Generic.IDictionary%7BSystem.String%2CSystem.String%7D%2CSystem.Collections.Generic.IDictionary%7BSystem.String%2CSystem.String%7D%2CSystem.Nullable%7BSystem.Boolean%7D%2CSystem.UInt64%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
   </span>
   <span class="small pull-right mobile-hide">
@@ -735,207 +625,9 @@ <h5 class="returns">Returns</h5>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_TradeManager_GetCATList_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.TradeManager.GetCATList(System.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-<<<<<<< HEAD
-=======
-=======
-<<<<<<< HEAD
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_TradeManager_CreateOffer_System_Collections_Generic_IDictionary_System_UInt32_System_Int64__System_UInt64_System_UInt64_System_Boolean_System_Collections_Generic_IDictionary_System_String_System_String__System_Collections_Generic_IDictionary_System_String_System_String__System_Nullable_System_Boolean__System_UInt64_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.TradeManager.CreateOffer(System.Collections.Generic.IDictionary%7BSystem.UInt32%2CSystem.Int64%7D%2CSystem.UInt64%2CSystem.UInt64%2CSystem.Boolean%2CSystem.Collections.Generic.IDictionary%7BSystem.String%2CSystem.String%7D%2CSystem.Collections.Generic.IDictionary%7BSystem.String%2CSystem.String%7D%2CSystem.Nullable%7BSystem.Boolean%7D%2CSystem.UInt64%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_TradeManager_CreateOffer_System_Collections_Generic_IDictionary_System_UInt32_System_Int64__System_UInt64_System_UInt64_System_Boolean_System_Collections_Generic_IDictionary_System_String_System_String__System_Collections_Generic_IDictionary_System_String_System_String__System_Nullable_System_Boolean__System_UInt64_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.TradeManager.CreateOffer(System.Collections.Generic.IDictionary%7BSystem.UInt32%2CSystem.Int64%7D%2CSystem.UInt64%2CSystem.UInt64%2CSystem.Boolean%2CSystem.Collections.Generic.IDictionary%7BSystem.String%2CSystem.String%7D%2CSystem.Collections.Generic.IDictionary%7BSystem.String%2CSystem.String%7D%2CSystem.Nullable%7BSystem.Boolean%7D%2CSystem.UInt64%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/TradeManager.cs/#L269">View Source</a>
-  </span>
-  <a id="chia_dotnet_TradeManager_CreateOffer_" data-uid="chia.dotnet.TradeManager.CreateOffer*"></a>
-  <h4 id="chia_dotnet_TradeManager_CreateOffer_System_Collections_Generic_IDictionary_System_UInt32_System_Int64__System_UInt64_System_UInt64_System_Boolean_System_Collections_Generic_IDictionary_System_String_System_String__System_Collections_Generic_IDictionary_System_String_System_String__System_Nullable_System_Boolean__System_UInt64_System_Threading_CancellationToken_" data-uid="chia.dotnet.TradeManager.CreateOffer(System.Collections.Generic.IDictionary{System.UInt32,System.Int64},System.UInt64,System.UInt64,System.Boolean,System.Collections.Generic.IDictionary{System.String,System.String},System.Collections.Generic.IDictionary{System.String,System.String},System.Nullable{System.Boolean},System.UInt64,System.Threading.CancellationToken)">CreateOffer(IDictionary&lt;UInt32, Int64&gt;, UInt64, UInt64, Boolean, IDictionary&lt;String, String&gt;, IDictionary&lt;String, String&gt;, Nullable&lt;Boolean&gt;, UInt64, CancellationToken)</h4>
-  <div class="markdown level1 summary"><p>Create an offer file from a set of id's in the form of wallet_id:amount</p>
-</div>
-  <div class="markdown level1 conceptual"></div>
-  <h5 class="decalaration">Declaration</h5>
-  <div class="codewrapper">
-    <pre><code class="lang-csharp hljs">public async Task&lt;OfferRecord&gt; CreateOffer(IDictionary&lt;uint, long&gt; walletIdsAndMojoAmounts, ulong minCoinAmount = 0UL, ulong maxCoinAmount = 0UL, bool validateOnly = false, IDictionary&lt;string, string&gt; driver = null, IDictionary&lt;string, string&gt; solver = null, bool? reusePuzhash = null, ulong fee = 0UL, CancellationToken cancellationToken = default(CancellationToken))</code></pre>
-  </div>
-  <h5 class="parameters">Parameters</h5>
-  <table class="table table-bordered table-striped table-condensed">
-    <thead>
-      <tr>
-        <th>Type</th>
-        <th>Name</th>
-        <th>Description</th>
-      </tr>
-    </thead>
-    <tbody>
-      <tr>
-        <td><a class="xref" href="https://learn.microsoft.com/dotnet/api/system.collections.generic.idictionary-2">IDictionary</a>&lt;<a class="xref" href="https://learn.microsoft.com/dotnet/api/system.uint32">UInt32</a>, <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.int64">Int64</a>&gt;</td>
-        <td><span class="parametername">walletIdsAndMojoAmounts</span></td>
-        <td><p>The set of wallet ids and amounts (in mojo) representing the offer</p>
-</td>
-      </tr>
-      <tr>
-        <td><a class="xref" href="https://learn.microsoft.com/dotnet/api/system.uint64">UInt64</a></td>
-        <td><span class="parametername">minCoinAmount</span></td>
-        <td></td>
-      </tr>
-      <tr>
-        <td><a class="xref" href="https://learn.microsoft.com/dotnet/api/system.uint64">UInt64</a></td>
-        <td><span class="parametername">maxCoinAmount</span></td>
-        <td></td>
-      </tr>
-      <tr>
-        <td><a class="xref" href="https://learn.microsoft.com/dotnet/api/system.boolean">Boolean</a></td>
-        <td><span class="parametername">validateOnly</span></td>
-        <td><p>Only validate the offer contents. Do not create.</p>
-</td>
-      </tr>
-      <tr>
-        <td><a class="xref" href="https://learn.microsoft.com/dotnet/api/system.collections.generic.idictionary-2">IDictionary</a>&lt;<a class="xref" href="https://learn.microsoft.com/dotnet/api/system.string">String</a>, <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.string">String</a>&gt;</td>
-        <td><span class="parametername">driver</span></td>
-        <td><p>Additional data about the puzzle</p>
-</td>
-      </tr>
-      <tr>
-        <td><a class="xref" href="https://learn.microsoft.com/dotnet/api/system.collections.generic.idictionary-2">IDictionary</a>&lt;<a class="xref" href="https://learn.microsoft.com/dotnet/api/system.string">String</a>, <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.string">String</a>&gt;</td>
-        <td><span class="parametername">solver</span></td>
-        <td></td>
-      </tr>
-      <tr>
-        <td><a class="xref" href="https://learn.microsoft.com/dotnet/api/system.nullable-1">Nullable</a>&lt;<a class="xref" href="https://learn.microsoft.com/dotnet/api/system.boolean">Boolean</a>&gt;</td>
-        <td><span class="parametername">reusePuzhash</span></td>
-        <td></td>
-      </tr>
-      <tr>
-        <td><a class="xref" href="https://learn.microsoft.com/dotnet/api/system.uint64">UInt64</a></td>
-        <td><span class="parametername">fee</span></td>
-        <td><p>Transaction fee for offer creation</p>
-</td>
-      </tr>
-      <tr>
-        <td><a class="xref" href="https://learn.microsoft.com/dotnet/api/system.threading.cancellationtoken">CancellationToken</a></td>
-        <td><span class="parametername">cancellationToken</span></td>
-        <td><p>A token to allow the call to be cancelled</p>
-</td>
-      </tr>
-    </tbody>
-  </table>
-  <h5 class="returns">Returns</h5>
-  <table class="table table-bordered table-striped table-condensed">
-    <thead>
-      <tr>
-        <th>Type</th>
-        <th>Description</th>
-      </tr>
-    </thead>
-    <tbody>
-      <tr>
-        <td><a class="xref" href="https://learn.microsoft.com/dotnet/api/system.threading.tasks.task-1">Task</a>&lt;<a class="xref" href="chia.dotnet.OfferRecord.html">OfferRecord</a>&gt;</td>
-        <td><p>An awaitable <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.threading.tasks.task">Task</a></p>
-</td>
-      </tr>
-    </tbody>
-  </table>
-  <span class="small pull-right mobile-hide">
-    <span class="divider">|</span>
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_TradeManager_GetCATList_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.TradeManager.GetCATList(System.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/TradeManager.cs/#L269">View Source</a>
-  </span>
-  <a id="chia_dotnet_TradeManager_CreateOffer_" data-uid="chia.dotnet.TradeManager.CreateOffer*"></a>
-  <h4 id="chia_dotnet_TradeManager_CreateOffer_System_Collections_Generic_IDictionary_System_UInt32_System_Int64__System_UInt64_System_UInt64_System_Boolean_System_Collections_Generic_IDictionary_System_String_System_String__System_Collections_Generic_IDictionary_System_String_System_String__System_Nullable_System_Boolean__System_UInt64_System_Threading_CancellationToken_" data-uid="chia.dotnet.TradeManager.CreateOffer(System.Collections.Generic.IDictionary{System.UInt32,System.Int64},System.UInt64,System.UInt64,System.Boolean,System.Collections.Generic.IDictionary{System.String,System.String},System.Collections.Generic.IDictionary{System.String,System.String},System.Nullable{System.Boolean},System.UInt64,System.Threading.CancellationToken)">CreateOffer(IDictionary&lt;UInt32, Int64&gt;, UInt64, UInt64, Boolean, IDictionary&lt;String, String&gt;, IDictionary&lt;String, String&gt;, Nullable&lt;Boolean&gt;, UInt64, CancellationToken)</h4>
-  <div class="markdown level1 summary"><p>Create an offer file from a set of id's in the form of wallet_id:amount</p>
-</div>
-  <div class="markdown level1 conceptual"></div>
-  <h5 class="decalaration">Declaration</h5>
-  <div class="codewrapper">
-    <pre><code class="lang-csharp hljs">public async Task&lt;OfferRecord&gt; CreateOffer(IDictionary&lt;uint, long&gt; walletIdsAndMojoAmounts, ulong minCoinAmount = 0UL, ulong maxCoinAmount = 0UL, bool validateOnly = false, IDictionary&lt;string, string&gt; driver = null, IDictionary&lt;string, string&gt; solver = null, bool? reusePuzhash = null, ulong fee = 0UL, CancellationToken cancellationToken = default(CancellationToken))</code></pre>
-  </div>
-  <h5 class="parameters">Parameters</h5>
-  <table class="table table-bordered table-striped table-condensed">
-    <thead>
-      <tr>
-        <th>Type</th>
-        <th>Name</th>
-        <th>Description</th>
-      </tr>
-    </thead>
-    <tbody>
-      <tr>
-        <td><a class="xref" href="https://learn.microsoft.com/dotnet/api/system.collections.generic.idictionary-2">IDictionary</a>&lt;<a class="xref" href="https://learn.microsoft.com/dotnet/api/system.uint32">UInt32</a>, <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.int64">Int64</a>&gt;</td>
-        <td><span class="parametername">walletIdsAndMojoAmounts</span></td>
-        <td><p>The set of wallet ids and amounts (in mojo) representing the offer</p>
-</td>
-      </tr>
-      <tr>
-        <td><a class="xref" href="https://learn.microsoft.com/dotnet/api/system.uint64">UInt64</a></td>
-        <td><span class="parametername">minCoinAmount</span></td>
-        <td></td>
-      </tr>
-      <tr>
-        <td><a class="xref" href="https://learn.microsoft.com/dotnet/api/system.uint64">UInt64</a></td>
-        <td><span class="parametername">maxCoinAmount</span></td>
-        <td></td>
-      </tr>
-      <tr>
-        <td><a class="xref" href="https://learn.microsoft.com/dotnet/api/system.boolean">Boolean</a></td>
-        <td><span class="parametername">validateOnly</span></td>
-        <td><p>Only validate the offer contents. Do not create.</p>
-</td>
-      </tr>
-      <tr>
-        <td><a class="xref" href="https://learn.microsoft.com/dotnet/api/system.collections.generic.idictionary-2">IDictionary</a>&lt;<a class="xref" href="https://learn.microsoft.com/dotnet/api/system.string">String</a>, <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.string">String</a>&gt;</td>
-        <td><span class="parametername">driver</span></td>
-        <td><p>Additional data about the puzzle</p>
-</td>
-      </tr>
-      <tr>
-        <td><a class="xref" href="https://learn.microsoft.com/dotnet/api/system.collections.generic.idictionary-2">IDictionary</a>&lt;<a class="xref" href="https://learn.microsoft.com/dotnet/api/system.string">String</a>, <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.string">String</a>&gt;</td>
-        <td><span class="parametername">solver</span></td>
-        <td></td>
-      </tr>
-      <tr>
-        <td><a class="xref" href="https://learn.microsoft.com/dotnet/api/system.nullable-1">Nullable</a>&lt;<a class="xref" href="https://learn.microsoft.com/dotnet/api/system.boolean">Boolean</a>&gt;</td>
-        <td><span class="parametername">reusePuzhash</span></td>
-        <td></td>
-      </tr>
-      <tr>
-        <td><a class="xref" href="https://learn.microsoft.com/dotnet/api/system.uint64">UInt64</a></td>
-        <td><span class="parametername">fee</span></td>
-        <td><p>Transaction fee for offer creation</p>
-</td>
-      </tr>
-      <tr>
-        <td><a class="xref" href="https://learn.microsoft.com/dotnet/api/system.threading.cancellationtoken">CancellationToken</a></td>
-        <td><span class="parametername">cancellationToken</span></td>
-        <td><p>A token to allow the call to be cancelled</p>
-</td>
-      </tr>
-    </tbody>
-  </table>
-  <h5 class="returns">Returns</h5>
-  <table class="table table-bordered table-striped table-condensed">
-    <thead>
-      <tr>
-        <th>Type</th>
-        <th>Description</th>
-      </tr>
-    </thead>
-    <tbody>
-      <tr>
-        <td><a class="xref" href="https://learn.microsoft.com/dotnet/api/system.threading.tasks.task-1">Task</a>&lt;<a class="xref" href="chia.dotnet.OfferRecord.html">OfferRecord</a>&gt;</td>
-        <td><p>An awaitable <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.threading.tasks.task">Task</a></p>
-</td>
-      </tr>
-    </tbody>
-  </table>
-  <span class="small pull-right mobile-hide">
-    <span class="divider">|</span>
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_TradeManager_GetCATList_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.TradeManager.GetCATList(System.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/TradeManager.cs/#L108">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/TradeManager.cs/#L108">View Source</a>
   </span>
   <a id="chia_dotnet_TradeManager_GetCATList_" data-uid="chia.dotnet.TradeManager.GetCATList*"></a>
   <h4 id="chia_dotnet_TradeManager_GetCATList_System_Threading_CancellationToken_" data-uid="chia.dotnet.TradeManager.GetCATList(System.Threading.CancellationToken)">GetCATList(CancellationToken)</h4>
@@ -982,24 +674,10 @@ <h5 class="returns">Returns</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_TradeManager_GetOffer_System_String_System_Boolean_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.TradeManager.GetOffer(System.String%2CSystem.Boolean%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_TradeManager_GetOffer_System_String_System_Boolean_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.TradeManager.GetOffer(System.String%2CSystem.Boolean%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_TradeManager_GetOffer_System_String_System_Boolean_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.TradeManager.GetOffer(System.String%2CSystem.Boolean%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/TradeManager.cs/#L182">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/TradeManager.cs/#L182">View Source</a>
   </span>
   <a id="chia_dotnet_TradeManager_GetOffer_" data-uid="chia.dotnet.TradeManager.GetOffer*"></a>
   <h4 id="chia_dotnet_TradeManager_GetOffer_System_String_System_Boolean_System_Threading_CancellationToken_" data-uid="chia.dotnet.TradeManager.GetOffer(System.String,System.Boolean,System.Threading.CancellationToken)">GetOffer(String, Boolean, CancellationToken)</h4>
@@ -1059,36 +737,11 @@ <h5 class="returns">Returns</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_TradeManager_GetOffers_System_Boolean_System_Boolean_System_Boolean_System_String_System_Boolean_System_Boolean_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.TradeManager.GetOffers(System.Boolean%2CSystem.Boolean%2CSystem.Boolean%2CSystem.String%2CSystem.Boolean%2CSystem.Boolean%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/TradeManager.cs/#L49">View Source</a>
-  </span>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_TradeManager_GetOffers_System_Boolean_System_Boolean_System_Boolean_System_String_System_Boolean_System_Boolean_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.TradeManager.GetOffers(System.Boolean%2CSystem.Boolean%2CSystem.Boolean%2CSystem.String%2CSystem.Boolean%2CSystem.Boolean%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/TradeManager.cs/#L49">View Source</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_TradeManager_GetOffers_System_Boolean_System_Boolean_System_Boolean_System_String_System_Boolean_System_Boolean_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.TradeManager.GetOffers(System.Boolean%2CSystem.Boolean%2CSystem.Boolean%2CSystem.String%2CSystem.Boolean%2CSystem.Boolean%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-<<<<<<< HEAD
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/TradeManager.cs/#L49">View Source</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-=======
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
     <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/TradeManager.cs/#L49">View Source</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
   </span>
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
   <a id="chia_dotnet_TradeManager_GetOffers_" data-uid="chia.dotnet.TradeManager.GetOffers*"></a>
   <h4 id="chia_dotnet_TradeManager_GetOffers_System_Boolean_System_Boolean_System_Boolean_System_String_System_Boolean_System_Boolean_System_Threading_CancellationToken_" data-uid="chia.dotnet.TradeManager.GetOffers(System.Boolean,System.Boolean,System.Boolean,System.String,System.Boolean,System.Boolean,System.Threading.CancellationToken)">GetOffers(Boolean, Boolean, Boolean, String, Boolean, Boolean, CancellationToken)</h4>
   <div class="markdown level1 summary"><p>Get the list of offers</p>
@@ -1170,33 +823,10 @@ <h5 class="returns">Returns</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_TradeManager_GetOffers_System_Int32_System_Int32_System_Boolean_System_Boolean_System_Boolean_System_String_System_Boolean_System_Boolean_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.TradeManager.GetOffers(System.Int32%2CSystem.Int32%2CSystem.Boolean%2CSystem.Boolean%2CSystem.Boolean%2CSystem.String%2CSystem.Boolean%2CSystem.Boolean%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/TradeManager.cs/#L75">View Source</a>
-=======
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_TradeManager_GetOffers_System_Int32_System_Int32_System_Boolean_System_Boolean_System_Boolean_System_String_System_Boolean_System_Boolean_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.TradeManager.GetOffers(System.Int32%2CSystem.Int32%2CSystem.Boolean%2CSystem.Boolean%2CSystem.Boolean%2CSystem.String%2CSystem.Boolean%2CSystem.Boolean%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
   </span>
   <span class="small pull-right mobile-hide">
     <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/TradeManager.cs/#L75">View Source</a>
-<<<<<<< HEAD
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-=======
-<<<<<<< HEAD
-=======
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <a id="chia_dotnet_TradeManager_GetOffers_" data-uid="chia.dotnet.TradeManager.GetOffers*"></a>
   <h4 id="chia_dotnet_TradeManager_GetOffers_System_Int32_System_Int32_System_Boolean_System_Boolean_System_Boolean_System_String_System_Boolean_System_Boolean_System_Threading_CancellationToken_" data-uid="chia.dotnet.TradeManager.GetOffers(System.Int32,System.Int32,System.Boolean,System.Boolean,System.Boolean,System.String,System.Boolean,System.Boolean,System.Threading.CancellationToken)">GetOffers(Int32, Int32, Boolean, Boolean, Boolean, String, Boolean, Boolean, CancellationToken)</h4>
@@ -1291,33 +921,10 @@ <h5 class="returns">Returns</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_TradeManager_GetOffersCount_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.TradeManager.GetOffersCount(System.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/TradeManager.cs/#L27">View Source</a>
-=======
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_TradeManager_GetOffersCount_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.TradeManager.GetOffersCount(System.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
   </span>
   <span class="small pull-right mobile-hide">
     <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/TradeManager.cs/#L27">View Source</a>
-<<<<<<< HEAD
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-=======
-<<<<<<< HEAD
-=======
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <a id="chia_dotnet_TradeManager_GetOffersCount_" data-uid="chia.dotnet.TradeManager.GetOffersCount*"></a>
   <h4 id="chia_dotnet_TradeManager_GetOffersCount_System_Threading_CancellationToken_" data-uid="chia.dotnet.TradeManager.GetOffersCount(System.Threading.CancellationToken)">GetOffersCount(CancellationToken)</h4>
@@ -1364,37 +971,10 @@ <h5 class="returns">Returns</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_TradeManager_GetOfferSummary_System_String_System_Boolean_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.TradeManager.GetOfferSummary(System.String%2CSystem.Boolean%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/TradeManager.cs/#L239">View Source</a>
-=======
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_TradeManager_GetOfferSummary_System_String_System_Boolean_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.TradeManager.GetOfferSummary(System.String%2CSystem.Boolean%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
   </span>
   <span class="small pull-right mobile-hide">
-<<<<<<< HEAD
-    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/TradeManager.cs/#L239">View Source</a>
-<<<<<<< HEAD
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-=======
-<<<<<<< HEAD
-=======
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-=======
     <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/TradeManager.cs/#L236">View Source</a>
->>>>>>> main
   </span>
   <a id="chia_dotnet_TradeManager_GetOfferSummary_" data-uid="chia.dotnet.TradeManager.GetOfferSummary*"></a>
   <h4 id="chia_dotnet_TradeManager_GetOfferSummary_System_String_System_Boolean_System_Threading_CancellationToken_" data-uid="chia.dotnet.TradeManager.GetOfferSummary(System.String,System.Boolean,System.Threading.CancellationToken)">GetOfferSummary(String, Boolean, CancellationToken)</h4>
@@ -1452,36 +1032,11 @@ <h5 class="returns">Returns</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_TradeManager_GetStrayCats_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.TradeManager.GetStrayCats(System.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
   </span>
   <span class="small pull-right mobile-hide">
     <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/TradeManager.cs/#L333">View Source</a>
   </span>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_TradeManager_GetStrayCats_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.TradeManager.GetStrayCats(System.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/TradeManager.cs/#L342">View Source</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_TradeManager_GetStrayCats_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.TradeManager.GetStrayCats(System.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-<<<<<<< HEAD
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/TradeManager.cs/#L342">View Source</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-=======
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/TradeManager.cs/#L342">View Source</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-  </span>
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
   <a id="chia_dotnet_TradeManager_GetStrayCats_" data-uid="chia.dotnet.TradeManager.GetStrayCats*"></a>
   <h4 id="chia_dotnet_TradeManager_GetStrayCats_System_Threading_CancellationToken_" data-uid="chia.dotnet.TradeManager.GetStrayCats(System.Threading.CancellationToken)">GetStrayCats(CancellationToken)</h4>
   <div class="markdown level1 summary"><p>Get a list of all unacknowledged CATs.</p>
@@ -1527,24 +1082,10 @@ <h5 class="returns">Returns</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_TradeManager_TakeOffer_System_String_System_Collections_Generic_IDictionary_System_String_System_Object__System_UInt64_System_UInt64_System_Nullable_System_Boolean__System_UInt64_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.TradeManager.TakeOffer(System.String%2CSystem.Collections.Generic.IDictionary%7BSystem.String%2CSystem.Object%7D%2CSystem.UInt64%2CSystem.UInt64%2CSystem.Nullable%7BSystem.Boolean%7D%2CSystem.UInt64%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_TradeManager_TakeOffer_System_String_System_Collections_Generic_IDictionary_System_String_System_Object__System_UInt64_System_UInt64_System_Nullable_System_Boolean__System_UInt64_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.TradeManager.TakeOffer(System.String%2CSystem.Collections.Generic.IDictionary%7BSystem.String%2CSystem.Object%7D%2CSystem.UInt64%2CSystem.UInt64%2CSystem.Nullable%7BSystem.Boolean%7D%2CSystem.UInt64%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_TradeManager_TakeOffer_System_String_System_Collections_Generic_IDictionary_System_String_System_Object__System_UInt64_System_UInt64_System_Nullable_System_Boolean__System_UInt64_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.TradeManager.TakeOffer(System.String%2CSystem.Collections.Generic.IDictionary%7BSystem.String%2CSystem.Object%7D%2CSystem.UInt64%2CSystem.UInt64%2CSystem.Nullable%7BSystem.Boolean%7D%2CSystem.UInt64%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/TradeManager.cs/#L216">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/TradeManager.cs/#L216">View Source</a>
   </span>
   <a id="chia_dotnet_TradeManager_TakeOffer_" data-uid="chia.dotnet.TradeManager.TakeOffer*"></a>
   <h4 id="chia_dotnet_TradeManager_TakeOffer_System_String_System_Collections_Generic_IDictionary_System_String_System_Object__System_UInt64_System_UInt64_System_Nullable_System_Boolean__System_UInt64_System_Threading_CancellationToken_" data-uid="chia.dotnet.TradeManager.TakeOffer(System.String,System.Collections.Generic.IDictionary{System.String,System.Object},System.UInt64,System.UInt64,System.Nullable{System.Boolean},System.UInt64,System.Threading.CancellationToken)">TakeOffer(String, IDictionary&lt;String, Object&gt;, UInt64, UInt64, Nullable&lt;Boolean&gt;, UInt64, CancellationToken)</h4>
@@ -1629,24 +1170,10 @@ <h5 class="returns">Returns</h5>
               <div class="contribution">
                 <ul class="nav">
                   <li>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-                    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_TradeManager.md&amp;value=---%0Auid%3A%20chia.dotnet.TradeManager%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-                    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_TradeManager.md&amp;value=---%0Auid%3A%20chia.dotnet.TradeManager%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-=======
                     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_TradeManager.md&amp;value=---%0Auid%3A%20chia.dotnet.TradeManager%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
                   </li>
                   <li>
-                    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/TradeManager.cs/#L13" class="contribution-link">View Source</a>
+                    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/TradeManager.cs/#L13" class="contribution-link">View Source</a>
                   </li>
                 </ul>
               </div>
diff --git a/docs/api/chia.dotnet.TradeRecord.html b/docs/api/chia.dotnet.TradeRecord.html
index ac00028d..adfcf7bc 100644
--- a/docs/api/chia.dotnet.TradeRecord.html
+++ b/docs/api/chia.dotnet.TradeRecord.html
@@ -91,21 +91,7 @@ <h5>Inherited Members</h5>
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object)">Object.Equals(Object)</a>
     </div>
     <div>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object-system-object)">Object.Equals(Object, Object)</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-      <span class="xref">System.Object.Equals(System.Object, System.Object)</span>
-=======
-      <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object-system-object)">Object.Equals(Object, Object)</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
     </div>
     <div>
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.gethashcode#system-object-gethashcode">Object.GetHashCode()</a>
@@ -133,24 +119,10 @@ <h3 id="properties">Properties
   </h3>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_TradeRecord_AcceptedAtDateTime.md&amp;value=---%0Auid%3A%20chia.dotnet.TradeRecord.AcceptedAtDateTime%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_TradeRecord_AcceptedAtDateTime.md&amp;value=---%0Auid%3A%20chia.dotnet.TradeRecord.AcceptedAtDateTime%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_TradeRecord_AcceptedAtDateTime.md&amp;value=---%0Auid%3A%20chia.dotnet.TradeRecord.AcceptedAtDateTime%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/TradeRecord.cs/#L35">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/TradeRecord.cs/#L35">View Source</a>
   </span>
   <a id="chia_dotnet_TradeRecord_AcceptedAtDateTime_" data-uid="chia.dotnet.TradeRecord.AcceptedAtDateTime*"></a>
   <h4 id="chia_dotnet_TradeRecord_AcceptedAtDateTime" data-uid="chia.dotnet.TradeRecord.AcceptedAtDateTime">AcceptedAtDateTime</h4>
@@ -178,24 +150,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_TradeRecord_AcceptedAtTime.md&amp;value=---%0Auid%3A%20chia.dotnet.TradeRecord.AcceptedAtTime%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_TradeRecord_AcceptedAtTime.md&amp;value=---%0Auid%3A%20chia.dotnet.TradeRecord.AcceptedAtTime%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_TradeRecord_AcceptedAtTime.md&amp;value=---%0Auid%3A%20chia.dotnet.TradeRecord.AcceptedAtTime%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/TradeRecord.cs/#L22">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/TradeRecord.cs/#L22">View Source</a>
   </span>
   <a id="chia_dotnet_TradeRecord_AcceptedAtTime_" data-uid="chia.dotnet.TradeRecord.AcceptedAtTime*"></a>
   <h4 id="chia_dotnet_TradeRecord_AcceptedAtTime" data-uid="chia.dotnet.TradeRecord.AcceptedAtTime">AcceptedAtTime</h4>
@@ -222,24 +180,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_TradeRecord_CoinsOfInterest.md&amp;value=---%0Auid%3A%20chia.dotnet.TradeRecord.CoinsOfInterest%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_TradeRecord_CoinsOfInterest.md&amp;value=---%0Auid%3A%20chia.dotnet.TradeRecord.CoinsOfInterest%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_TradeRecord_CoinsOfInterest.md&amp;value=---%0Auid%3A%20chia.dotnet.TradeRecord.CoinsOfInterest%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/TradeRecord.cs/#L31">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/TradeRecord.cs/#L31">View Source</a>
   </span>
   <a id="chia_dotnet_TradeRecord_CoinsOfInterest_" data-uid="chia.dotnet.TradeRecord.CoinsOfInterest*"></a>
   <h4 id="chia_dotnet_TradeRecord_CoinsOfInterest" data-uid="chia.dotnet.TradeRecord.CoinsOfInterest">CoinsOfInterest</h4>
@@ -247,21 +191,7 @@ <h4 id="chia_dotnet_TradeRecord_CoinsOfInterest" data-uid="chia.dotnet.TradeReco
   <div class="markdown level1 conceptual"></div>
   <h5 class="decalaration">Declaration</h5>
   <div class="codewrapper">
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <pre><code class="lang-csharp hljs">public IEnumerable&lt;Coin&gt; CoinsOfInterest { get; set; }</code></pre>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <pre><code class="lang-csharp hljs">public ICollection&lt;Coin&gt; CoinsOfInterest { get; set; }</code></pre>
-=======
     <pre><code class="lang-csharp hljs">public IEnumerable&lt;Coin&gt; CoinsOfInterest { get; set; }</code></pre>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </div>
   <h5 class="propertyValue">Property Value</h5>
   <table class="table table-bordered table-striped table-condensed">
@@ -280,24 +210,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_TradeRecord_ConfirmedAtIndex.md&amp;value=---%0Auid%3A%20chia.dotnet.TradeRecord.ConfirmedAtIndex%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_TradeRecord_ConfirmedAtIndex.md&amp;value=---%0Auid%3A%20chia.dotnet.TradeRecord.ConfirmedAtIndex%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_TradeRecord_ConfirmedAtIndex.md&amp;value=---%0Auid%3A%20chia.dotnet.TradeRecord.ConfirmedAtIndex%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/TradeRecord.cs/#L21">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/TradeRecord.cs/#L21">View Source</a>
   </span>
   <a id="chia_dotnet_TradeRecord_ConfirmedAtIndex_" data-uid="chia.dotnet.TradeRecord.ConfirmedAtIndex*"></a>
   <h4 id="chia_dotnet_TradeRecord_ConfirmedAtIndex" data-uid="chia.dotnet.TradeRecord.ConfirmedAtIndex">ConfirmedAtIndex</h4>
@@ -324,24 +240,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_TradeRecord_CreatedAtDateTime.md&amp;value=---%0Auid%3A%20chia.dotnet.TradeRecord.CreatedAtDateTime%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_TradeRecord_CreatedAtDateTime.md&amp;value=---%0Auid%3A%20chia.dotnet.TradeRecord.CreatedAtDateTime%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_TradeRecord_CreatedAtDateTime.md&amp;value=---%0Auid%3A%20chia.dotnet.TradeRecord.CreatedAtDateTime%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/TradeRecord.cs/#L37">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/TradeRecord.cs/#L37">View Source</a>
   </span>
   <a id="chia_dotnet_TradeRecord_CreatedAtDateTime_" data-uid="chia.dotnet.TradeRecord.CreatedAtDateTime*"></a>
   <h4 id="chia_dotnet_TradeRecord_CreatedAtDateTime" data-uid="chia.dotnet.TradeRecord.CreatedAtDateTime">CreatedAtDateTime</h4>
@@ -369,24 +271,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_TradeRecord_CreatedAtTime.md&amp;value=---%0Auid%3A%20chia.dotnet.TradeRecord.CreatedAtTime%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_TradeRecord_CreatedAtTime.md&amp;value=---%0Auid%3A%20chia.dotnet.TradeRecord.CreatedAtTime%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_TradeRecord_CreatedAtTime.md&amp;value=---%0Auid%3A%20chia.dotnet.TradeRecord.CreatedAtTime%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/TradeRecord.cs/#L23">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/TradeRecord.cs/#L23">View Source</a>
   </span>
   <a id="chia_dotnet_TradeRecord_CreatedAtTime_" data-uid="chia.dotnet.TradeRecord.CreatedAtTime*"></a>
   <h4 id="chia_dotnet_TradeRecord_CreatedAtTime" data-uid="chia.dotnet.TradeRecord.CreatedAtTime">CreatedAtTime</h4>
@@ -413,24 +301,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_TradeRecord_IsMyOffer.md&amp;value=---%0Auid%3A%20chia.dotnet.TradeRecord.IsMyOffer%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_TradeRecord_IsMyOffer.md&amp;value=---%0Auid%3A%20chia.dotnet.TradeRecord.IsMyOffer%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_TradeRecord_IsMyOffer.md&amp;value=---%0Auid%3A%20chia.dotnet.TradeRecord.IsMyOffer%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/TradeRecord.cs/#L24">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/TradeRecord.cs/#L24">View Source</a>
   </span>
   <a id="chia_dotnet_TradeRecord_IsMyOffer_" data-uid="chia.dotnet.TradeRecord.IsMyOffer*"></a>
   <h4 id="chia_dotnet_TradeRecord_IsMyOffer" data-uid="chia.dotnet.TradeRecord.IsMyOffer">IsMyOffer</h4>
@@ -457,24 +331,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_TradeRecord_Offer.md&amp;value=---%0Auid%3A%20chia.dotnet.TradeRecord.Offer%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_TradeRecord_Offer.md&amp;value=---%0Auid%3A%20chia.dotnet.TradeRecord.Offer%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_TradeRecord_Offer.md&amp;value=---%0Auid%3A%20chia.dotnet.TradeRecord.Offer%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/TradeRecord.cs/#L29">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/TradeRecord.cs/#L29">View Source</a>
   </span>
   <a id="chia_dotnet_TradeRecord_Offer_" data-uid="chia.dotnet.TradeRecord.Offer*"></a>
   <h4 id="chia_dotnet_TradeRecord_Offer" data-uid="chia.dotnet.TradeRecord.Offer">Offer</h4>
@@ -502,24 +362,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_TradeRecord_Sent.md&amp;value=---%0Auid%3A%20chia.dotnet.TradeRecord.Sent%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_TradeRecord_Sent.md&amp;value=---%0Auid%3A%20chia.dotnet.TradeRecord.Sent%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_TradeRecord_Sent.md&amp;value=---%0Auid%3A%20chia.dotnet.TradeRecord.Sent%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/TradeRecord.cs/#L25">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/TradeRecord.cs/#L25">View Source</a>
   </span>
   <a id="chia_dotnet_TradeRecord_Sent_" data-uid="chia.dotnet.TradeRecord.Sent*"></a>
   <h4 id="chia_dotnet_TradeRecord_Sent" data-uid="chia.dotnet.TradeRecord.Sent">Sent</h4>
@@ -546,24 +392,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_TradeRecord_SentTo.md&amp;value=---%0Auid%3A%20chia.dotnet.TradeRecord.SentTo%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_TradeRecord_SentTo.md&amp;value=---%0Auid%3A%20chia.dotnet.TradeRecord.SentTo%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_TradeRecord_SentTo.md&amp;value=---%0Auid%3A%20chia.dotnet.TradeRecord.SentTo%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/TradeRecord.cs/#L34">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/TradeRecord.cs/#L34">View Source</a>
   </span>
   <a id="chia_dotnet_TradeRecord_SentTo_" data-uid="chia.dotnet.TradeRecord.SentTo*"></a>
   <h4 id="chia_dotnet_TradeRecord_SentTo" data-uid="chia.dotnet.TradeRecord.SentTo">SentTo</h4>
@@ -571,21 +403,7 @@ <h4 id="chia_dotnet_TradeRecord_SentTo" data-uid="chia.dotnet.TradeRecord.SentTo
   <div class="markdown level1 conceptual"></div>
   <h5 class="decalaration">Declaration</h5>
   <div class="codewrapper">
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <pre><code class="lang-csharp hljs">public IEnumerable&lt;SendPeer&gt; SentTo { get; set; }</code></pre>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <pre><code class="lang-csharp hljs">public ICollection&lt;SendPeer&gt; SentTo { get; set; }</code></pre>
-=======
     <pre><code class="lang-csharp hljs">public IEnumerable&lt;SendPeer&gt; SentTo { get; set; }</code></pre>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </div>
   <h5 class="propertyValue">Property Value</h5>
   <table class="table table-bordered table-striped table-condensed">
@@ -604,24 +422,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_TradeRecord_Status.md&amp;value=---%0Auid%3A%20chia.dotnet.TradeRecord.Status%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_TradeRecord_Status.md&amp;value=---%0Auid%3A%20chia.dotnet.TradeRecord.Status%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_TradeRecord_Status.md&amp;value=---%0Auid%3A%20chia.dotnet.TradeRecord.Status%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/TradeRecord.cs/#L33">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/TradeRecord.cs/#L33">View Source</a>
   </span>
   <a id="chia_dotnet_TradeRecord_Status_" data-uid="chia.dotnet.TradeRecord.Status*"></a>
   <h4 id="chia_dotnet_TradeRecord_Status" data-uid="chia.dotnet.TradeRecord.Status">Status</h4>
@@ -648,24 +452,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_TradeRecord_TakenOffer.md&amp;value=---%0Auid%3A%20chia.dotnet.TradeRecord.TakenOffer%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_TradeRecord_TakenOffer.md&amp;value=---%0Auid%3A%20chia.dotnet.TradeRecord.TakenOffer%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_TradeRecord_TakenOffer.md&amp;value=---%0Auid%3A%20chia.dotnet.TradeRecord.TakenOffer%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/TradeRecord.cs/#L30">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/TradeRecord.cs/#L30">View Source</a>
   </span>
   <a id="chia_dotnet_TradeRecord_TakenOffer_" data-uid="chia.dotnet.TradeRecord.TakenOffer*"></a>
   <h4 id="chia_dotnet_TradeRecord_TakenOffer" data-uid="chia.dotnet.TradeRecord.TakenOffer">TakenOffer</h4>
@@ -692,24 +482,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_TradeRecord_TradeId.md&amp;value=---%0Auid%3A%20chia.dotnet.TradeRecord.TradeId%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_TradeRecord_TradeId.md&amp;value=---%0Auid%3A%20chia.dotnet.TradeRecord.TradeId%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_TradeRecord_TradeId.md&amp;value=---%0Auid%3A%20chia.dotnet.TradeRecord.TradeId%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/TradeRecord.cs/#L32">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/TradeRecord.cs/#L32">View Source</a>
   </span>
   <a id="chia_dotnet_TradeRecord_TradeId_" data-uid="chia.dotnet.TradeRecord.TradeId*"></a>
   <h4 id="chia_dotnet_TradeRecord_TradeId" data-uid="chia.dotnet.TradeRecord.TradeId">TradeId</h4>
@@ -746,24 +522,10 @@ <h3 id="implements">Implements</h3>
               <div class="contribution">
                 <ul class="nav">
                   <li>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-                    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_TradeRecord.md&amp;value=---%0Auid%3A%20chia.dotnet.TradeRecord%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-                    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_TradeRecord.md&amp;value=---%0Auid%3A%20chia.dotnet.TradeRecord%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-=======
                     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_TradeRecord.md&amp;value=---%0Auid%3A%20chia.dotnet.TradeRecord%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
                   </li>
                   <li>
-                    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/TradeRecord.cs/#L19" class="contribution-link">View Source</a>
+                    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/TradeRecord.cs/#L19" class="contribution-link">View Source</a>
                   </li>
                 </ul>
               </div>
diff --git a/docs/api/chia.dotnet.TradeStatus.html b/docs/api/chia.dotnet.TradeStatus.html
index 1ac3f784..56adf982 100644
--- a/docs/api/chia.dotnet.TradeStatus.html
+++ b/docs/api/chia.dotnet.TradeStatus.html
@@ -125,24 +125,10 @@ <h3 id="fields">Fields
               <div class="contribution">
                 <ul class="nav">
                   <li>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
                     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_TradeStatus.md&amp;value=---%0Auid%3A%20chia.dotnet.TradeStatus%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-                    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_TradeStatus.md&amp;value=---%0Auid%3A%20chia.dotnet.TradeStatus%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-=======
-                    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_TradeStatus.md&amp;value=---%0Auid%3A%20chia.dotnet.TradeStatus%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
                   </li>
                   <li>
-                    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/TradeStatus.cs/#L3" class="contribution-link">View Source</a>
+                    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/TradeStatus.cs/#L3" class="contribution-link">View Source</a>
                   </li>
                 </ul>
               </div>
diff --git a/docs/api/chia.dotnet.TransactionRecord.html b/docs/api/chia.dotnet.TransactionRecord.html
index b73f51ac..81bb9bf3 100644
--- a/docs/api/chia.dotnet.TransactionRecord.html
+++ b/docs/api/chia.dotnet.TransactionRecord.html
@@ -91,21 +91,7 @@ <h5>Inherited Members</h5>
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object)">Object.Equals(Object)</a>
     </div>
     <div>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object-system-object)">Object.Equals(Object, Object)</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-      <span class="xref">System.Object.Equals(System.Object, System.Object)</span>
-=======
-      <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object-system-object)">Object.Equals(Object, Object)</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
     </div>
     <div>
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.gethashcode#system-object-gethashcode">Object.GetHashCode()</a>
@@ -133,24 +119,10 @@ <h3 id="properties">Properties
   </h3>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_TransactionRecord_Additions.md&amp;value=---%0Auid%3A%20chia.dotnet.TransactionRecord.Additions%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_TransactionRecord_Additions.md&amp;value=---%0Auid%3A%20chia.dotnet.TransactionRecord.Additions%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_TransactionRecord_Additions.md&amp;value=---%0Auid%3A%20chia.dotnet.TransactionRecord.Additions%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/TransactionRecord.cs/#L13">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/TransactionRecord.cs/#L13">View Source</a>
   </span>
   <a id="chia_dotnet_TransactionRecord_Additions_" data-uid="chia.dotnet.TransactionRecord.Additions*"></a>
   <h4 id="chia_dotnet_TransactionRecord_Additions" data-uid="chia.dotnet.TransactionRecord.Additions">Additions</h4>
@@ -158,21 +130,7 @@ <h4 id="chia_dotnet_TransactionRecord_Additions" data-uid="chia.dotnet.Transacti
   <div class="markdown level1 conceptual"></div>
   <h5 class="decalaration">Declaration</h5>
   <div class="codewrapper">
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <pre><code class="lang-csharp hljs">public IEnumerable&lt;Coin&gt; Additions { get; set; }</code></pre>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <pre><code class="lang-csharp hljs">public ICollection&lt;Coin&gt; Additions { get; set; }</code></pre>
-=======
     <pre><code class="lang-csharp hljs">public IEnumerable&lt;Coin&gt; Additions { get; set; }</code></pre>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </div>
   <h5 class="propertyValue">Property Value</h5>
   <table class="table table-bordered table-striped table-condensed">
@@ -191,24 +149,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_TransactionRecord_Amount.md&amp;value=---%0Auid%3A%20chia.dotnet.TransactionRecord.Amount%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_TransactionRecord_Amount.md&amp;value=---%0Auid%3A%20chia.dotnet.TransactionRecord.Amount%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_TransactionRecord_Amount.md&amp;value=---%0Auid%3A%20chia.dotnet.TransactionRecord.Amount%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/TransactionRecord.cs/#L14">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/TransactionRecord.cs/#L14">View Source</a>
   </span>
   <a id="chia_dotnet_TransactionRecord_Amount_" data-uid="chia.dotnet.TransactionRecord.Amount*"></a>
   <h4 id="chia_dotnet_TransactionRecord_Amount" data-uid="chia.dotnet.TransactionRecord.Amount">Amount</h4>
@@ -235,24 +179,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_TransactionRecord_Confirmed.md&amp;value=---%0Auid%3A%20chia.dotnet.TransactionRecord.Confirmed%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_TransactionRecord_Confirmed.md&amp;value=---%0Auid%3A%20chia.dotnet.TransactionRecord.Confirmed%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_TransactionRecord_Confirmed.md&amp;value=---%0Auid%3A%20chia.dotnet.TransactionRecord.Confirmed%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/TransactionRecord.cs/#L15">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/TransactionRecord.cs/#L15">View Source</a>
   </span>
   <a id="chia_dotnet_TransactionRecord_Confirmed_" data-uid="chia.dotnet.TransactionRecord.Confirmed*"></a>
   <h4 id="chia_dotnet_TransactionRecord_Confirmed" data-uid="chia.dotnet.TransactionRecord.Confirmed">Confirmed</h4>
@@ -279,24 +209,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_TransactionRecord_ConfirmedAtHeight.md&amp;value=---%0Auid%3A%20chia.dotnet.TransactionRecord.ConfirmedAtHeight%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_TransactionRecord_ConfirmedAtHeight.md&amp;value=---%0Auid%3A%20chia.dotnet.TransactionRecord.ConfirmedAtHeight%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_TransactionRecord_ConfirmedAtHeight.md&amp;value=---%0Auid%3A%20chia.dotnet.TransactionRecord.ConfirmedAtHeight%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/TransactionRecord.cs/#L16">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/TransactionRecord.cs/#L16">View Source</a>
   </span>
   <a id="chia_dotnet_TransactionRecord_ConfirmedAtHeight_" data-uid="chia.dotnet.TransactionRecord.ConfirmedAtHeight*"></a>
   <h4 id="chia_dotnet_TransactionRecord_ConfirmedAtHeight" data-uid="chia.dotnet.TransactionRecord.ConfirmedAtHeight">ConfirmedAtHeight</h4>
@@ -323,24 +239,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_TransactionRecord_CreatedAtDateTime.md&amp;value=---%0Auid%3A%20chia.dotnet.TransactionRecord.CreatedAtDateTime%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_TransactionRecord_CreatedAtDateTime.md&amp;value=---%0Auid%3A%20chia.dotnet.TransactionRecord.CreatedAtDateTime%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_TransactionRecord_CreatedAtDateTime.md&amp;value=---%0Auid%3A%20chia.dotnet.TransactionRecord.CreatedAtDateTime%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/TransactionRecord.cs/#L47">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/TransactionRecord.cs/#L47">View Source</a>
   </span>
   <a id="chia_dotnet_TransactionRecord_CreatedAtDateTime_" data-uid="chia.dotnet.TransactionRecord.CreatedAtDateTime*"></a>
   <h4 id="chia_dotnet_TransactionRecord_CreatedAtDateTime" data-uid="chia.dotnet.TransactionRecord.CreatedAtDateTime">CreatedAtDateTime</h4>
@@ -368,24 +270,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_TransactionRecord_CreatedAtTime.md&amp;value=---%0Auid%3A%20chia.dotnet.TransactionRecord.CreatedAtTime%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_TransactionRecord_CreatedAtTime.md&amp;value=---%0Auid%3A%20chia.dotnet.TransactionRecord.CreatedAtTime%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_TransactionRecord_CreatedAtTime.md&amp;value=---%0Auid%3A%20chia.dotnet.TransactionRecord.CreatedAtTime%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/TransactionRecord.cs/#L17">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/TransactionRecord.cs/#L17">View Source</a>
   </span>
   <a id="chia_dotnet_TransactionRecord_CreatedAtTime_" data-uid="chia.dotnet.TransactionRecord.CreatedAtTime*"></a>
   <h4 id="chia_dotnet_TransactionRecord_CreatedAtTime" data-uid="chia.dotnet.TransactionRecord.CreatedAtTime">CreatedAtTime</h4>
@@ -412,24 +300,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_TransactionRecord_FeeAmount.md&amp;value=---%0Auid%3A%20chia.dotnet.TransactionRecord.FeeAmount%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_TransactionRecord_FeeAmount.md&amp;value=---%0Auid%3A%20chia.dotnet.TransactionRecord.FeeAmount%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_TransactionRecord_FeeAmount.md&amp;value=---%0Auid%3A%20chia.dotnet.TransactionRecord.FeeAmount%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/TransactionRecord.cs/#L18">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/TransactionRecord.cs/#L18">View Source</a>
   </span>
   <a id="chia_dotnet_TransactionRecord_FeeAmount_" data-uid="chia.dotnet.TransactionRecord.FeeAmount*"></a>
   <h4 id="chia_dotnet_TransactionRecord_FeeAmount" data-uid="chia.dotnet.TransactionRecord.FeeAmount">FeeAmount</h4>
@@ -456,24 +330,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_TransactionRecord_IsInMempool.md&amp;value=---%0Auid%3A%20chia.dotnet.TransactionRecord.IsInMempool%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_TransactionRecord_IsInMempool.md&amp;value=---%0Auid%3A%20chia.dotnet.TransactionRecord.IsInMempool%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_TransactionRecord_IsInMempool.md&amp;value=---%0Auid%3A%20chia.dotnet.TransactionRecord.IsInMempool%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/TransactionRecord.cs/#L36">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/TransactionRecord.cs/#L36">View Source</a>
   </span>
   <a id="chia_dotnet_TransactionRecord_IsInMempool_" data-uid="chia.dotnet.TransactionRecord.IsInMempool*"></a>
   <h4 id="chia_dotnet_TransactionRecord_IsInMempool" data-uid="chia.dotnet.TransactionRecord.IsInMempool">IsInMempool</h4>
@@ -505,24 +365,10 @@ <h5 id="chia_dotnet_TransactionRecord_IsInMempool_remarks">Remarks</h5>
 </div>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_TransactionRecord_Name.md&amp;value=---%0Auid%3A%20chia.dotnet.TransactionRecord.Name%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_TransactionRecord_Name.md&amp;value=---%0Auid%3A%20chia.dotnet.TransactionRecord.Name%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_TransactionRecord_Name.md&amp;value=---%0Auid%3A%20chia.dotnet.TransactionRecord.Name%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/TransactionRecord.cs/#L24">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/TransactionRecord.cs/#L24">View Source</a>
   </span>
   <a id="chia_dotnet_TransactionRecord_Name_" data-uid="chia.dotnet.TransactionRecord.Name*"></a>
   <h4 id="chia_dotnet_TransactionRecord_Name" data-uid="chia.dotnet.TransactionRecord.Name">Name</h4>
@@ -549,24 +395,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_TransactionRecord_Removals.md&amp;value=---%0Auid%3A%20chia.dotnet.TransactionRecord.Removals%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_TransactionRecord_Removals.md&amp;value=---%0Auid%3A%20chia.dotnet.TransactionRecord.Removals%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_TransactionRecord_Removals.md&amp;value=---%0Auid%3A%20chia.dotnet.TransactionRecord.Removals%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/TransactionRecord.cs/#L25">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/TransactionRecord.cs/#L25">View Source</a>
   </span>
   <a id="chia_dotnet_TransactionRecord_Removals_" data-uid="chia.dotnet.TransactionRecord.Removals*"></a>
   <h4 id="chia_dotnet_TransactionRecord_Removals" data-uid="chia.dotnet.TransactionRecord.Removals">Removals</h4>
@@ -574,21 +406,7 @@ <h4 id="chia_dotnet_TransactionRecord_Removals" data-uid="chia.dotnet.Transactio
   <div class="markdown level1 conceptual"></div>
   <h5 class="decalaration">Declaration</h5>
   <div class="codewrapper">
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <pre><code class="lang-csharp hljs">public IEnumerable&lt;Coin&gt; Removals { get; set; }</code></pre>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <pre><code class="lang-csharp hljs">public ICollection&lt;Coin&gt; Removals { get; set; }</code></pre>
-=======
-    <pre><code class="lang-csharp hljs">public IEnumerable&lt;Coin&gt; Removals { get; set; }</code></pre>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </div>
   <h5 class="propertyValue">Property Value</h5>
   <table class="table table-bordered table-striped table-condensed">
@@ -607,24 +425,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_TransactionRecord_Sent.md&amp;value=---%0Auid%3A%20chia.dotnet.TransactionRecord.Sent%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_TransactionRecord_Sent.md&amp;value=---%0Auid%3A%20chia.dotnet.TransactionRecord.Sent%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_TransactionRecord_Sent.md&amp;value=---%0Auid%3A%20chia.dotnet.TransactionRecord.Sent%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/TransactionRecord.cs/#L26">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/TransactionRecord.cs/#L26">View Source</a>
   </span>
   <a id="chia_dotnet_TransactionRecord_Sent_" data-uid="chia.dotnet.TransactionRecord.Sent*"></a>
   <h4 id="chia_dotnet_TransactionRecord_Sent" data-uid="chia.dotnet.TransactionRecord.Sent">Sent</h4>
@@ -651,24 +455,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_TransactionRecord_SentTo.md&amp;value=---%0Auid%3A%20chia.dotnet.TransactionRecord.SentTo%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_TransactionRecord_SentTo.md&amp;value=---%0Auid%3A%20chia.dotnet.TransactionRecord.SentTo%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_TransactionRecord_SentTo.md&amp;value=---%0Auid%3A%20chia.dotnet.TransactionRecord.SentTo%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/TransactionRecord.cs/#L31">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/TransactionRecord.cs/#L31">View Source</a>
   </span>
   <a id="chia_dotnet_TransactionRecord_SentTo_" data-uid="chia.dotnet.TransactionRecord.SentTo*"></a>
   <h4 id="chia_dotnet_TransactionRecord_SentTo" data-uid="chia.dotnet.TransactionRecord.SentTo">SentTo</h4>
@@ -678,21 +468,7 @@ <h4 id="chia_dotnet_TransactionRecord_SentTo" data-uid="chia.dotnet.TransactionR
   <div class="markdown level1 conceptual"></div>
   <h5 class="decalaration">Declaration</h5>
   <div class="codewrapper">
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <pre><code class="lang-csharp hljs">public IEnumerable&lt;SendPeer&gt; SentTo { get; set; }</code></pre>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <pre><code class="lang-csharp hljs">public ICollection&lt;SendPeer&gt; SentTo { get; set; }</code></pre>
-=======
-    <pre><code class="lang-csharp hljs">public IEnumerable&lt;SendPeer&gt; SentTo { get; set; }</code></pre>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </div>
   <h5 class="propertyValue">Property Value</h5>
   <table class="table table-bordered table-striped table-condensed">
@@ -711,24 +487,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_TransactionRecord_SpendBundle.md&amp;value=---%0Auid%3A%20chia.dotnet.TransactionRecord.SpendBundle%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_TransactionRecord_SpendBundle.md&amp;value=---%0Auid%3A%20chia.dotnet.TransactionRecord.SpendBundle%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_TransactionRecord_SpendBundle.md&amp;value=---%0Auid%3A%20chia.dotnet.TransactionRecord.SpendBundle%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/TransactionRecord.cs/#L38">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/TransactionRecord.cs/#L38">View Source</a>
   </span>
   <a id="chia_dotnet_TransactionRecord_SpendBundle_" data-uid="chia.dotnet.TransactionRecord.SpendBundle*"></a>
   <h4 id="chia_dotnet_TransactionRecord_SpendBundle" data-uid="chia.dotnet.TransactionRecord.SpendBundle">SpendBundle</h4>
@@ -755,24 +517,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_TransactionRecord_ToAddress.md&amp;value=---%0Auid%3A%20chia.dotnet.TransactionRecord.ToAddress%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_TransactionRecord_ToAddress.md&amp;value=---%0Auid%3A%20chia.dotnet.TransactionRecord.ToAddress%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_TransactionRecord_ToAddress.md&amp;value=---%0Auid%3A%20chia.dotnet.TransactionRecord.ToAddress%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/TransactionRecord.cs/#L39">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/TransactionRecord.cs/#L39">View Source</a>
   </span>
   <a id="chia_dotnet_TransactionRecord_ToAddress_" data-uid="chia.dotnet.TransactionRecord.ToAddress*"></a>
   <h4 id="chia_dotnet_TransactionRecord_ToAddress" data-uid="chia.dotnet.TransactionRecord.ToAddress">ToAddress</h4>
@@ -799,24 +547,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_TransactionRecord_ToPuzzleHash.md&amp;value=---%0Auid%3A%20chia.dotnet.TransactionRecord.ToPuzzleHash%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_TransactionRecord_ToPuzzleHash.md&amp;value=---%0Auid%3A%20chia.dotnet.TransactionRecord.ToPuzzleHash%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_TransactionRecord_ToPuzzleHash.md&amp;value=---%0Auid%3A%20chia.dotnet.TransactionRecord.ToPuzzleHash%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/TransactionRecord.cs/#L40">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/TransactionRecord.cs/#L40">View Source</a>
   </span>
   <a id="chia_dotnet_TransactionRecord_ToPuzzleHash_" data-uid="chia.dotnet.TransactionRecord.ToPuzzleHash*"></a>
   <h4 id="chia_dotnet_TransactionRecord_ToPuzzleHash" data-uid="chia.dotnet.TransactionRecord.ToPuzzleHash">ToPuzzleHash</h4>
@@ -843,24 +577,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_TransactionRecord_TradeId.md&amp;value=---%0Auid%3A%20chia.dotnet.TransactionRecord.TradeId%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_TransactionRecord_TradeId.md&amp;value=---%0Auid%3A%20chia.dotnet.TransactionRecord.TradeId%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_TransactionRecord_TradeId.md&amp;value=---%0Auid%3A%20chia.dotnet.TransactionRecord.TradeId%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/TransactionRecord.cs/#L41">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/TransactionRecord.cs/#L41">View Source</a>
   </span>
   <a id="chia_dotnet_TransactionRecord_TradeId_" data-uid="chia.dotnet.TransactionRecord.TradeId*"></a>
   <h4 id="chia_dotnet_TransactionRecord_TradeId" data-uid="chia.dotnet.TransactionRecord.TradeId">TradeId</h4>
@@ -887,24 +607,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_TransactionRecord_TransactionId.md&amp;value=---%0Auid%3A%20chia.dotnet.TransactionRecord.TransactionId%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_TransactionRecord_TransactionId.md&amp;value=---%0Auid%3A%20chia.dotnet.TransactionRecord.TransactionId%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_TransactionRecord_TransactionId.md&amp;value=---%0Auid%3A%20chia.dotnet.TransactionRecord.TransactionId%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/TransactionRecord.cs/#L22">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/TransactionRecord.cs/#L22">View Source</a>
   </span>
   <a id="chia_dotnet_TransactionRecord_TransactionId_" data-uid="chia.dotnet.TransactionRecord.TransactionId*"></a>
   <h4 id="chia_dotnet_TransactionRecord_TransactionId" data-uid="chia.dotnet.TransactionRecord.TransactionId">TransactionId</h4>
@@ -933,24 +639,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_TransactionRecord_Type.md&amp;value=---%0Auid%3A%20chia.dotnet.TransactionRecord.Type%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_TransactionRecord_Type.md&amp;value=---%0Auid%3A%20chia.dotnet.TransactionRecord.Type%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_TransactionRecord_Type.md&amp;value=---%0Auid%3A%20chia.dotnet.TransactionRecord.Type%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/TransactionRecord.cs/#L45">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/TransactionRecord.cs/#L45">View Source</a>
   </span>
   <a id="chia_dotnet_TransactionRecord_Type_" data-uid="chia.dotnet.TransactionRecord.Type*"></a>
   <h4 id="chia_dotnet_TransactionRecord_Type" data-uid="chia.dotnet.TransactionRecord.Type">Type</h4>
@@ -978,24 +670,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_TransactionRecord_WalletId.md&amp;value=---%0Auid%3A%20chia.dotnet.TransactionRecord.WalletId%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_TransactionRecord_WalletId.md&amp;value=---%0Auid%3A%20chia.dotnet.TransactionRecord.WalletId%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_TransactionRecord_WalletId.md&amp;value=---%0Auid%3A%20chia.dotnet.TransactionRecord.WalletId%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/TransactionRecord.cs/#L46">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/TransactionRecord.cs/#L46">View Source</a>
   </span>
   <a id="chia_dotnet_TransactionRecord_WalletId_" data-uid="chia.dotnet.TransactionRecord.WalletId*"></a>
   <h4 id="chia_dotnet_TransactionRecord_WalletId" data-uid="chia.dotnet.TransactionRecord.WalletId">WalletId</h4>
@@ -1032,24 +710,10 @@ <h3 id="implements">Implements</h3>
               <div class="contribution">
                 <ul class="nav">
                   <li>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-                    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_TransactionRecord.md&amp;value=---%0Auid%3A%20chia.dotnet.TransactionRecord%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-                    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_TransactionRecord.md&amp;value=---%0Auid%3A%20chia.dotnet.TransactionRecord%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-=======
                     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_TransactionRecord.md&amp;value=---%0Auid%3A%20chia.dotnet.TransactionRecord%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
                   </li>
                   <li>
-                    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/TransactionRecord.cs/#L11" class="contribution-link">View Source</a>
+                    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/TransactionRecord.cs/#L11" class="contribution-link">View Source</a>
                   </li>
                 </ul>
               </div>
diff --git a/docs/api/chia.dotnet.TransactionType.html b/docs/api/chia.dotnet.TransactionType.html
index 30f167f3..5685274e 100644
--- a/docs/api/chia.dotnet.TransactionType.html
+++ b/docs/api/chia.dotnet.TransactionType.html
@@ -125,24 +125,10 @@ <h3 id="fields">Fields
               <div class="contribution">
                 <ul class="nav">
                   <li>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
                     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_TransactionType.md&amp;value=---%0Auid%3A%20chia.dotnet.TransactionType%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-                    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_TransactionType.md&amp;value=---%0Auid%3A%20chia.dotnet.TransactionType%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-=======
-                    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_TransactionType.md&amp;value=---%0Auid%3A%20chia.dotnet.TransactionType%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
                   </li>
                   <li>
-                    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/TransactionType.cs/#L3" class="contribution-link">View Source</a>
+                    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/TransactionType.cs/#L3" class="contribution-link">View Source</a>
                   </li>
                 </ul>
               </div>
diff --git a/docs/api/chia.dotnet.TransactionTypeFilter.html b/docs/api/chia.dotnet.TransactionTypeFilter.html
index 1cfd6322..b1540fb6 100644
--- a/docs/api/chia.dotnet.TransactionTypeFilter.html
+++ b/docs/api/chia.dotnet.TransactionTypeFilter.html
@@ -90,21 +90,7 @@ <h5>Inherited Members</h5>
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object)">Object.Equals(Object)</a>
     </div>
     <div>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object-system-object)">Object.Equals(Object, Object)</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-      <span class="xref">System.Object.Equals(System.Object, System.Object)</span>
-=======
-      <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object-system-object)">Object.Equals(Object, Object)</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
     </div>
     <div>
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.gethashcode#system-object-gethashcode">Object.GetHashCode()</a>
@@ -132,24 +118,10 @@ <h3 id="properties">Properties
   </h3>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_TransactionTypeFilter_AssetId.md&amp;value=---%0Auid%3A%20chia.dotnet.TransactionTypeFilter.AssetId%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_TransactionTypeFilter_AssetId.md&amp;value=---%0Auid%3A%20chia.dotnet.TransactionTypeFilter.AssetId%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_TransactionTypeFilter_AssetId.md&amp;value=---%0Auid%3A%20chia.dotnet.TransactionTypeFilter.AssetId%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/TransactionTypeFilter.cs/#L5">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/TransactionTypeFilter.cs/#L5">View Source</a>
   </span>
   <a id="chia_dotnet_TransactionTypeFilter_AssetId_" data-uid="chia.dotnet.TransactionTypeFilter.AssetId*"></a>
   <h4 id="chia_dotnet_TransactionTypeFilter_AssetId" data-uid="chia.dotnet.TransactionTypeFilter.AssetId">AssetId</h4>
@@ -176,24 +148,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_TransactionTypeFilter_FirstSeenHeight.md&amp;value=---%0Auid%3A%20chia.dotnet.TransactionTypeFilter.FirstSeenHeight%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_TransactionTypeFilter_FirstSeenHeight.md&amp;value=---%0Auid%3A%20chia.dotnet.TransactionTypeFilter.FirstSeenHeight%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_TransactionTypeFilter_FirstSeenHeight.md&amp;value=---%0Auid%3A%20chia.dotnet.TransactionTypeFilter.FirstSeenHeight%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/TransactionTypeFilter.cs/#L7">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/TransactionTypeFilter.cs/#L7">View Source</a>
   </span>
   <a id="chia_dotnet_TransactionTypeFilter_FirstSeenHeight_" data-uid="chia.dotnet.TransactionTypeFilter.FirstSeenHeight*"></a>
   <h4 id="chia_dotnet_TransactionTypeFilter_FirstSeenHeight" data-uid="chia.dotnet.TransactionTypeFilter.FirstSeenHeight">FirstSeenHeight</h4>
@@ -220,24 +178,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_TransactionTypeFilter_Name.md&amp;value=---%0Auid%3A%20chia.dotnet.TransactionTypeFilter.Name%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_TransactionTypeFilter_Name.md&amp;value=---%0Auid%3A%20chia.dotnet.TransactionTypeFilter.Name%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_TransactionTypeFilter_Name.md&amp;value=---%0Auid%3A%20chia.dotnet.TransactionTypeFilter.Name%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/TransactionTypeFilter.cs/#L6">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/TransactionTypeFilter.cs/#L6">View Source</a>
   </span>
   <a id="chia_dotnet_TransactionTypeFilter_Name_" data-uid="chia.dotnet.TransactionTypeFilter.Name*"></a>
   <h4 id="chia_dotnet_TransactionTypeFilter_Name" data-uid="chia.dotnet.TransactionTypeFilter.Name">Name</h4>
@@ -264,24 +208,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_TransactionTypeFilter_SenderPuzzleHash.md&amp;value=---%0Auid%3A%20chia.dotnet.TransactionTypeFilter.SenderPuzzleHash%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_TransactionTypeFilter_SenderPuzzleHash.md&amp;value=---%0Auid%3A%20chia.dotnet.TransactionTypeFilter.SenderPuzzleHash%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_TransactionTypeFilter_SenderPuzzleHash.md&amp;value=---%0Auid%3A%20chia.dotnet.TransactionTypeFilter.SenderPuzzleHash%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/TransactionTypeFilter.cs/#L8">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/TransactionTypeFilter.cs/#L8">View Source</a>
   </span>
   <a id="chia_dotnet_TransactionTypeFilter_SenderPuzzleHash_" data-uid="chia.dotnet.TransactionTypeFilter.SenderPuzzleHash*"></a>
   <h4 id="chia_dotnet_TransactionTypeFilter_SenderPuzzleHash" data-uid="chia.dotnet.TransactionTypeFilter.SenderPuzzleHash">SenderPuzzleHash</h4>
@@ -318,24 +248,10 @@ <h3 id="implements">Implements</h3>
               <div class="contribution">
                 <ul class="nav">
                   <li>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-                    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_TransactionTypeFilter.md&amp;value=---%0Auid%3A%20chia.dotnet.TransactionTypeFilter%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-                    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_TransactionTypeFilter.md&amp;value=---%0Auid%3A%20chia.dotnet.TransactionTypeFilter%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-=======
                     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_TransactionTypeFilter.md&amp;value=---%0Auid%3A%20chia.dotnet.TransactionTypeFilter%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
                   </li>
                   <li>
-                    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/TransactionTypeFilter.cs/#L3" class="contribution-link">View Source</a>
+                    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/TransactionTypeFilter.cs/#L3" class="contribution-link">View Source</a>
                   </li>
                 </ul>
               </div>
diff --git a/docs/api/chia.dotnet.TransactionsInfo.html b/docs/api/chia.dotnet.TransactionsInfo.html
index 6fdcf55c..fd646b2c 100644
--- a/docs/api/chia.dotnet.TransactionsInfo.html
+++ b/docs/api/chia.dotnet.TransactionsInfo.html
@@ -91,21 +91,7 @@ <h5>Inherited Members</h5>
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object)">Object.Equals(Object)</a>
     </div>
     <div>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object-system-object)">Object.Equals(Object, Object)</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-      <span class="xref">System.Object.Equals(System.Object, System.Object)</span>
-=======
-      <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object-system-object)">Object.Equals(Object, Object)</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
     </div>
     <div>
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.gethashcode#system-object-gethashcode">Object.GetHashCode()</a>
@@ -133,24 +119,10 @@ <h3 id="properties">Properties
   </h3>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_TransactionsInfo_AggregatedSignature.md&amp;value=---%0Auid%3A%20chia.dotnet.TransactionsInfo.AggregatedSignature%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_TransactionsInfo_AggregatedSignature.md&amp;value=---%0Auid%3A%20chia.dotnet.TransactionsInfo.AggregatedSignature%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_TransactionsInfo_AggregatedSignature.md&amp;value=---%0Auid%3A%20chia.dotnet.TransactionsInfo.AggregatedSignature%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/TransactionsInfo.cs/#L18">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/TransactionsInfo.cs/#L18">View Source</a>
   </span>
   <a id="chia_dotnet_TransactionsInfo_AggregatedSignature_" data-uid="chia.dotnet.TransactionsInfo.AggregatedSignature*"></a>
   <h4 id="chia_dotnet_TransactionsInfo_AggregatedSignature" data-uid="chia.dotnet.TransactionsInfo.AggregatedSignature">AggregatedSignature</h4>
@@ -177,24 +149,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_TransactionsInfo_Cost.md&amp;value=---%0Auid%3A%20chia.dotnet.TransactionsInfo.Cost%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_TransactionsInfo_Cost.md&amp;value=---%0Auid%3A%20chia.dotnet.TransactionsInfo.Cost%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_TransactionsInfo_Cost.md&amp;value=---%0Auid%3A%20chia.dotnet.TransactionsInfo.Cost%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/TransactionsInfo.cs/#L26">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/TransactionsInfo.cs/#L26">View Source</a>
   </span>
   <a id="chia_dotnet_TransactionsInfo_Cost_" data-uid="chia.dotnet.TransactionsInfo.Cost*"></a>
   <h4 id="chia_dotnet_TransactionsInfo_Cost" data-uid="chia.dotnet.TransactionsInfo.Cost">Cost</h4>
@@ -222,24 +180,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_TransactionsInfo_Fees.md&amp;value=---%0Auid%3A%20chia.dotnet.TransactionsInfo.Fees%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_TransactionsInfo_Fees.md&amp;value=---%0Auid%3A%20chia.dotnet.TransactionsInfo.Fees%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_TransactionsInfo_Fees.md&amp;value=---%0Auid%3A%20chia.dotnet.TransactionsInfo.Fees%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/TransactionsInfo.cs/#L22">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/TransactionsInfo.cs/#L22">View Source</a>
   </span>
   <a id="chia_dotnet_TransactionsInfo_Fees_" data-uid="chia.dotnet.TransactionsInfo.Fees*"></a>
   <h4 id="chia_dotnet_TransactionsInfo_Fees" data-uid="chia.dotnet.TransactionsInfo.Fees">Fees</h4>
@@ -267,24 +211,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_TransactionsInfo_GeneratorRefsRoot.md&amp;value=---%0Auid%3A%20chia.dotnet.TransactionsInfo.GeneratorRefsRoot%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_TransactionsInfo_GeneratorRefsRoot.md&amp;value=---%0Auid%3A%20chia.dotnet.TransactionsInfo.GeneratorRefsRoot%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_TransactionsInfo_GeneratorRefsRoot.md&amp;value=---%0Auid%3A%20chia.dotnet.TransactionsInfo.GeneratorRefsRoot%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/TransactionsInfo.cs/#L17">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/TransactionsInfo.cs/#L17">View Source</a>
   </span>
   <a id="chia_dotnet_TransactionsInfo_GeneratorRefsRoot_" data-uid="chia.dotnet.TransactionsInfo.GeneratorRefsRoot*"></a>
   <h4 id="chia_dotnet_TransactionsInfo_GeneratorRefsRoot" data-uid="chia.dotnet.TransactionsInfo.GeneratorRefsRoot">GeneratorRefsRoot</h4>
@@ -312,24 +242,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_TransactionsInfo_GeneratorRoot.md&amp;value=---%0Auid%3A%20chia.dotnet.TransactionsInfo.GeneratorRoot%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_TransactionsInfo_GeneratorRoot.md&amp;value=---%0Auid%3A%20chia.dotnet.TransactionsInfo.GeneratorRoot%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_TransactionsInfo_GeneratorRoot.md&amp;value=---%0Auid%3A%20chia.dotnet.TransactionsInfo.GeneratorRoot%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/TransactionsInfo.cs/#L13">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/TransactionsInfo.cs/#L13">View Source</a>
   </span>
   <a id="chia_dotnet_TransactionsInfo_GeneratorRoot_" data-uid="chia.dotnet.TransactionsInfo.GeneratorRoot*"></a>
   <h4 id="chia_dotnet_TransactionsInfo_GeneratorRoot" data-uid="chia.dotnet.TransactionsInfo.GeneratorRoot">GeneratorRoot</h4>
@@ -357,24 +273,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_TransactionsInfo_RewardClaimsIncorporated.md&amp;value=---%0Auid%3A%20chia.dotnet.TransactionsInfo.RewardClaimsIncorporated%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_TransactionsInfo_RewardClaimsIncorporated.md&amp;value=---%0Auid%3A%20chia.dotnet.TransactionsInfo.RewardClaimsIncorporated%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_TransactionsInfo_RewardClaimsIncorporated.md&amp;value=---%0Auid%3A%20chia.dotnet.TransactionsInfo.RewardClaimsIncorporated%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/TransactionsInfo.cs/#L30">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/TransactionsInfo.cs/#L30">View Source</a>
   </span>
   <a id="chia_dotnet_TransactionsInfo_RewardClaimsIncorporated_" data-uid="chia.dotnet.TransactionsInfo.RewardClaimsIncorporated*"></a>
   <h4 id="chia_dotnet_TransactionsInfo_RewardClaimsIncorporated" data-uid="chia.dotnet.TransactionsInfo.RewardClaimsIncorporated">RewardClaimsIncorporated</h4>
@@ -383,21 +285,7 @@ <h4 id="chia_dotnet_TransactionsInfo_RewardClaimsIncorporated" data-uid="chia.do
   <div class="markdown level1 conceptual"></div>
   <h5 class="decalaration">Declaration</h5>
   <div class="codewrapper">
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <pre><code class="lang-csharp hljs">public IEnumerable&lt;Coin&gt; RewardClaimsIncorporated { get; set; }</code></pre>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <pre><code class="lang-csharp hljs">public ICollection&lt;Coin&gt; RewardClaimsIncorporated { get; set; }</code></pre>
-=======
-    <pre><code class="lang-csharp hljs">public IEnumerable&lt;Coin&gt; RewardClaimsIncorporated { get; set; }</code></pre>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </div>
   <h5 class="propertyValue">Property Value</h5>
   <table class="table table-bordered table-striped table-condensed">
@@ -426,24 +314,10 @@ <h3 id="implements">Implements</h3>
               <div class="contribution">
                 <ul class="nav">
                   <li>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-                    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_TransactionsInfo.md&amp;value=---%0Auid%3A%20chia.dotnet.TransactionsInfo%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-                    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_TransactionsInfo.md&amp;value=---%0Auid%3A%20chia.dotnet.TransactionsInfo%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-=======
                     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_TransactionsInfo.md&amp;value=---%0Auid%3A%20chia.dotnet.TransactionsInfo%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
                   </li>
                   <li>
-                    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/TransactionsInfo.cs/#L8" class="contribution-link">View Source</a>
+                    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/TransactionsInfo.cs/#L8" class="contribution-link">View Source</a>
                   </li>
                 </ul>
               </div>
diff --git a/docs/api/chia.dotnet.UInt32Range.html b/docs/api/chia.dotnet.UInt32Range.html
index 0e45d0e4..1c7112b8 100644
--- a/docs/api/chia.dotnet.UInt32Range.html
+++ b/docs/api/chia.dotnet.UInt32Range.html
@@ -90,21 +90,7 @@ <h5>Inherited Members</h5>
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object)">Object.Equals(Object)</a>
     </div>
     <div>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object-system-object)">Object.Equals(Object, Object)</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-      <span class="xref">System.Object.Equals(System.Object, System.Object)</span>
-=======
-      <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object-system-object)">Object.Equals(Object, Object)</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
     </div>
     <div>
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.gethashcode#system-object-gethashcode">Object.GetHashCode()</a>
@@ -132,24 +118,10 @@ <h3 id="properties">Properties
   </h3>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_UInt32Range_Start.md&amp;value=---%0Auid%3A%20chia.dotnet.UInt32Range.Start%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_UInt32Range_Start.md&amp;value=---%0Auid%3A%20chia.dotnet.UInt32Range.Start%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_UInt32Range_Start.md&amp;value=---%0Auid%3A%20chia.dotnet.UInt32Range.Start%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/UInt32Range.cs/#L5">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/UInt32Range.cs/#L5">View Source</a>
   </span>
   <a id="chia_dotnet_UInt32Range_Start_" data-uid="chia.dotnet.UInt32Range.Start*"></a>
   <h4 id="chia_dotnet_UInt32Range_Start" data-uid="chia.dotnet.UInt32Range.Start">Start</h4>
@@ -176,24 +148,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_UInt32Range_Stop.md&amp;value=---%0Auid%3A%20chia.dotnet.UInt32Range.Stop%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_UInt32Range_Stop.md&amp;value=---%0Auid%3A%20chia.dotnet.UInt32Range.Stop%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_UInt32Range_Stop.md&amp;value=---%0Auid%3A%20chia.dotnet.UInt32Range.Stop%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/UInt32Range.cs/#L6">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/UInt32Range.cs/#L6">View Source</a>
   </span>
   <a id="chia_dotnet_UInt32Range_Stop_" data-uid="chia.dotnet.UInt32Range.Stop*"></a>
   <h4 id="chia_dotnet_UInt32Range_Stop" data-uid="chia.dotnet.UInt32Range.Stop">Stop</h4>
@@ -230,24 +188,10 @@ <h3 id="implements">Implements</h3>
               <div class="contribution">
                 <ul class="nav">
                   <li>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-                    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_UInt32Range.md&amp;value=---%0Auid%3A%20chia.dotnet.UInt32Range%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-                    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_UInt32Range.md&amp;value=---%0Auid%3A%20chia.dotnet.UInt32Range%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-=======
                     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_UInt32Range.md&amp;value=---%0Auid%3A%20chia.dotnet.UInt32Range%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
                   </li>
                   <li>
-                    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/UInt32Range.cs/#L3" class="contribution-link">View Source</a>
+                    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/UInt32Range.cs/#L3" class="contribution-link">View Source</a>
                   </li>
                 </ul>
               </div>
diff --git a/docs/api/chia.dotnet.UInt64Range.html b/docs/api/chia.dotnet.UInt64Range.html
index 44723a02..a7c42c78 100644
--- a/docs/api/chia.dotnet.UInt64Range.html
+++ b/docs/api/chia.dotnet.UInt64Range.html
@@ -90,21 +90,7 @@ <h5>Inherited Members</h5>
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object)">Object.Equals(Object)</a>
     </div>
     <div>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object-system-object)">Object.Equals(Object, Object)</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-      <span class="xref">System.Object.Equals(System.Object, System.Object)</span>
-=======
-      <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object-system-object)">Object.Equals(Object, Object)</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
     </div>
     <div>
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.gethashcode#system-object-gethashcode">Object.GetHashCode()</a>
@@ -132,24 +118,10 @@ <h3 id="properties">Properties
   </h3>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_UInt64Range_Start.md&amp;value=---%0Auid%3A%20chia.dotnet.UInt64Range.Start%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_UInt64Range_Start.md&amp;value=---%0Auid%3A%20chia.dotnet.UInt64Range.Start%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_UInt64Range_Start.md&amp;value=---%0Auid%3A%20chia.dotnet.UInt64Range.Start%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/UInt64Range.cs/#L5">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/UInt64Range.cs/#L5">View Source</a>
   </span>
   <a id="chia_dotnet_UInt64Range_Start_" data-uid="chia.dotnet.UInt64Range.Start*"></a>
   <h4 id="chia_dotnet_UInt64Range_Start" data-uid="chia.dotnet.UInt64Range.Start">Start</h4>
@@ -176,24 +148,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_UInt64Range_Stop.md&amp;value=---%0Auid%3A%20chia.dotnet.UInt64Range.Stop%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_UInt64Range_Stop.md&amp;value=---%0Auid%3A%20chia.dotnet.UInt64Range.Stop%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_UInt64Range_Stop.md&amp;value=---%0Auid%3A%20chia.dotnet.UInt64Range.Stop%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/UInt64Range.cs/#L6">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/UInt64Range.cs/#L6">View Source</a>
   </span>
   <a id="chia_dotnet_UInt64Range_Stop_" data-uid="chia.dotnet.UInt64Range.Stop*"></a>
   <h4 id="chia_dotnet_UInt64Range_Stop" data-uid="chia.dotnet.UInt64Range.Stop">Stop</h4>
@@ -230,24 +188,10 @@ <h3 id="implements">Implements</h3>
               <div class="contribution">
                 <ul class="nav">
                   <li>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-                    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_UInt64Range.md&amp;value=---%0Auid%3A%20chia.dotnet.UInt64Range%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-                    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_UInt64Range.md&amp;value=---%0Auid%3A%20chia.dotnet.UInt64Range%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-=======
                     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_UInt64Range.md&amp;value=---%0Auid%3A%20chia.dotnet.UInt64Range%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
                   </li>
                   <li>
-                    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/UInt64Range.cs/#L3" class="contribution-link">View Source</a>
+                    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/UInt64Range.cs/#L3" class="contribution-link">View Source</a>
                   </li>
                 </ul>
               </div>
diff --git a/docs/api/chia.dotnet.UnfinishedHeaderBlock.html b/docs/api/chia.dotnet.UnfinishedHeaderBlock.html
index 5a24be08..20492c57 100644
--- a/docs/api/chia.dotnet.UnfinishedHeaderBlock.html
+++ b/docs/api/chia.dotnet.UnfinishedHeaderBlock.html
@@ -91,21 +91,7 @@ <h5>Inherited Members</h5>
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object)">Object.Equals(Object)</a>
     </div>
     <div>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object-system-object)">Object.Equals(Object, Object)</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-      <span class="xref">System.Object.Equals(System.Object, System.Object)</span>
-=======
-      <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object-system-object)">Object.Equals(Object, Object)</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
     </div>
     <div>
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.gethashcode#system-object-gethashcode">Object.GetHashCode()</a>
@@ -133,24 +119,10 @@ <h3 id="properties">Properties
   </h3>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_UnfinishedHeaderBlock_ChallengeChainSpProof.md&amp;value=---%0Auid%3A%20chia.dotnet.UnfinishedHeaderBlock.ChallengeChainSpProof%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_UnfinishedHeaderBlock_ChallengeChainSpProof.md&amp;value=---%0Auid%3A%20chia.dotnet.UnfinishedHeaderBlock.ChallengeChainSpProof%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_UnfinishedHeaderBlock_ChallengeChainSpProof.md&amp;value=---%0Auid%3A%20chia.dotnet.UnfinishedHeaderBlock.ChallengeChainSpProof%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/UnfinishedHeaderBlock.cs/#L21">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/UnfinishedHeaderBlock.cs/#L21">View Source</a>
   </span>
   <a id="chia_dotnet_UnfinishedHeaderBlock_ChallengeChainSpProof_" data-uid="chia.dotnet.UnfinishedHeaderBlock.ChallengeChainSpProof*"></a>
   <h4 id="chia_dotnet_UnfinishedHeaderBlock_ChallengeChainSpProof" data-uid="chia.dotnet.UnfinishedHeaderBlock.ChallengeChainSpProof">ChallengeChainSpProof</h4>
@@ -178,24 +150,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_UnfinishedHeaderBlock_FinishedSubSlots.md&amp;value=---%0Auid%3A%20chia.dotnet.UnfinishedHeaderBlock.FinishedSubSlots%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_UnfinishedHeaderBlock_FinishedSubSlots.md&amp;value=---%0Auid%3A%20chia.dotnet.UnfinishedHeaderBlock.FinishedSubSlots%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_UnfinishedHeaderBlock_FinishedSubSlots.md&amp;value=---%0Auid%3A%20chia.dotnet.UnfinishedHeaderBlock.FinishedSubSlots%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/UnfinishedHeaderBlock.cs/#L13">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/UnfinishedHeaderBlock.cs/#L13">View Source</a>
   </span>
   <a id="chia_dotnet_UnfinishedHeaderBlock_FinishedSubSlots_" data-uid="chia.dotnet.UnfinishedHeaderBlock.FinishedSubSlots*"></a>
   <h4 id="chia_dotnet_UnfinishedHeaderBlock_FinishedSubSlots" data-uid="chia.dotnet.UnfinishedHeaderBlock.FinishedSubSlots">FinishedSubSlots</h4>
@@ -204,21 +162,7 @@ <h4 id="chia_dotnet_UnfinishedHeaderBlock_FinishedSubSlots" data-uid="chia.dotne
   <div class="markdown level1 conceptual"></div>
   <h5 class="decalaration">Declaration</h5>
   <div class="codewrapper">
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <pre><code class="lang-csharp hljs">public IEnumerable&lt;EndOfSubSlotBundle&gt; FinishedSubSlots { get; set; }</code></pre>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <pre><code class="lang-csharp hljs">public ICollection&lt;EndOfSubSlotBundle&gt; FinishedSubSlots { get; set; }</code></pre>
-=======
-    <pre><code class="lang-csharp hljs">public IEnumerable&lt;EndOfSubSlotBundle&gt; FinishedSubSlots { get; set; }</code></pre>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </div>
   <h5 class="propertyValue">Property Value</h5>
   <table class="table table-bordered table-striped table-condensed">
@@ -237,24 +181,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_UnfinishedHeaderBlock_Foliage.md&amp;value=---%0Auid%3A%20chia.dotnet.UnfinishedHeaderBlock.Foliage%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_UnfinishedHeaderBlock_Foliage.md&amp;value=---%0Auid%3A%20chia.dotnet.UnfinishedHeaderBlock.Foliage%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_UnfinishedHeaderBlock_Foliage.md&amp;value=---%0Auid%3A%20chia.dotnet.UnfinishedHeaderBlock.Foliage%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/UnfinishedHeaderBlock.cs/#L29">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/UnfinishedHeaderBlock.cs/#L29">View Source</a>
   </span>
   <a id="chia_dotnet_UnfinishedHeaderBlock_Foliage_" data-uid="chia.dotnet.UnfinishedHeaderBlock.Foliage*"></a>
   <h4 id="chia_dotnet_UnfinishedHeaderBlock_Foliage" data-uid="chia.dotnet.UnfinishedHeaderBlock.Foliage">Foliage</h4>
@@ -282,24 +212,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_UnfinishedHeaderBlock_FoliageTransactionBlock.md&amp;value=---%0Auid%3A%20chia.dotnet.UnfinishedHeaderBlock.FoliageTransactionBlock%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_UnfinishedHeaderBlock_FoliageTransactionBlock.md&amp;value=---%0Auid%3A%20chia.dotnet.UnfinishedHeaderBlock.FoliageTransactionBlock%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_UnfinishedHeaderBlock_FoliageTransactionBlock.md&amp;value=---%0Auid%3A%20chia.dotnet.UnfinishedHeaderBlock.FoliageTransactionBlock%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/UnfinishedHeaderBlock.cs/#L33">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/UnfinishedHeaderBlock.cs/#L33">View Source</a>
   </span>
   <a id="chia_dotnet_UnfinishedHeaderBlock_FoliageTransactionBlock_" data-uid="chia.dotnet.UnfinishedHeaderBlock.FoliageTransactionBlock*"></a>
   <h4 id="chia_dotnet_UnfinishedHeaderBlock_FoliageTransactionBlock" data-uid="chia.dotnet.UnfinishedHeaderBlock.FoliageTransactionBlock">FoliageTransactionBlock</h4>
@@ -327,24 +243,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_UnfinishedHeaderBlock_RewardChainBlock.md&amp;value=---%0Auid%3A%20chia.dotnet.UnfinishedHeaderBlock.RewardChainBlock%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_UnfinishedHeaderBlock_RewardChainBlock.md&amp;value=---%0Auid%3A%20chia.dotnet.UnfinishedHeaderBlock.RewardChainBlock%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_UnfinishedHeaderBlock_RewardChainBlock.md&amp;value=---%0Auid%3A%20chia.dotnet.UnfinishedHeaderBlock.RewardChainBlock%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/UnfinishedHeaderBlock.cs/#L17">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/UnfinishedHeaderBlock.cs/#L17">View Source</a>
   </span>
   <a id="chia_dotnet_UnfinishedHeaderBlock_RewardChainBlock_" data-uid="chia.dotnet.UnfinishedHeaderBlock.RewardChainBlock*"></a>
   <h4 id="chia_dotnet_UnfinishedHeaderBlock_RewardChainBlock" data-uid="chia.dotnet.UnfinishedHeaderBlock.RewardChainBlock">RewardChainBlock</h4>
@@ -372,24 +274,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_UnfinishedHeaderBlock_RewardChainSpProof.md&amp;value=---%0Auid%3A%20chia.dotnet.UnfinishedHeaderBlock.RewardChainSpProof%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_UnfinishedHeaderBlock_RewardChainSpProof.md&amp;value=---%0Auid%3A%20chia.dotnet.UnfinishedHeaderBlock.RewardChainSpProof%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_UnfinishedHeaderBlock_RewardChainSpProof.md&amp;value=---%0Auid%3A%20chia.dotnet.UnfinishedHeaderBlock.RewardChainSpProof%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/UnfinishedHeaderBlock.cs/#L25">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/UnfinishedHeaderBlock.cs/#L25">View Source</a>
   </span>
   <a id="chia_dotnet_UnfinishedHeaderBlock_RewardChainSpProof_" data-uid="chia.dotnet.UnfinishedHeaderBlock.RewardChainSpProof*"></a>
   <h4 id="chia_dotnet_UnfinishedHeaderBlock_RewardChainSpProof" data-uid="chia.dotnet.UnfinishedHeaderBlock.RewardChainSpProof">RewardChainSpProof</h4>
@@ -417,24 +305,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_UnfinishedHeaderBlock_TransactionsFilter.md&amp;value=---%0Auid%3A%20chia.dotnet.UnfinishedHeaderBlock.TransactionsFilter%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_UnfinishedHeaderBlock_TransactionsFilter.md&amp;value=---%0Auid%3A%20chia.dotnet.UnfinishedHeaderBlock.TransactionsFilter%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_UnfinishedHeaderBlock_TransactionsFilter.md&amp;value=---%0Auid%3A%20chia.dotnet.UnfinishedHeaderBlock.TransactionsFilter%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/UnfinishedHeaderBlock.cs/#L37">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/UnfinishedHeaderBlock.cs/#L37">View Source</a>
   </span>
   <a id="chia_dotnet_UnfinishedHeaderBlock_TransactionsFilter_" data-uid="chia.dotnet.UnfinishedHeaderBlock.TransactionsFilter*"></a>
   <h4 id="chia_dotnet_UnfinishedHeaderBlock_TransactionsFilter" data-uid="chia.dotnet.UnfinishedHeaderBlock.TransactionsFilter">TransactionsFilter</h4>
@@ -472,24 +346,10 @@ <h3 id="implements">Implements</h3>
               <div class="contribution">
                 <ul class="nav">
                   <li>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-                    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_UnfinishedHeaderBlock.md&amp;value=---%0Auid%3A%20chia.dotnet.UnfinishedHeaderBlock%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-                    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_UnfinishedHeaderBlock.md&amp;value=---%0Auid%3A%20chia.dotnet.UnfinishedHeaderBlock%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-=======
                     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_UnfinishedHeaderBlock.md&amp;value=---%0Auid%3A%20chia.dotnet.UnfinishedHeaderBlock%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
                   </li>
                   <li>
-                    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/UnfinishedHeaderBlock.cs/#L8" class="contribution-link">View Source</a>
+                    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/UnfinishedHeaderBlock.cs/#L8" class="contribution-link">View Source</a>
                   </li>
                 </ul>
               </div>
diff --git a/docs/api/chia.dotnet.VCLineageProof.html b/docs/api/chia.dotnet.VCLineageProof.html
index 0875a12f..180d1b47 100644
--- a/docs/api/chia.dotnet.VCLineageProof.html
+++ b/docs/api/chia.dotnet.VCLineageProof.html
@@ -102,21 +102,7 @@ <h5>Inherited Members</h5>
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object)">Object.Equals(Object)</a>
     </div>
     <div>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object-system-object)">Object.Equals(Object, Object)</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-      <span class="xref">System.Object.Equals(System.Object, System.Object)</span>
-=======
-      <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object-system-object)">Object.Equals(Object, Object)</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
     </div>
     <div>
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.gethashcode#system-object-gethashcode">Object.GetHashCode()</a>
@@ -144,24 +130,10 @@ <h3 id="properties">Properties
   </h3>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_VCLineageProof_ParentProofHash.md&amp;value=---%0Auid%3A%20chia.dotnet.VCLineageProof.ParentProofHash%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_VCLineageProof_ParentProofHash.md&amp;value=---%0Auid%3A%20chia.dotnet.VCLineageProof.ParentProofHash%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_VCLineageProof_ParentProofHash.md&amp;value=---%0Auid%3A%20chia.dotnet.VCLineageProof.ParentProofHash%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/VCLineageProof.cs/#L8">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/VCLineageProof.cs/#L8">View Source</a>
   </span>
   <a id="chia_dotnet_VCLineageProof_ParentProofHash_" data-uid="chia.dotnet.VCLineageProof.ParentProofHash*"></a>
   <h4 id="chia_dotnet_VCLineageProof_ParentProofHash" data-uid="chia.dotnet.VCLineageProof.ParentProofHash">ParentProofHash</h4>
@@ -201,24 +173,10 @@ <h3 id="implements">Implements</h3>
               <div class="contribution">
                 <ul class="nav">
                   <li>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-                    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_VCLineageProof.md&amp;value=---%0Auid%3A%20chia.dotnet.VCLineageProof%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-                    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_VCLineageProof.md&amp;value=---%0Auid%3A%20chia.dotnet.VCLineageProof%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-=======
                     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_VCLineageProof.md&amp;value=---%0Auid%3A%20chia.dotnet.VCLineageProof%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
                   </li>
                   <li>
-                    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/VCLineageProof.cs/#L6" class="contribution-link">View Source</a>
+                    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/VCLineageProof.cs/#L6" class="contribution-link">View Source</a>
                   </li>
                 </ul>
               </div>
diff --git a/docs/api/chia.dotnet.VCProofs.html b/docs/api/chia.dotnet.VCProofs.html
index deb20042..9afbc152 100644
--- a/docs/api/chia.dotnet.VCProofs.html
+++ b/docs/api/chia.dotnet.VCProofs.html
@@ -90,21 +90,7 @@ <h5>Inherited Members</h5>
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object)">Object.Equals(Object)</a>
     </div>
     <div>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object-system-object)">Object.Equals(Object, Object)</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-      <span class="xref">System.Object.Equals(System.Object, System.Object)</span>
-=======
-      <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object-system-object)">Object.Equals(Object, Object)</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
     </div>
     <div>
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.gethashcode#system-object-gethashcode">Object.GetHashCode()</a>
@@ -132,24 +118,10 @@ <h3 id="properties">Properties
   </h3>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_VCProofs_KeyValuePairs.md&amp;value=---%0Auid%3A%20chia.dotnet.VCProofs.KeyValuePairs%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_VCProofs_KeyValuePairs.md&amp;value=---%0Auid%3A%20chia.dotnet.VCProofs.KeyValuePairs%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_VCProofs_KeyValuePairs.md&amp;value=---%0Auid%3A%20chia.dotnet.VCProofs.KeyValuePairs%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/VCProofs.cs/#L7">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/VCProofs.cs/#L7">View Source</a>
   </span>
   <a id="chia_dotnet_VCProofs_KeyValuePairs_" data-uid="chia.dotnet.VCProofs.KeyValuePairs*"></a>
   <h4 id="chia_dotnet_VCProofs_KeyValuePairs" data-uid="chia.dotnet.VCProofs.KeyValuePairs">KeyValuePairs</h4>
@@ -186,24 +158,10 @@ <h3 id="implements">Implements</h3>
               <div class="contribution">
                 <ul class="nav">
                   <li>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-                    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_VCProofs.md&amp;value=---%0Auid%3A%20chia.dotnet.VCProofs%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-                    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_VCProofs.md&amp;value=---%0Auid%3A%20chia.dotnet.VCProofs%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-=======
                     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_VCProofs.md&amp;value=---%0Auid%3A%20chia.dotnet.VCProofs%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
                   </li>
                   <li>
-                    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/VCProofs.cs/#L5" class="contribution-link">View Source</a>
+                    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/VCProofs.cs/#L5" class="contribution-link">View Source</a>
                   </li>
                 </ul>
               </div>
diff --git a/docs/api/chia.dotnet.VCRecord.html b/docs/api/chia.dotnet.VCRecord.html
index d59b9d41..f586e412 100644
--- a/docs/api/chia.dotnet.VCRecord.html
+++ b/docs/api/chia.dotnet.VCRecord.html
@@ -90,21 +90,7 @@ <h5>Inherited Members</h5>
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object)">Object.Equals(Object)</a>
     </div>
     <div>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object-system-object)">Object.Equals(Object, Object)</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-      <span class="xref">System.Object.Equals(System.Object, System.Object)</span>
-=======
-      <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object-system-object)">Object.Equals(Object, Object)</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
     </div>
     <div>
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.gethashcode#system-object-gethashcode">Object.GetHashCode()</a>
@@ -132,24 +118,10 @@ <h3 id="properties">Properties
   </h3>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_VCRecord_CoinId.md&amp;value=---%0Auid%3A%20chia.dotnet.VCRecord.CoinId%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_VCRecord_CoinId.md&amp;value=---%0Auid%3A%20chia.dotnet.VCRecord.CoinId%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_VCRecord_CoinId.md&amp;value=---%0Auid%3A%20chia.dotnet.VCRecord.CoinId%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/VCRecord.cs/#L5">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/VCRecord.cs/#L5">View Source</a>
   </span>
   <a id="chia_dotnet_VCRecord_CoinId_" data-uid="chia.dotnet.VCRecord.CoinId*"></a>
   <h4 id="chia_dotnet_VCRecord_CoinId" data-uid="chia.dotnet.VCRecord.CoinId">CoinId</h4>
@@ -176,24 +148,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_VCRecord_ConfirmedAtHeight.md&amp;value=---%0Auid%3A%20chia.dotnet.VCRecord.ConfirmedAtHeight%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_VCRecord_ConfirmedAtHeight.md&amp;value=---%0Auid%3A%20chia.dotnet.VCRecord.ConfirmedAtHeight%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_VCRecord_ConfirmedAtHeight.md&amp;value=---%0Auid%3A%20chia.dotnet.VCRecord.ConfirmedAtHeight%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/VCRecord.cs/#L7">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/VCRecord.cs/#L7">View Source</a>
   </span>
   <a id="chia_dotnet_VCRecord_ConfirmedAtHeight_" data-uid="chia.dotnet.VCRecord.ConfirmedAtHeight*"></a>
   <h4 id="chia_dotnet_VCRecord_ConfirmedAtHeight" data-uid="chia.dotnet.VCRecord.ConfirmedAtHeight">ConfirmedAtHeight</h4>
@@ -220,24 +178,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_VCRecord_VC.md&amp;value=---%0Auid%3A%20chia.dotnet.VCRecord.VC%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_VCRecord_VC.md&amp;value=---%0Auid%3A%20chia.dotnet.VCRecord.VC%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_VCRecord_VC.md&amp;value=---%0Auid%3A%20chia.dotnet.VCRecord.VC%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/VCRecord.cs/#L6">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/VCRecord.cs/#L6">View Source</a>
   </span>
   <a id="chia_dotnet_VCRecord_VC_" data-uid="chia.dotnet.VCRecord.VC*"></a>
   <h4 id="chia_dotnet_VCRecord_VC" data-uid="chia.dotnet.VCRecord.VC">VC</h4>
@@ -274,24 +218,10 @@ <h3 id="implements">Implements</h3>
               <div class="contribution">
                 <ul class="nav">
                   <li>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-                    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_VCRecord.md&amp;value=---%0Auid%3A%20chia.dotnet.VCRecord%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-                    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_VCRecord.md&amp;value=---%0Auid%3A%20chia.dotnet.VCRecord%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-=======
                     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_VCRecord.md&amp;value=---%0Auid%3A%20chia.dotnet.VCRecord%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
                   </li>
                   <li>
-                    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/VCRecord.cs/#L3" class="contribution-link">View Source</a>
+                    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/VCRecord.cs/#L3" class="contribution-link">View Source</a>
                   </li>
                 </ul>
               </div>
diff --git a/docs/api/chia.dotnet.VDFInfo.html b/docs/api/chia.dotnet.VDFInfo.html
index 6bdac176..c2d6449d 100644
--- a/docs/api/chia.dotnet.VDFInfo.html
+++ b/docs/api/chia.dotnet.VDFInfo.html
@@ -90,21 +90,7 @@ <h5>Inherited Members</h5>
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object)">Object.Equals(Object)</a>
     </div>
     <div>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object-system-object)">Object.Equals(Object, Object)</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-      <span class="xref">System.Object.Equals(System.Object, System.Object)</span>
-=======
-      <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object-system-object)">Object.Equals(Object, Object)</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
     </div>
     <div>
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.gethashcode#system-object-gethashcode">Object.GetHashCode()</a>
@@ -132,24 +118,10 @@ <h3 id="properties">Properties
   </h3>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_VDFInfo_Challenge.md&amp;value=---%0Auid%3A%20chia.dotnet.VDFInfo.Challenge%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_VDFInfo_Challenge.md&amp;value=---%0Auid%3A%20chia.dotnet.VDFInfo.Challenge%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_VDFInfo_Challenge.md&amp;value=---%0Auid%3A%20chia.dotnet.VDFInfo.Challenge%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/VDFInfo.cs/#L8">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/VDFInfo.cs/#L8">View Source</a>
   </span>
   <a id="chia_dotnet_VDFInfo_Challenge_" data-uid="chia.dotnet.VDFInfo.Challenge*"></a>
   <h4 id="chia_dotnet_VDFInfo_Challenge" data-uid="chia.dotnet.VDFInfo.Challenge">Challenge</h4>
@@ -177,24 +149,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_VDFInfo_NumberOfIterations.md&amp;value=---%0Auid%3A%20chia.dotnet.VDFInfo.NumberOfIterations%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_VDFInfo_NumberOfIterations.md&amp;value=---%0Auid%3A%20chia.dotnet.VDFInfo.NumberOfIterations%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_VDFInfo_NumberOfIterations.md&amp;value=---%0Auid%3A%20chia.dotnet.VDFInfo.NumberOfIterations%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/VDFInfo.cs/#L9">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/VDFInfo.cs/#L9">View Source</a>
   </span>
   <a id="chia_dotnet_VDFInfo_NumberOfIterations_" data-uid="chia.dotnet.VDFInfo.NumberOfIterations*"></a>
   <h4 id="chia_dotnet_VDFInfo_NumberOfIterations" data-uid="chia.dotnet.VDFInfo.NumberOfIterations">NumberOfIterations</h4>
@@ -221,24 +179,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_VDFInfo_Output.md&amp;value=---%0Auid%3A%20chia.dotnet.VDFInfo.Output%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_VDFInfo_Output.md&amp;value=---%0Auid%3A%20chia.dotnet.VDFInfo.Output%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_VDFInfo_Output.md&amp;value=---%0Auid%3A%20chia.dotnet.VDFInfo.Output%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/VDFInfo.cs/#L10">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/VDFInfo.cs/#L10">View Source</a>
   </span>
   <a id="chia_dotnet_VDFInfo_Output_" data-uid="chia.dotnet.VDFInfo.Output*"></a>
   <h4 id="chia_dotnet_VDFInfo_Output" data-uid="chia.dotnet.VDFInfo.Output">Output</h4>
@@ -275,24 +219,10 @@ <h3 id="implements">Implements</h3>
               <div class="contribution">
                 <ul class="nav">
                   <li>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-                    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_VDFInfo.md&amp;value=---%0Auid%3A%20chia.dotnet.VDFInfo%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-                    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_VDFInfo.md&amp;value=---%0Auid%3A%20chia.dotnet.VDFInfo%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-=======
                     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_VDFInfo.md&amp;value=---%0Auid%3A%20chia.dotnet.VDFInfo%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
                   </li>
                   <li>
-                    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/VDFInfo.cs/#L3" class="contribution-link">View Source</a>
+                    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/VDFInfo.cs/#L3" class="contribution-link">View Source</a>
                   </li>
                 </ul>
               </div>
diff --git a/docs/api/chia.dotnet.VDFProof.html b/docs/api/chia.dotnet.VDFProof.html
index 5371ca99..47ec2272 100644
--- a/docs/api/chia.dotnet.VDFProof.html
+++ b/docs/api/chia.dotnet.VDFProof.html
@@ -90,21 +90,7 @@ <h5>Inherited Members</h5>
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object)">Object.Equals(Object)</a>
     </div>
     <div>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object-system-object)">Object.Equals(Object, Object)</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-      <span class="xref">System.Object.Equals(System.Object, System.Object)</span>
-=======
-      <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object-system-object)">Object.Equals(Object, Object)</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
     </div>
     <div>
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.gethashcode#system-object-gethashcode">Object.GetHashCode()</a>
@@ -132,24 +118,10 @@ <h3 id="properties">Properties
   </h3>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_VDFProof_NormalizedToIdentity.md&amp;value=---%0Auid%3A%20chia.dotnet.VDFProof.NormalizedToIdentity%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_VDFProof_NormalizedToIdentity.md&amp;value=---%0Auid%3A%20chia.dotnet.VDFProof.NormalizedToIdentity%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_VDFProof_NormalizedToIdentity.md&amp;value=---%0Auid%3A%20chia.dotnet.VDFProof.NormalizedToIdentity%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/VDFProof.cs/#L7">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/VDFProof.cs/#L7">View Source</a>
   </span>
   <a id="chia_dotnet_VDFProof_NormalizedToIdentity_" data-uid="chia.dotnet.VDFProof.NormalizedToIdentity*"></a>
   <h4 id="chia_dotnet_VDFProof_NormalizedToIdentity" data-uid="chia.dotnet.VDFProof.NormalizedToIdentity">NormalizedToIdentity</h4>
@@ -176,24 +148,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_VDFProof_Witness.md&amp;value=---%0Auid%3A%20chia.dotnet.VDFProof.Witness%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_VDFProof_Witness.md&amp;value=---%0Auid%3A%20chia.dotnet.VDFProof.Witness%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_VDFProof_Witness.md&amp;value=---%0Auid%3A%20chia.dotnet.VDFProof.Witness%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/VDFProof.cs/#L6">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/VDFProof.cs/#L6">View Source</a>
   </span>
   <a id="chia_dotnet_VDFProof_Witness_" data-uid="chia.dotnet.VDFProof.Witness*"></a>
   <h4 id="chia_dotnet_VDFProof_Witness" data-uid="chia.dotnet.VDFProof.Witness">Witness</h4>
@@ -220,24 +178,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_VDFProof_WitnessType.md&amp;value=---%0Auid%3A%20chia.dotnet.VDFProof.WitnessType%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_VDFProof_WitnessType.md&amp;value=---%0Auid%3A%20chia.dotnet.VDFProof.WitnessType%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_VDFProof_WitnessType.md&amp;value=---%0Auid%3A%20chia.dotnet.VDFProof.WitnessType%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/VDFProof.cs/#L5">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/VDFProof.cs/#L5">View Source</a>
   </span>
   <a id="chia_dotnet_VDFProof_WitnessType_" data-uid="chia.dotnet.VDFProof.WitnessType*"></a>
   <h4 id="chia_dotnet_VDFProof_WitnessType" data-uid="chia.dotnet.VDFProof.WitnessType">WitnessType</h4>
@@ -274,24 +218,10 @@ <h3 id="implements">Implements</h3>
               <div class="contribution">
                 <ul class="nav">
                   <li>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-                    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_VDFProof.md&amp;value=---%0Auid%3A%20chia.dotnet.VDFProof%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-                    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_VDFProof.md&amp;value=---%0Auid%3A%20chia.dotnet.VDFProof%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-=======
                     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_VDFProof.md&amp;value=---%0Auid%3A%20chia.dotnet.VDFProof%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
                   </li>
                   <li>
-                    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/VDFProof.cs/#L3" class="contribution-link">View Source</a>
+                    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/VDFProof.cs/#L3" class="contribution-link">View Source</a>
                   </li>
                 </ul>
               </div>
diff --git a/docs/api/chia.dotnet.VerifiedCredential.html b/docs/api/chia.dotnet.VerifiedCredential.html
index dd0a74f4..61de4e86 100644
--- a/docs/api/chia.dotnet.VerifiedCredential.html
+++ b/docs/api/chia.dotnet.VerifiedCredential.html
@@ -93,21 +93,7 @@ <h5>Inherited Members</h5>
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object)">Object.Equals(Object)</a>
     </div>
     <div>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object-system-object)">Object.Equals(Object, Object)</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-      <span class="xref">System.Object.Equals(System.Object, System.Object)</span>
-=======
-      <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object-system-object)">Object.Equals(Object, Object)</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
     </div>
     <div>
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.gethashcode#system-object-gethashcode">Object.GetHashCode()</a>
@@ -135,24 +121,10 @@ <h3 id="properties">Properties
   </h3>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_VerifiedCredential_Coin.md&amp;value=---%0Auid%3A%20chia.dotnet.VerifiedCredential.Coin%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_VerifiedCredential_Coin.md&amp;value=---%0Auid%3A%20chia.dotnet.VerifiedCredential.Coin%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_VerifiedCredential_Coin.md&amp;value=---%0Auid%3A%20chia.dotnet.VerifiedCredential.Coin%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/VerifiedCredential.cs/#L10">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/VerifiedCredential.cs/#L10">View Source</a>
   </span>
   <a id="chia_dotnet_VerifiedCredential_Coin_" data-uid="chia.dotnet.VerifiedCredential.Coin*"></a>
   <h4 id="chia_dotnet_VerifiedCredential_Coin" data-uid="chia.dotnet.VerifiedCredential.Coin">Coin</h4>
@@ -179,24 +151,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_VerifiedCredential_EMLLineageProof.md&amp;value=---%0Auid%3A%20chia.dotnet.VerifiedCredential.EMLLineageProof%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_VerifiedCredential_EMLLineageProof.md&amp;value=---%0Auid%3A%20chia.dotnet.VerifiedCredential.EMLLineageProof%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_VerifiedCredential_EMLLineageProof.md&amp;value=---%0Auid%3A%20chia.dotnet.VerifiedCredential.EMLLineageProof%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/VerifiedCredential.cs/#L12">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/VerifiedCredential.cs/#L12">View Source</a>
   </span>
   <a id="chia_dotnet_VerifiedCredential_EMLLineageProof_" data-uid="chia.dotnet.VerifiedCredential.EMLLineageProof*"></a>
   <h4 id="chia_dotnet_VerifiedCredential_EMLLineageProof" data-uid="chia.dotnet.VerifiedCredential.EMLLineageProof">EMLLineageProof</h4>
@@ -223,24 +181,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_VerifiedCredential_InnerPuzzleHash.md&amp;value=---%0Auid%3A%20chia.dotnet.VerifiedCredential.InnerPuzzleHash%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_VerifiedCredential_InnerPuzzleHash.md&amp;value=---%0Auid%3A%20chia.dotnet.VerifiedCredential.InnerPuzzleHash%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_VerifiedCredential_InnerPuzzleHash.md&amp;value=---%0Auid%3A%20chia.dotnet.VerifiedCredential.InnerPuzzleHash%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/VerifiedCredential.cs/#L14">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/VerifiedCredential.cs/#L14">View Source</a>
   </span>
   <a id="chia_dotnet_VerifiedCredential_InnerPuzzleHash_" data-uid="chia.dotnet.VerifiedCredential.InnerPuzzleHash*"></a>
   <h4 id="chia_dotnet_VerifiedCredential_InnerPuzzleHash" data-uid="chia.dotnet.VerifiedCredential.InnerPuzzleHash">InnerPuzzleHash</h4>
@@ -267,24 +211,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_VerifiedCredential_LauncherId.md&amp;value=---%0Auid%3A%20chia.dotnet.VerifiedCredential.LauncherId%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_VerifiedCredential_LauncherId.md&amp;value=---%0Auid%3A%20chia.dotnet.VerifiedCredential.LauncherId%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_VerifiedCredential_LauncherId.md&amp;value=---%0Auid%3A%20chia.dotnet.VerifiedCredential.LauncherId%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/VerifiedCredential.cs/#L13">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/VerifiedCredential.cs/#L13">View Source</a>
   </span>
   <a id="chia_dotnet_VerifiedCredential_LauncherId_" data-uid="chia.dotnet.VerifiedCredential.LauncherId*"></a>
   <h4 id="chia_dotnet_VerifiedCredential_LauncherId" data-uid="chia.dotnet.VerifiedCredential.LauncherId">LauncherId</h4>
@@ -311,24 +241,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_VerifiedCredential_ProofHash.md&amp;value=---%0Auid%3A%20chia.dotnet.VerifiedCredential.ProofHash%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_VerifiedCredential_ProofHash.md&amp;value=---%0Auid%3A%20chia.dotnet.VerifiedCredential.ProofHash%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_VerifiedCredential_ProofHash.md&amp;value=---%0Auid%3A%20chia.dotnet.VerifiedCredential.ProofHash%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/VerifiedCredential.cs/#L16">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/VerifiedCredential.cs/#L16">View Source</a>
   </span>
   <a id="chia_dotnet_VerifiedCredential_ProofHash_" data-uid="chia.dotnet.VerifiedCredential.ProofHash*"></a>
   <h4 id="chia_dotnet_VerifiedCredential_ProofHash" data-uid="chia.dotnet.VerifiedCredential.ProofHash">ProofHash</h4>
@@ -355,24 +271,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_VerifiedCredential_ProofProvider.md&amp;value=---%0Auid%3A%20chia.dotnet.VerifiedCredential.ProofProvider%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_VerifiedCredential_ProofProvider.md&amp;value=---%0Auid%3A%20chia.dotnet.VerifiedCredential.ProofProvider%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_VerifiedCredential_ProofProvider.md&amp;value=---%0Auid%3A%20chia.dotnet.VerifiedCredential.ProofProvider%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/VerifiedCredential.cs/#L15">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/VerifiedCredential.cs/#L15">View Source</a>
   </span>
   <a id="chia_dotnet_VerifiedCredential_ProofProvider_" data-uid="chia.dotnet.VerifiedCredential.ProofProvider*"></a>
   <h4 id="chia_dotnet_VerifiedCredential_ProofProvider" data-uid="chia.dotnet.VerifiedCredential.ProofProvider">ProofProvider</h4>
@@ -399,24 +301,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_VerifiedCredential_SingletonLineageProof.md&amp;value=---%0Auid%3A%20chia.dotnet.VerifiedCredential.SingletonLineageProof%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_VerifiedCredential_SingletonLineageProof.md&amp;value=---%0Auid%3A%20chia.dotnet.VerifiedCredential.SingletonLineageProof%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_VerifiedCredential_SingletonLineageProof.md&amp;value=---%0Auid%3A%20chia.dotnet.VerifiedCredential.SingletonLineageProof%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/VerifiedCredential.cs/#L11">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/VerifiedCredential.cs/#L11">View Source</a>
   </span>
   <a id="chia_dotnet_VerifiedCredential_SingletonLineageProof_" data-uid="chia.dotnet.VerifiedCredential.SingletonLineageProof*"></a>
   <h4 id="chia_dotnet_VerifiedCredential_SingletonLineageProof" data-uid="chia.dotnet.VerifiedCredential.SingletonLineageProof">SingletonLineageProof</h4>
@@ -453,24 +341,10 @@ <h3 id="implements">Implements</h3>
               <div class="contribution">
                 <ul class="nav">
                   <li>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-                    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_VerifiedCredential.md&amp;value=---%0Auid%3A%20chia.dotnet.VerifiedCredential%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-                    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_VerifiedCredential.md&amp;value=---%0Auid%3A%20chia.dotnet.VerifiedCredential%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-=======
                     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_VerifiedCredential.md&amp;value=---%0Auid%3A%20chia.dotnet.VerifiedCredential%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
                   </li>
                   <li>
-                    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/VerifiedCredential.cs/#L8" class="contribution-link">View Source</a>
+                    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/VerifiedCredential.cs/#L8" class="contribution-link">View Source</a>
                   </li>
                 </ul>
               </div>
diff --git a/docs/api/chia.dotnet.VerifiedCredentialManager.html b/docs/api/chia.dotnet.VerifiedCredentialManager.html
index 934a7080..10e47759 100644
--- a/docs/api/chia.dotnet.VerifiedCredentialManager.html
+++ b/docs/api/chia.dotnet.VerifiedCredentialManager.html
@@ -115,24 +115,10 @@ <h3 id="constructors">Constructors
   </h3>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_VerifiedCredentialManager__ctor_chia_dotnet_WalletProxy_.md&amp;value=---%0Auid%3A%20chia.dotnet.VerifiedCredentialManager.%23ctor(chia.dotnet.WalletProxy)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_VerifiedCredentialManager__ctor_chia_dotnet_WalletProxy_.md&amp;value=---%0Auid%3A%20chia.dotnet.VerifiedCredentialManager.%23ctor(chia.dotnet.WalletProxy)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_VerifiedCredentialManager__ctor_chia_dotnet_WalletProxy_.md&amp;value=---%0Auid%3A%20chia.dotnet.VerifiedCredentialManager.%23ctor(chia.dotnet.WalletProxy)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/VerifiedCredentialManager.cs/#L16">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/VerifiedCredentialManager.cs/#L16">View Source</a>
   </span>
   <a id="chia_dotnet_VerifiedCredentialManager__ctor_" data-uid="chia.dotnet.VerifiedCredentialManager.#ctor*"></a>
   <h4 id="chia_dotnet_VerifiedCredentialManager__ctor_chia_dotnet_WalletProxy_" data-uid="chia.dotnet.VerifiedCredentialManager.#ctor(chia.dotnet.WalletProxy)">VerifiedCredentialManager(WalletProxy)</h4>
@@ -163,24 +149,10 @@ <h3 id="properties">Properties
   </h3>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_VerifiedCredentialManager_WalletProxy.md&amp;value=---%0Auid%3A%20chia.dotnet.VerifiedCredentialManager.WalletProxy%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_VerifiedCredentialManager_WalletProxy.md&amp;value=---%0Auid%3A%20chia.dotnet.VerifiedCredentialManager.WalletProxy%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_VerifiedCredentialManager_WalletProxy.md&amp;value=---%0Auid%3A%20chia.dotnet.VerifiedCredentialManager.WalletProxy%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/VerifiedCredentialManager.cs/#L14">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/VerifiedCredentialManager.cs/#L14">View Source</a>
   </span>
   <a id="chia_dotnet_VerifiedCredentialManager_WalletProxy_" data-uid="chia.dotnet.VerifiedCredentialManager.WalletProxy*"></a>
   <h4 id="chia_dotnet_VerifiedCredentialManager_WalletProxy" data-uid="chia.dotnet.VerifiedCredentialManager.WalletProxy">WalletProxy</h4>
@@ -209,24 +181,10 @@ <h3 id="methods">Methods
   </h3>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_VerifiedCredentialManager_AddProofs_chia_dotnet_VCProofs_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.VerifiedCredentialManager.AddProofs(chia.dotnet.VCProofs%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_VerifiedCredentialManager_AddProofs_chia_dotnet_VCProofs_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.VerifiedCredentialManager.AddProofs(chia.dotnet.VCProofs%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_VerifiedCredentialManager_AddProofs_chia_dotnet_VCProofs_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.VerifiedCredentialManager.AddProofs(chia.dotnet.VCProofs%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/VerifiedCredentialManager.cs/#L103">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/VerifiedCredentialManager.cs/#L103">View Source</a>
   </span>
   <a id="chia_dotnet_VerifiedCredentialManager_AddProofs_" data-uid="chia.dotnet.VerifiedCredentialManager.AddProofs*"></a>
   <h4 id="chia_dotnet_VerifiedCredentialManager_AddProofs_chia_dotnet_VCProofs_System_Threading_CancellationToken_" data-uid="chia.dotnet.VerifiedCredentialManager.AddProofs(chia.dotnet.VCProofs,System.Threading.CancellationToken)">AddProofs(VCProofs, CancellationToken)</h4>
@@ -278,24 +236,10 @@ <h5 class="returns">Returns</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_VerifiedCredentialManager_Get_System_String_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.VerifiedCredentialManager.Get(System.String%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_VerifiedCredentialManager_Get_System_String_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.VerifiedCredentialManager.Get(System.String%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_VerifiedCredentialManager_Get_System_String_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.VerifiedCredentialManager.Get(System.String%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/VerifiedCredentialManager.cs/#L27">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/VerifiedCredentialManager.cs/#L27">View Source</a>
   </span>
   <a id="chia_dotnet_VerifiedCredentialManager_Get_" data-uid="chia.dotnet.VerifiedCredentialManager.Get*"></a>
   <h4 id="chia_dotnet_VerifiedCredentialManager_Get_System_String_System_Threading_CancellationToken_" data-uid="chia.dotnet.VerifiedCredentialManager.Get(System.String,System.Threading.CancellationToken)">Get(String, CancellationToken)</h4>
@@ -347,24 +291,10 @@ <h5 class="returns">Returns</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_VerifiedCredentialManager_GetList_System_UInt32_System_UInt32_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.VerifiedCredentialManager.GetList(System.UInt32%2CSystem.UInt32%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_VerifiedCredentialManager_GetList_System_UInt32_System_UInt32_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.VerifiedCredentialManager.GetList(System.UInt32%2CSystem.UInt32%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_VerifiedCredentialManager_GetList_System_UInt32_System_UInt32_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.VerifiedCredentialManager.GetList(System.UInt32%2CSystem.UInt32%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/VerifiedCredentialManager.cs/#L41">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/VerifiedCredentialManager.cs/#L41">View Source</a>
   </span>
   <a id="chia_dotnet_VerifiedCredentialManager_GetList_" data-uid="chia.dotnet.VerifiedCredentialManager.GetList*"></a>
   <h4 id="chia_dotnet_VerifiedCredentialManager_GetList_System_UInt32_System_UInt32_System_Threading_CancellationToken_" data-uid="chia.dotnet.VerifiedCredentialManager.GetList(System.UInt32,System.UInt32,System.Threading.CancellationToken)">GetList(UInt32, UInt32, CancellationToken)</h4>
@@ -421,24 +351,10 @@ <h5 class="returns">Returns</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_VerifiedCredentialManager_GetProofsForRoot_System_String_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.VerifiedCredentialManager.GetProofsForRoot(System.String%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_VerifiedCredentialManager_GetProofsForRoot_System_String_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.VerifiedCredentialManager.GetProofsForRoot(System.String%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_VerifiedCredentialManager_GetProofsForRoot_System_String_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.VerifiedCredentialManager.GetProofsForRoot(System.String%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/VerifiedCredentialManager.cs/#L116">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/VerifiedCredentialManager.cs/#L116">View Source</a>
   </span>
   <a id="chia_dotnet_VerifiedCredentialManager_GetProofsForRoot_" data-uid="chia.dotnet.VerifiedCredentialManager.GetProofsForRoot*"></a>
   <h4 id="chia_dotnet_VerifiedCredentialManager_GetProofsForRoot_System_String_System_Threading_CancellationToken_" data-uid="chia.dotnet.VerifiedCredentialManager.GetProofsForRoot(System.String,System.Threading.CancellationToken)">GetProofsForRoot(String, CancellationToken)</h4>
@@ -490,24 +406,10 @@ <h5 class="returns">Returns</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_VerifiedCredentialManager_Mint_System_String_System_String_System_UInt64_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.VerifiedCredentialManager.Mint(System.String%2CSystem.String%2CSystem.UInt64%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_VerifiedCredentialManager_Mint_System_String_System_String_System_UInt64_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.VerifiedCredentialManager.Mint(System.String%2CSystem.String%2CSystem.UInt64%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_VerifiedCredentialManager_Mint_System_String_System_String_System_UInt64_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.VerifiedCredentialManager.Mint(System.String%2CSystem.String%2CSystem.UInt64%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/VerifiedCredentialManager.cs/#L57">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/VerifiedCredentialManager.cs/#L57">View Source</a>
   </span>
   <a id="chia_dotnet_VerifiedCredentialManager_Mint_" data-uid="chia.dotnet.VerifiedCredentialManager.Mint*"></a>
   <h4 id="chia_dotnet_VerifiedCredentialManager_Mint_System_String_System_String_System_UInt64_System_Threading_CancellationToken_" data-uid="chia.dotnet.VerifiedCredentialManager.Mint(System.String,System.String,System.UInt64,System.Threading.CancellationToken)">Mint(String, String, UInt64, CancellationToken)</h4>
@@ -570,24 +472,10 @@ <h5 class="returns">Returns</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_VerifiedCredentialManager_Revoke_System_String_System_Nullable_System_Boolean__System_UInt64_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.VerifiedCredentialManager.Revoke(System.String%2CSystem.Nullable%7BSystem.Boolean%7D%2CSystem.UInt64%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_VerifiedCredentialManager_Revoke_System_String_System_Nullable_System_Boolean__System_UInt64_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.VerifiedCredentialManager.Revoke(System.String%2CSystem.Nullable%7BSystem.Boolean%7D%2CSystem.UInt64%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_VerifiedCredentialManager_Revoke_System_String_System_Nullable_System_Boolean__System_UInt64_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.VerifiedCredentialManager.Revoke(System.String%2CSystem.Nullable%7BSystem.Boolean%7D%2CSystem.UInt64%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/VerifiedCredentialManager.cs/#L131">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/VerifiedCredentialManager.cs/#L131">View Source</a>
   </span>
   <a id="chia_dotnet_VerifiedCredentialManager_Revoke_" data-uid="chia.dotnet.VerifiedCredentialManager.Revoke*"></a>
   <h4 id="chia_dotnet_VerifiedCredentialManager_Revoke_System_String_System_Nullable_System_Boolean__System_UInt64_System_Threading_CancellationToken_" data-uid="chia.dotnet.VerifiedCredentialManager.Revoke(System.String,System.Nullable{System.Boolean},System.UInt64,System.Threading.CancellationToken)">Revoke(String, Nullable&lt;Boolean&gt;, UInt64, CancellationToken)</h4>
@@ -650,24 +538,10 @@ <h5 class="returns">Returns</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_VerifiedCredentialManager_Spend_System_String_System_String_System_String_System_String_System_Nullable_System_Boolean__System_UInt64_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.VerifiedCredentialManager.Spend(System.String%2CSystem.String%2CSystem.String%2CSystem.String%2CSystem.Nullable%7BSystem.Boolean%7D%2CSystem.UInt64%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_VerifiedCredentialManager_Spend_System_String_System_String_System_String_System_String_System_Nullable_System_Boolean__System_UInt64_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.VerifiedCredentialManager.Spend(System.String%2CSystem.String%2CSystem.String%2CSystem.String%2CSystem.Nullable%7BSystem.Boolean%7D%2CSystem.UInt64%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_VerifiedCredentialManager_Spend_System_String_System_String_System_String_System_String_System_Nullable_System_Boolean__System_UInt64_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.VerifiedCredentialManager.Spend(System.String%2CSystem.String%2CSystem.String%2CSystem.String%2CSystem.Nullable%7BSystem.Boolean%7D%2CSystem.UInt64%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/VerifiedCredentialManager.cs/#L79">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/VerifiedCredentialManager.cs/#L79">View Source</a>
   </span>
   <a id="chia_dotnet_VerifiedCredentialManager_Spend_" data-uid="chia.dotnet.VerifiedCredentialManager.Spend*"></a>
   <h4 id="chia_dotnet_VerifiedCredentialManager_Spend_System_String_System_String_System_String_System_String_System_Nullable_System_Boolean__System_UInt64_System_Threading_CancellationToken_" data-uid="chia.dotnet.VerifiedCredentialManager.Spend(System.String,System.String,System.String,System.String,System.Nullable{System.Boolean},System.UInt64,System.Threading.CancellationToken)">Spend(String, String, String, String, Nullable&lt;Boolean&gt;, UInt64, CancellationToken)</h4>
@@ -751,24 +625,10 @@ <h5 class="returns">Returns</h5>
               <div class="contribution">
                 <ul class="nav">
                   <li>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-                    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_VerifiedCredentialManager.md&amp;value=---%0Auid%3A%20chia.dotnet.VerifiedCredentialManager%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-                    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_VerifiedCredentialManager.md&amp;value=---%0Auid%3A%20chia.dotnet.VerifiedCredentialManager%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-=======
                     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_VerifiedCredentialManager.md&amp;value=---%0Auid%3A%20chia.dotnet.VerifiedCredentialManager%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
                   </li>
                   <li>
-                    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/VerifiedCredentialManager.cs/#L12" class="contribution-link">View Source</a>
+                    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/VerifiedCredentialManager.cs/#L12" class="contribution-link">View Source</a>
                   </li>
                 </ul>
               </div>
diff --git a/docs/api/chia.dotnet.Wallet.html b/docs/api/chia.dotnet.Wallet.html
index dea7bfa3..354d1f63 100644
--- a/docs/api/chia.dotnet.Wallet.html
+++ b/docs/api/chia.dotnet.Wallet.html
@@ -123,24 +123,10 @@ <h3 id="constructors">Constructors
   </h3>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_Wallet__ctor_System_UInt32_chia_dotnet_WalletProxy_.md&amp;value=---%0Auid%3A%20chia.dotnet.Wallet.%23ctor(System.UInt32%2Cchia.dotnet.WalletProxy)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_Wallet__ctor_System_UInt32_chia_dotnet_WalletProxy_.md&amp;value=---%0Auid%3A%20chia.dotnet.Wallet.%23ctor(System.UInt32%2Cchia.dotnet.WalletProxy)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_Wallet__ctor_System_UInt32_chia_dotnet_WalletProxy_.md&amp;value=---%0Auid%3A%20chia.dotnet.Wallet.%23ctor(System.UInt32%2Cchia.dotnet.WalletProxy)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/Wallet.cs/#L21">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/Wallet.cs/#L21">View Source</a>
   </span>
   <a id="chia_dotnet_Wallet__ctor_" data-uid="chia.dotnet.Wallet.#ctor*"></a>
   <h4 id="chia_dotnet_Wallet__ctor_System_UInt32_chia_dotnet_WalletProxy_" data-uid="chia.dotnet.Wallet.#ctor(System.UInt32,chia.dotnet.WalletProxy)">Wallet(UInt32, WalletProxy)</h4>
@@ -179,24 +165,10 @@ <h3 id="properties">Properties
   </h3>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_Wallet_WalletId.md&amp;value=---%0Auid%3A%20chia.dotnet.Wallet.WalletId%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_Wallet_WalletId.md&amp;value=---%0Auid%3A%20chia.dotnet.Wallet.WalletId%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_Wallet_WalletId.md&amp;value=---%0Auid%3A%20chia.dotnet.Wallet.WalletId%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/Wallet.cs/#L30">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/Wallet.cs/#L30">View Source</a>
   </span>
   <a id="chia_dotnet_Wallet_WalletId_" data-uid="chia.dotnet.Wallet.WalletId*"></a>
   <h4 id="chia_dotnet_Wallet_WalletId" data-uid="chia.dotnet.Wallet.WalletId">WalletId</h4>
@@ -224,24 +196,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_Wallet_WalletProxy.md&amp;value=---%0Auid%3A%20chia.dotnet.Wallet.WalletProxy%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_Wallet_WalletProxy.md&amp;value=---%0Auid%3A%20chia.dotnet.Wallet.WalletProxy%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_Wallet_WalletProxy.md&amp;value=---%0Auid%3A%20chia.dotnet.Wallet.WalletProxy%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/Wallet.cs/#L35">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/Wallet.cs/#L35">View Source</a>
   </span>
   <a id="chia_dotnet_Wallet_WalletProxy_" data-uid="chia.dotnet.Wallet.WalletProxy*"></a>
   <h4 id="chia_dotnet_Wallet_WalletProxy" data-uid="chia.dotnet.Wallet.WalletProxy">WalletProxy</h4>
@@ -271,24 +229,10 @@ <h3 id="methods">Methods
   </h3>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_Wallet_CreateWalletDataObject.md&amp;value=---%0Auid%3A%20chia.dotnet.Wallet.CreateWalletDataObject%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_Wallet_CreateWalletDataObject.md&amp;value=---%0Auid%3A%20chia.dotnet.Wallet.CreateWalletDataObject%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_Wallet_CreateWalletDataObject.md&amp;value=---%0Auid%3A%20chia.dotnet.Wallet.CreateWalletDataObject%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/Wallet.cs/#L41">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/Wallet.cs/#L41">View Source</a>
   </span>
   <a id="chia_dotnet_Wallet_CreateWalletDataObject_" data-uid="chia.dotnet.Wallet.CreateWalletDataObject*"></a>
   <h4 id="chia_dotnet_Wallet_CreateWalletDataObject" data-uid="chia.dotnet.Wallet.CreateWalletDataObject">CreateWalletDataObject()</h4>
@@ -317,28 +261,10 @@ <h5 class="returns">Returns</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_Wallet_DeleteUnconfirmedTransactions_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.Wallet.DeleteUnconfirmedTransactions(System.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_Wallet_DeleteUnconfirmedTransactions_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.Wallet.DeleteUnconfirmedTransactions(System.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_Wallet_DeleteUnconfirmedTransactions_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.Wallet.DeleteUnconfirmedTransactions(System.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-<<<<<<< HEAD
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/Wallet.cs/#L250">View Source</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/Wallet.cs/#L226">View Source</a>
->>>>>>> main
   </span>
   <a id="chia_dotnet_Wallet_DeleteUnconfirmedTransactions_" data-uid="chia.dotnet.Wallet.DeleteUnconfirmedTransactions*"></a>
   <h4 id="chia_dotnet_Wallet_DeleteUnconfirmedTransactions_System_Threading_CancellationToken_" data-uid="chia.dotnet.Wallet.DeleteUnconfirmedTransactions(System.Threading.CancellationToken)">DeleteUnconfirmedTransactions(CancellationToken)</h4>
@@ -385,24 +311,10 @@ <h5 class="returns">Returns</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_Wallet_GetBalance_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.Wallet.GetBalance(System.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_Wallet_GetBalance_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.Wallet.GetBalance(System.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_Wallet_GetBalance_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.Wallet.GetBalance(System.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/Wallet.cs/#L91">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/Wallet.cs/#L91">View Source</a>
   </span>
   <a id="chia_dotnet_Wallet_GetBalance_" data-uid="chia.dotnet.Wallet.GetBalance*"></a>
   <h4 id="chia_dotnet_Wallet_GetBalance_System_Threading_CancellationToken_" data-uid="chia.dotnet.Wallet.GetBalance(System.Threading.CancellationToken)">GetBalance(CancellationToken)</h4>
@@ -449,28 +361,10 @@ <h5 class="returns">Returns</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_Wallet_GetNextAddress_System_Boolean_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.Wallet.GetNextAddress(System.Boolean%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_Wallet_GetNextAddress_System_Boolean_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.Wallet.GetNextAddress(System.Boolean%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_Wallet_GetNextAddress_System_Boolean_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.Wallet.GetNextAddress(System.Boolean%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-<<<<<<< HEAD
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/Wallet.cs/#L218">View Source</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/Wallet.cs/#L200">View Source</a>
->>>>>>> main
   </span>
   <a id="chia_dotnet_Wallet_GetNextAddress_" data-uid="chia.dotnet.Wallet.GetNextAddress*"></a>
   <h4 id="chia_dotnet_Wallet_GetNextAddress_System_Boolean_System_Threading_CancellationToken_" data-uid="chia.dotnet.Wallet.GetNextAddress(System.Boolean,System.Threading.CancellationToken)">GetNextAddress(Boolean, CancellationToken)</h4>
@@ -523,28 +417,10 @@ <h5 class="returns">Returns</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_Wallet_GetSpendableCoins_System_Nullable_System_UInt64__System_Nullable_System_UInt64__System_Collections_Generic_IEnumerable_System_UInt64__System_Collections_Generic_IEnumerable_chia_dotnet_Coin__System_Collections_Generic_IEnumerable_System_String__System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.Wallet.GetSpendableCoins(System.Nullable%7BSystem.UInt64%7D%2CSystem.Nullable%7BSystem.UInt64%7D%2CSystem.Collections.Generic.IEnumerable%7BSystem.UInt64%7D%2CSystem.Collections.Generic.IEnumerable%7Bchia.dotnet.Coin%7D%2CSystem.Collections.Generic.IEnumerable%7BSystem.String%7D%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_Wallet_GetSpendableCoins_System_Nullable_System_UInt64__System_Nullable_System_UInt64__System_Collections_Generic_IEnumerable_System_UInt64__System_Collections_Generic_IEnumerable_chia_dotnet_Coin__System_Collections_Generic_IEnumerable_System_String__System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.Wallet.GetSpendableCoins(System.Nullable%7BSystem.UInt64%7D%2CSystem.Nullable%7BSystem.UInt64%7D%2CSystem.Collections.Generic.IEnumerable%7BSystem.UInt64%7D%2CSystem.Collections.Generic.IEnumerable%7Bchia.dotnet.Coin%7D%2CSystem.Collections.Generic.IEnumerable%7BSystem.String%7D%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_Wallet_GetSpendableCoins_System_Nullable_System_UInt64__System_Nullable_System_UInt64__System_Collections_Generic_IEnumerable_System_UInt64__System_Collections_Generic_IEnumerable_chia_dotnet_Coin__System_Collections_Generic_IEnumerable_System_String__System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.Wallet.GetSpendableCoins(System.Nullable%7BSystem.UInt64%7D%2CSystem.Nullable%7BSystem.UInt64%7D%2CSystem.Collections.Generic.IEnumerable%7BSystem.UInt64%7D%2CSystem.Collections.Generic.IEnumerable%7Bchia.dotnet.Coin%7D%2CSystem.Collections.Generic.IEnumerable%7BSystem.String%7D%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-<<<<<<< HEAD
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/Wallet.cs/#L178">View Source</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/Wallet.cs/#L166">View Source</a>
->>>>>>> main
   </span>
   <a id="chia_dotnet_Wallet_GetSpendableCoins_" data-uid="chia.dotnet.Wallet.GetSpendableCoins*"></a>
   <h4 id="chia_dotnet_Wallet_GetSpendableCoins_System_Nullable_System_UInt64__System_Nullable_System_UInt64__System_Collections_Generic_IEnumerable_System_UInt64__System_Collections_Generic_IEnumerable_chia_dotnet_Coin__System_Collections_Generic_IEnumerable_System_String__System_Threading_CancellationToken_" data-uid="chia.dotnet.Wallet.GetSpendableCoins(System.Nullable{System.UInt64},System.Nullable{System.UInt64},System.Collections.Generic.IEnumerable{System.UInt64},System.Collections.Generic.IEnumerable{chia.dotnet.Coin},System.Collections.Generic.IEnumerable{System.String},System.Threading.CancellationToken)">GetSpendableCoins(Nullable&lt;UInt64&gt;, Nullable&lt;UInt64&gt;, IEnumerable&lt;UInt64&gt;, IEnumerable&lt;Coin&gt;, IEnumerable&lt;String&gt;, CancellationToken)</h4>
@@ -621,28 +497,10 @@ <h5 class="returns">Returns</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_Wallet_GetTransactionCount_chia_dotnet_TransactionTypeFilter_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.Wallet.GetTransactionCount(chia.dotnet.TransactionTypeFilter%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_Wallet_GetTransactionCount_chia_dotnet_TransactionTypeFilter_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.Wallet.GetTransactionCount(chia.dotnet.TransactionTypeFilter%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_Wallet_GetTransactionCount_chia_dotnet_TransactionTypeFilter_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.Wallet.GetTransactionCount(chia.dotnet.TransactionTypeFilter%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-<<<<<<< HEAD
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/Wallet.cs/#L233">View Source</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/Wallet.cs/#L213">View Source</a>
->>>>>>> main
   </span>
   <a id="chia_dotnet_Wallet_GetTransactionCount_" data-uid="chia.dotnet.Wallet.GetTransactionCount*"></a>
   <h4 id="chia_dotnet_Wallet_GetTransactionCount_chia_dotnet_TransactionTypeFilter_System_Threading_CancellationToken_" data-uid="chia.dotnet.Wallet.GetTransactionCount(chia.dotnet.TransactionTypeFilter,System.Threading.CancellationToken)">GetTransactionCount(TransactionTypeFilter, CancellationToken)</h4>
@@ -694,24 +552,10 @@ <h5 class="returns">Returns</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_Wallet_GetTransactions_System_String_chia_dotnet_TransactionTypeFilter_System_Boolean_System_String_System_UInt32_System_UInt32_System_Nullable_System_Boolean__System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.Wallet.GetTransactions(System.String%2Cchia.dotnet.TransactionTypeFilter%2CSystem.Boolean%2CSystem.String%2CSystem.UInt32%2CSystem.UInt32%2CSystem.Nullable%7BSystem.Boolean%7D%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_Wallet_GetTransactions_System_String_chia_dotnet_TransactionTypeFilter_System_Boolean_System_String_System_UInt32_System_UInt32_System_Nullable_System_Boolean__System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.Wallet.GetTransactions(System.String%2Cchia.dotnet.TransactionTypeFilter%2CSystem.Boolean%2CSystem.String%2CSystem.UInt32%2CSystem.UInt32%2CSystem.Nullable%7BSystem.Boolean%7D%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_Wallet_GetTransactions_System_String_chia_dotnet_TransactionTypeFilter_System_Boolean_System_String_System_UInt32_System_UInt32_System_Nullable_System_Boolean__System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.Wallet.GetTransactions(System.String%2Cchia.dotnet.TransactionTypeFilter%2CSystem.Boolean%2CSystem.String%2CSystem.UInt32%2CSystem.UInt32%2CSystem.Nullable%7BSystem.Boolean%7D%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/Wallet.cs/#L136">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/Wallet.cs/#L136">View Source</a>
   </span>
   <a id="chia_dotnet_Wallet_GetTransactions_" data-uid="chia.dotnet.Wallet.GetTransactions*"></a>
   <h4 id="chia_dotnet_Wallet_GetTransactions_System_String_chia_dotnet_TransactionTypeFilter_System_Boolean_System_String_System_UInt32_System_UInt32_System_Nullable_System_Boolean__System_Threading_CancellationToken_" data-uid="chia.dotnet.Wallet.GetTransactions(System.String,chia.dotnet.TransactionTypeFilter,System.Boolean,System.String,System.UInt32,System.UInt32,System.Nullable{System.Boolean},System.Threading.CancellationToken)">GetTransactions(String, TransactionTypeFilter, Boolean, String, UInt32, UInt32, Nullable&lt;Boolean&gt;, CancellationToken)</h4>
@@ -798,24 +642,10 @@ <h5 class="returns">Returns</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_Wallet_GetWalletInfo_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.Wallet.GetWalletInfo(System.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_Wallet_GetWalletInfo_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.Wallet.GetWalletInfo(System.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_Wallet_GetWalletInfo_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.Wallet.GetWalletInfo(System.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/Wallet.cs/#L79">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/Wallet.cs/#L79">View Source</a>
   </span>
   <a id="chia_dotnet_Wallet_GetWalletInfo_" data-uid="chia.dotnet.Wallet.GetWalletInfo*"></a>
   <h4 id="chia_dotnet_Wallet_GetWalletInfo_System_Threading_CancellationToken_" data-uid="chia.dotnet.Wallet.GetWalletInfo(System.Threading.CancellationToken)">GetWalletInfo(CancellationToken)</h4>
@@ -864,24 +694,10 @@ <h5 id="chia_dotnet_Wallet_GetWalletInfo_System_Threading_CancellationToken__rem
 </div>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_Wallet_SelectCoins_System_UInt64_System_Collections_Generic_IEnumerable_chia_dotnet_Coin__System_Collections_Generic_IEnumerable_System_UInt64__System_UInt64_System_UInt64_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.Wallet.SelectCoins(System.UInt64%2CSystem.Collections.Generic.IEnumerable%7Bchia.dotnet.Coin%7D%2CSystem.Collections.Generic.IEnumerable%7BSystem.UInt64%7D%2CSystem.UInt64%2CSystem.UInt64%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_Wallet_SelectCoins_System_UInt64_System_Collections_Generic_IEnumerable_chia_dotnet_Coin__System_Collections_Generic_IEnumerable_System_UInt64__System_UInt64_System_UInt64_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.Wallet.SelectCoins(System.UInt64%2CSystem.Collections.Generic.IEnumerable%7Bchia.dotnet.Coin%7D%2CSystem.Collections.Generic.IEnumerable%7BSystem.UInt64%7D%2CSystem.UInt64%2CSystem.UInt64%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_Wallet_SelectCoins_System_UInt64_System_Collections_Generic_IEnumerable_chia_dotnet_Coin__System_Collections_Generic_IEnumerable_System_UInt64__System_UInt64_System_UInt64_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.Wallet.SelectCoins(System.UInt64%2CSystem.Collections.Generic.IEnumerable%7Bchia.dotnet.Coin%7D%2CSystem.Collections.Generic.IEnumerable%7BSystem.UInt64%7D%2CSystem.UInt64%2CSystem.UInt64%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/Wallet.cs/#L106">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/Wallet.cs/#L106">View Source</a>
   </span>
   <a id="chia_dotnet_Wallet_SelectCoins_" data-uid="chia.dotnet.Wallet.SelectCoins*"></a>
   <h4 id="chia_dotnet_Wallet_SelectCoins_System_UInt64_System_Collections_Generic_IEnumerable_chia_dotnet_Coin__System_Collections_Generic_IEnumerable_System_UInt64__System_UInt64_System_UInt64_System_Threading_CancellationToken_" data-uid="chia.dotnet.Wallet.SelectCoins(System.UInt64,System.Collections.Generic.IEnumerable{chia.dotnet.Coin},System.Collections.Generic.IEnumerable{System.UInt64},System.UInt64,System.UInt64,System.Threading.CancellationToken)">SelectCoins(UInt64, IEnumerable&lt;Coin&gt;, IEnumerable&lt;UInt64&gt;, UInt64, UInt64, CancellationToken)</h4>
@@ -954,28 +770,10 @@ <h5 class="returns">Returns</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_Wallet_SendTransaction_System_String_System_UInt64_System_Collections_Generic_IEnumerable_System_String__System_Collections_Generic_IEnumerable_System_UInt64__System_Collections_Generic_IEnumerable_System_String__System_UInt64_System_UInt64_System_Boolean_System_UInt64_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.Wallet.SendTransaction(System.String%2CSystem.UInt64%2CSystem.Collections.Generic.IEnumerable%7BSystem.String%7D%2CSystem.Collections.Generic.IEnumerable%7BSystem.UInt64%7D%2CSystem.Collections.Generic.IEnumerable%7BSystem.String%7D%2CSystem.UInt64%2CSystem.UInt64%2CSystem.Boolean%2CSystem.UInt64%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_Wallet_SendTransaction_System_String_System_UInt64_System_Collections_Generic_IEnumerable_System_String__System_Collections_Generic_IEnumerable_System_UInt64__System_Collections_Generic_IEnumerable_System_String__System_UInt64_System_UInt64_System_Boolean_System_UInt64_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.Wallet.SendTransaction(System.String%2CSystem.UInt64%2CSystem.Collections.Generic.IEnumerable%7BSystem.String%7D%2CSystem.Collections.Generic.IEnumerable%7BSystem.UInt64%7D%2CSystem.Collections.Generic.IEnumerable%7BSystem.String%7D%2CSystem.UInt64%2CSystem.UInt64%2CSystem.Boolean%2CSystem.UInt64%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_Wallet_SendTransaction_System_String_System_UInt64_System_Collections_Generic_IEnumerable_System_String__System_Collections_Generic_IEnumerable_System_UInt64__System_Collections_Generic_IEnumerable_System_String__System_UInt64_System_UInt64_System_Boolean_System_UInt64_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.Wallet.SendTransaction(System.String%2CSystem.UInt64%2CSystem.Collections.Generic.IEnumerable%7BSystem.String%7D%2CSystem.Collections.Generic.IEnumerable%7BSystem.UInt64%7D%2CSystem.Collections.Generic.IEnumerable%7BSystem.String%7D%2CSystem.UInt64%2CSystem.UInt64%2CSystem.Boolean%2CSystem.UInt64%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-<<<<<<< HEAD
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/Wallet.cs/#L269">View Source</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/Wallet.cs/#L245">View Source</a>
->>>>>>> main
   </span>
   <a id="chia_dotnet_Wallet_SendTransaction_" data-uid="chia.dotnet.Wallet.SendTransaction*"></a>
   <h4 id="chia_dotnet_Wallet_SendTransaction_System_String_System_UInt64_System_Collections_Generic_IEnumerable_System_String__System_Collections_Generic_IEnumerable_System_UInt64__System_Collections_Generic_IEnumerable_System_String__System_UInt64_System_UInt64_System_Boolean_System_UInt64_System_Threading_CancellationToken_" data-uid="chia.dotnet.Wallet.SendTransaction(System.String,System.UInt64,System.Collections.Generic.IEnumerable{System.String},System.Collections.Generic.IEnumerable{System.UInt64},System.Collections.Generic.IEnumerable{System.String},System.UInt64,System.UInt64,System.Boolean,System.UInt64,System.Threading.CancellationToken)">SendTransaction(String, UInt64, IEnumerable&lt;String&gt;, IEnumerable&lt;UInt64&gt;, IEnumerable&lt;String&gt;, UInt64, UInt64, Boolean, UInt64, CancellationToken)</h4>
@@ -1071,31 +869,10 @@ <h5 class="returns">Returns</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_Wallet_SendTransactionMulti_System_Collections_Generic_IEnumerable_chia_dotnet_Coin__System_UInt64_System_Collections_Generic_IEnumerable_chia_dotnet_Coin__System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.Wallet.SendTransactionMulti(System.Collections.Generic.IEnumerable%7Bchia.dotnet.Coin%7D%2CSystem.UInt64%2CSystem.Collections.Generic.IEnumerable%7Bchia.dotnet.Coin%7D%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_Wallet_SendTransactionMulti_System_Collections_Generic_IEnumerable_chia_dotnet_Coin__System_UInt64_System_Collections_Generic_IEnumerable_chia_dotnet_Coin__System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.Wallet.SendTransactionMulti(System.Collections.Generic.IEnumerable%7Bchia.dotnet.Coin%7D%2CSystem.UInt64%2CSystem.Collections.Generic.IEnumerable%7Bchia.dotnet.Coin%7D%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_Wallet_SendTransactionMulti_System_Collections_Generic_IEnumerable_chia_dotnet_Coin__System_UInt64_System_Collections_Generic_IEnumerable_chia_dotnet_Coin__System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.Wallet.SendTransactionMulti(System.Collections.Generic.IEnumerable%7Bchia.dotnet.Coin%7D%2CSystem.UInt64%2CSystem.Collections.Generic.IEnumerable%7Bchia.dotnet.Coin%7D%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/Wallet.cs/#L316">View Source</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_Wallet_SendTransactionMulti_System_Collections_Generic_IEnumerable_chia_dotnet_Coin__System_Collections_Generic_IEnumerable_chia_dotnet_Coin__System_UInt64_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.Wallet.SendTransactionMulti(System.Collections.Generic.IEnumerable%7Bchia.dotnet.Coin%7D%2CSystem.Collections.Generic.IEnumerable%7Bchia.dotnet.Coin%7D%2CSystem.UInt64%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
   </span>
   <span class="small pull-right mobile-hide">
     <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/Wallet.cs/#L292">View Source</a>
->>>>>>> main
   </span>
   <a id="chia_dotnet_Wallet_SendTransactionMulti_" data-uid="chia.dotnet.Wallet.SendTransactionMulti*"></a>
   <h4 id="chia_dotnet_Wallet_SendTransactionMulti_System_Collections_Generic_IEnumerable_chia_dotnet_Coin__System_Collections_Generic_IEnumerable_chia_dotnet_Coin__System_UInt64_System_Threading_CancellationToken_" data-uid="chia.dotnet.Wallet.SendTransactionMulti(System.Collections.Generic.IEnumerable{chia.dotnet.Coin},System.Collections.Generic.IEnumerable{chia.dotnet.Coin},System.UInt64,System.Threading.CancellationToken)">SendTransactionMulti(IEnumerable&lt;Coin&gt;, IEnumerable&lt;Coin&gt;, UInt64, CancellationToken)</h4>
@@ -1129,79 +906,6 @@ <h5 class="parameters">Parameters</h5>
 </td>
       </tr>
       <tr>
-<<<<<<< HEAD
-        <td><a class="xref" href="https://learn.microsoft.com/dotnet/api/system.threading.cancellationtoken">CancellationToken</a></td>
-        <td><span class="parametername">cancellationToken</span></td>
-        <td><p>A token to allow the call to be cancelled</p>
-</td>
-      </tr>
-    </tbody>
-  </table>
-  <h5 class="returns">Returns</h5>
-  <table class="table table-bordered table-striped table-condensed">
-    <thead>
-      <tr>
-        <th>Type</th>
-        <th>Description</th>
-      </tr>
-    </thead>
-    <tbody>
-      <tr>
-        <td><a class="xref" href="https://learn.microsoft.com/dotnet/api/system.threading.tasks.task-1">Task</a>&lt;<a class="xref" href="chia.dotnet.TransactionRecord.html">TransactionRecord</a>&gt;</td>
-        <td><p>The <a class="xref" href="chia.dotnet.TransactionRecord.html">TransactionRecord</a></p>
-</td>
-      </tr>
-    </tbody>
-  </table>
-  <span class="small pull-right mobile-hide">
-    <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_Wallet_SendTransactionMulti_System_Collections_Generic_IEnumerable_chia_dotnet_Coin__System_UInt64_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.Wallet.SendTransactionMulti(System.Collections.Generic.IEnumerable%7Bchia.dotnet.Coin%7D%2CSystem.UInt64%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_Wallet_SendTransactionMulti_System_Collections_Generic_IEnumerable_chia_dotnet_Coin__System_UInt64_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.Wallet.SendTransactionMulti(System.Collections.Generic.IEnumerable%7Bchia.dotnet.Coin%7D%2CSystem.UInt64%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_Wallet_SendTransactionMulti_System_Collections_Generic_IEnumerable_chia_dotnet_Coin__System_UInt64_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.Wallet.SendTransactionMulti(System.Collections.Generic.IEnumerable%7Bchia.dotnet.Coin%7D%2CSystem.UInt64%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/Wallet.cs/#L341">View Source</a>
-  </span>
-  <a id="chia_dotnet_Wallet_SendTransactionMulti_" data-uid="chia.dotnet.Wallet.SendTransactionMulti*"></a>
-  <h4 id="chia_dotnet_Wallet_SendTransactionMulti_System_Collections_Generic_IEnumerable_chia_dotnet_Coin__System_UInt64_System_Threading_CancellationToken_" data-uid="chia.dotnet.Wallet.SendTransactionMulti(System.Collections.Generic.IEnumerable{chia.dotnet.Coin},System.UInt64,System.Threading.CancellationToken)">SendTransactionMulti(IEnumerable&lt;Coin&gt;, UInt64, CancellationToken)</h4>
-  <div class="markdown level1 summary"><p>Sends a transaction</p>
-</div>
-  <div class="markdown level1 conceptual"></div>
-  <h5 class="decalaration">Declaration</h5>
-  <div class="codewrapper">
-    <pre><code class="lang-csharp hljs">public async Task&lt;TransactionRecord&gt; SendTransactionMulti(IEnumerable&lt;Coin&gt; additions, ulong fee = 0UL, CancellationToken cancellationToken = default(CancellationToken))</code></pre>
-  </div>
-  <h5 class="parameters">Parameters</h5>
-  <table class="table table-bordered table-striped table-condensed">
-    <thead>
-      <tr>
-        <th>Type</th>
-        <th>Name</th>
-        <th>Description</th>
-      </tr>
-    </thead>
-    <tbody>
-      <tr>
-        <td><a class="xref" href="https://learn.microsoft.com/dotnet/api/system.collections.generic.ienumerable-1">IEnumerable</a>&lt;<a class="xref" href="chia.dotnet.Coin.html">Coin</a>&gt;</td>
-        <td><span class="parametername">additions</span></td>
-        <td><p>Additions to the block chain</p>
-</td>
-      </tr>
-      <tr>
-=======
->>>>>>> main
         <td><a class="xref" href="https://learn.microsoft.com/dotnet/api/system.uint64">UInt64</a></td>
         <td><span class="parametername">fee</span></td>
         <td><p>Fee amount (in units of mojos)</p>
@@ -1233,26 +937,10 @@ <h5 class="returns">Returns</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_Wallet_Validate_chia_dotnet_WalletType_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.Wallet.Validate(chia.dotnet.WalletType%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/Wallet.cs/#L65">View Source</a>
-=======
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_Wallet_Validate_chia_dotnet_WalletType_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.Wallet.Validate(chia.dotnet.WalletType%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
   </span>
   <span class="small pull-right mobile-hide">
     <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/Wallet.cs/#L65">View Source</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
   </span>
   <a id="chia_dotnet_Wallet_Validate_" data-uid="chia.dotnet.Wallet.Validate*"></a>
   <h4 id="chia_dotnet_Wallet_Validate_chia_dotnet_WalletType_System_Threading_CancellationToken_" data-uid="chia.dotnet.Wallet.Validate(chia.dotnet.WalletType,System.Threading.CancellationToken)">Validate(WalletType, CancellationToken)</h4>
@@ -1307,33 +995,10 @@ <h5 id="chia_dotnet_Wallet_Validate_chia_dotnet_WalletType_System_Threading_Canc
 </div>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_Wallet_Validate_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.Wallet.Validate(System.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/Wallet.cs/#L54">View Source</a>
-=======
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_Wallet_Validate_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.Wallet.Validate(System.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
   </span>
   <span class="small pull-right mobile-hide">
     <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/Wallet.cs/#L54">View Source</a>
-<<<<<<< HEAD
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-=======
-<<<<<<< HEAD
-=======
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <a id="chia_dotnet_Wallet_Validate_" data-uid="chia.dotnet.Wallet.Validate*"></a>
   <h4 id="chia_dotnet_Wallet_Validate_System_Threading_CancellationToken_" data-uid="chia.dotnet.Wallet.Validate(System.Threading.CancellationToken)">Validate(CancellationToken)</h4>
@@ -1388,24 +1053,10 @@ <h5 id="chia_dotnet_Wallet_Validate_System_Threading_CancellationToken__remarks"
               <div class="contribution">
                 <ul class="nav">
                   <li>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-                    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_Wallet.md&amp;value=---%0Auid%3A%20chia.dotnet.Wallet%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-                    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_Wallet.md&amp;value=---%0Auid%3A%20chia.dotnet.Wallet%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-=======
                     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_Wallet.md&amp;value=---%0Auid%3A%20chia.dotnet.Wallet%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
                   </li>
                   <li>
-                    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/Wallet.cs/#L14" class="contribution-link">View Source</a>
+                    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/Wallet.cs/#L14" class="contribution-link">View Source</a>
                   </li>
                 </ul>
               </div>
diff --git a/docs/api/chia.dotnet.WalletBalance.html b/docs/api/chia.dotnet.WalletBalance.html
index 4400269f..065856d6 100644
--- a/docs/api/chia.dotnet.WalletBalance.html
+++ b/docs/api/chia.dotnet.WalletBalance.html
@@ -90,21 +90,7 @@ <h5>Inherited Members</h5>
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object)">Object.Equals(Object)</a>
     </div>
     <div>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object-system-object)">Object.Equals(Object, Object)</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-      <span class="xref">System.Object.Equals(System.Object, System.Object)</span>
-=======
-      <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object-system-object)">Object.Equals(Object, Object)</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
     </div>
     <div>
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.gethashcode#system-object-gethashcode">Object.GetHashCode()</a>
@@ -132,30 +118,10 @@ <h3 id="properties">Properties
   </h3>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_WalletBalance_AssetId.md&amp;value=---%0Auid%3A%20chia.dotnet.WalletBalance.AssetId%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/WalletBalance.cs/#L15">View Source</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_WalletBalance_AssetId.md&amp;value=---%0Auid%3A%20chia.dotnet.WalletBalance.AssetId%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/WalletBalance.cs/#L15">View Source</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_WalletBalance_AssetId.md&amp;value=---%0Auid%3A%20chia.dotnet.WalletBalance.AssetId%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
   </span>
   <span class="small pull-right mobile-hide">
     <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/WalletBalance.cs/#L15">View Source</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <a id="chia_dotnet_WalletBalance_AssetId_" data-uid="chia.dotnet.WalletBalance.AssetId*"></a>
   <h4 id="chia_dotnet_WalletBalance_AssetId" data-uid="chia.dotnet.WalletBalance.AssetId">AssetId</h4>
@@ -182,30 +148,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_WalletBalance_ConfirmedWalletBalance.md&amp;value=---%0Auid%3A%20chia.dotnet.WalletBalance.ConfirmedWalletBalance%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
   </span>
   <span class="small pull-right mobile-hide">
     <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/WalletBalance.cs/#L7">View Source</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_WalletBalance_ConfirmedWalletBalance.md&amp;value=---%0Auid%3A%20chia.dotnet.WalletBalance.ConfirmedWalletBalance%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/WalletBalance.cs/#L7">View Source</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_WalletBalance_ConfirmedWalletBalance.md&amp;value=---%0Auid%3A%20chia.dotnet.WalletBalance.ConfirmedWalletBalance%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/WalletBalance.cs/#L7">View Source</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <a id="chia_dotnet_WalletBalance_ConfirmedWalletBalance_" data-uid="chia.dotnet.WalletBalance.ConfirmedWalletBalance*"></a>
   <h4 id="chia_dotnet_WalletBalance_ConfirmedWalletBalance" data-uid="chia.dotnet.WalletBalance.ConfirmedWalletBalance">ConfirmedWalletBalance</h4>
@@ -232,30 +178,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_WalletBalance_Fingerprint.md&amp;value=---%0Auid%3A%20chia.dotnet.WalletBalance.Fingerprint%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/WalletBalance.cs/#L17">View Source</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_WalletBalance_Fingerprint.md&amp;value=---%0Auid%3A%20chia.dotnet.WalletBalance.Fingerprint%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/WalletBalance.cs/#L17">View Source</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_WalletBalance_Fingerprint.md&amp;value=---%0Auid%3A%20chia.dotnet.WalletBalance.Fingerprint%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
   </span>
   <span class="small pull-right mobile-hide">
     <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/WalletBalance.cs/#L17">View Source</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <a id="chia_dotnet_WalletBalance_Fingerprint_" data-uid="chia.dotnet.WalletBalance.Fingerprint*"></a>
   <h4 id="chia_dotnet_WalletBalance_Fingerprint" data-uid="chia.dotnet.WalletBalance.Fingerprint">Fingerprint</h4>
@@ -282,30 +208,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_WalletBalance_MaxSendAmount.md&amp;value=---%0Auid%3A%20chia.dotnet.WalletBalance.MaxSendAmount%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
   </span>
   <span class="small pull-right mobile-hide">
     <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/WalletBalance.cs/#L11">View Source</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_WalletBalance_MaxSendAmount.md&amp;value=---%0Auid%3A%20chia.dotnet.WalletBalance.MaxSendAmount%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/WalletBalance.cs/#L11">View Source</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_WalletBalance_MaxSendAmount.md&amp;value=---%0Auid%3A%20chia.dotnet.WalletBalance.MaxSendAmount%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/WalletBalance.cs/#L11">View Source</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <a id="chia_dotnet_WalletBalance_MaxSendAmount_" data-uid="chia.dotnet.WalletBalance.MaxSendAmount*"></a>
   <h4 id="chia_dotnet_WalletBalance_MaxSendAmount" data-uid="chia.dotnet.WalletBalance.MaxSendAmount">MaxSendAmount</h4>
@@ -332,30 +238,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_WalletBalance_PendingChange.md&amp;value=---%0Auid%3A%20chia.dotnet.WalletBalance.PendingChange%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/WalletBalance.cs/#L10">View Source</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_WalletBalance_PendingChange.md&amp;value=---%0Auid%3A%20chia.dotnet.WalletBalance.PendingChange%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/WalletBalance.cs/#L10">View Source</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_WalletBalance_PendingChange.md&amp;value=---%0Auid%3A%20chia.dotnet.WalletBalance.PendingChange%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
   </span>
   <span class="small pull-right mobile-hide">
     <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/WalletBalance.cs/#L10">View Source</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <a id="chia_dotnet_WalletBalance_PendingChange_" data-uid="chia.dotnet.WalletBalance.PendingChange*"></a>
   <h4 id="chia_dotnet_WalletBalance_PendingChange" data-uid="chia.dotnet.WalletBalance.PendingChange">PendingChange</h4>
@@ -382,30 +268,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_WalletBalance_PendingCoinRemovalCount.md&amp;value=---%0Auid%3A%20chia.dotnet.WalletBalance.PendingCoinRemovalCount%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/WalletBalance.cs/#L13">View Source</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_WalletBalance_PendingCoinRemovalCount.md&amp;value=---%0Auid%3A%20chia.dotnet.WalletBalance.PendingCoinRemovalCount%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/WalletBalance.cs/#L13">View Source</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_WalletBalance_PendingCoinRemovalCount.md&amp;value=---%0Auid%3A%20chia.dotnet.WalletBalance.PendingCoinRemovalCount%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
   </span>
   <span class="small pull-right mobile-hide">
     <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/WalletBalance.cs/#L13">View Source</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <a id="chia_dotnet_WalletBalance_PendingCoinRemovalCount_" data-uid="chia.dotnet.WalletBalance.PendingCoinRemovalCount*"></a>
   <h4 id="chia_dotnet_WalletBalance_PendingCoinRemovalCount" data-uid="chia.dotnet.WalletBalance.PendingCoinRemovalCount">PendingCoinRemovalCount</h4>
@@ -432,30 +298,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_WalletBalance_SpendableBalance.md&amp;value=---%0Auid%3A%20chia.dotnet.WalletBalance.SpendableBalance%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
   </span>
   <span class="small pull-right mobile-hide">
     <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/WalletBalance.cs/#L9">View Source</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_WalletBalance_SpendableBalance.md&amp;value=---%0Auid%3A%20chia.dotnet.WalletBalance.SpendableBalance%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/WalletBalance.cs/#L9">View Source</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_WalletBalance_SpendableBalance.md&amp;value=---%0Auid%3A%20chia.dotnet.WalletBalance.SpendableBalance%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/WalletBalance.cs/#L9">View Source</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <a id="chia_dotnet_WalletBalance_SpendableBalance_" data-uid="chia.dotnet.WalletBalance.SpendableBalance*"></a>
   <h4 id="chia_dotnet_WalletBalance_SpendableBalance" data-uid="chia.dotnet.WalletBalance.SpendableBalance">SpendableBalance</h4>
@@ -482,30 +328,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_WalletBalance_UnconfirmedWalletBalance.md&amp;value=---%0Auid%3A%20chia.dotnet.WalletBalance.UnconfirmedWalletBalance%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/WalletBalance.cs/#L8">View Source</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_WalletBalance_UnconfirmedWalletBalance.md&amp;value=---%0Auid%3A%20chia.dotnet.WalletBalance.UnconfirmedWalletBalance%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/WalletBalance.cs/#L8">View Source</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_WalletBalance_UnconfirmedWalletBalance.md&amp;value=---%0Auid%3A%20chia.dotnet.WalletBalance.UnconfirmedWalletBalance%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
   </span>
   <span class="small pull-right mobile-hide">
     <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/WalletBalance.cs/#L8">View Source</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <a id="chia_dotnet_WalletBalance_UnconfirmedWalletBalance_" data-uid="chia.dotnet.WalletBalance.UnconfirmedWalletBalance*"></a>
   <h4 id="chia_dotnet_WalletBalance_UnconfirmedWalletBalance" data-uid="chia.dotnet.WalletBalance.UnconfirmedWalletBalance">UnconfirmedWalletBalance</h4>
@@ -532,30 +358,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_WalletBalance_UnspentCoinCount.md&amp;value=---%0Auid%3A%20chia.dotnet.WalletBalance.UnspentCoinCount%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/WalletBalance.cs/#L12">View Source</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_WalletBalance_UnspentCoinCount.md&amp;value=---%0Auid%3A%20chia.dotnet.WalletBalance.UnspentCoinCount%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/WalletBalance.cs/#L12">View Source</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_WalletBalance_UnspentCoinCount.md&amp;value=---%0Auid%3A%20chia.dotnet.WalletBalance.UnspentCoinCount%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
   </span>
   <span class="small pull-right mobile-hide">
     <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/WalletBalance.cs/#L12">View Source</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <a id="chia_dotnet_WalletBalance_UnspentCoinCount_" data-uid="chia.dotnet.WalletBalance.UnspentCoinCount*"></a>
   <h4 id="chia_dotnet_WalletBalance_UnspentCoinCount" data-uid="chia.dotnet.WalletBalance.UnspentCoinCount">UnspentCoinCount</h4>
@@ -582,30 +388,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_WalletBalance_WalletId.md&amp;value=---%0Auid%3A%20chia.dotnet.WalletBalance.WalletId%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
   </span>
   <span class="small pull-right mobile-hide">
     <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/WalletBalance.cs/#L16">View Source</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_WalletBalance_WalletId.md&amp;value=---%0Auid%3A%20chia.dotnet.WalletBalance.WalletId%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/WalletBalance.cs/#L16">View Source</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_WalletBalance_WalletId.md&amp;value=---%0Auid%3A%20chia.dotnet.WalletBalance.WalletId%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/WalletBalance.cs/#L16">View Source</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <a id="chia_dotnet_WalletBalance_WalletId_" data-uid="chia.dotnet.WalletBalance.WalletId*"></a>
   <h4 id="chia_dotnet_WalletBalance_WalletId" data-uid="chia.dotnet.WalletBalance.WalletId">WalletId</h4>
@@ -632,30 +418,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_WalletBalance_WalletType.md&amp;value=---%0Auid%3A%20chia.dotnet.WalletBalance.WalletType%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/WalletBalance.cs/#L14">View Source</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_WalletBalance_WalletType.md&amp;value=---%0Auid%3A%20chia.dotnet.WalletBalance.WalletType%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/WalletBalance.cs/#L14">View Source</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_WalletBalance_WalletType.md&amp;value=---%0Auid%3A%20chia.dotnet.WalletBalance.WalletType%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
   </span>
   <span class="small pull-right mobile-hide">
     <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/WalletBalance.cs/#L14">View Source</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <a id="chia_dotnet_WalletBalance_WalletType_" data-uid="chia.dotnet.WalletBalance.WalletType*"></a>
   <h4 id="chia_dotnet_WalletBalance_WalletType" data-uid="chia.dotnet.WalletBalance.WalletType">WalletType</h4>
@@ -692,30 +458,10 @@ <h3 id="implements">Implements</h3>
               <div class="contribution">
                 <ul class="nav">
                   <li>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-                    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_WalletBalance.md&amp;value=---%0Auid%3A%20chia.dotnet.WalletBalance%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-                  </li>
-                  <li>
-                    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/WalletBalance.cs/#L5" class="contribution-link">View Source</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-                    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_WalletBalance.md&amp;value=---%0Auid%3A%20chia.dotnet.WalletBalance%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-                  </li>
-                  <li>
-                    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/WalletBalance.cs/#L5" class="contribution-link">View Source</a>
-=======
                     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_WalletBalance.md&amp;value=---%0Auid%3A%20chia.dotnet.WalletBalance%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
                   </li>
                   <li>
                     <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/WalletBalance.cs/#L5" class="contribution-link">View Source</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
                   </li>
                 </ul>
               </div>
diff --git a/docs/api/chia.dotnet.WalletInfo.html b/docs/api/chia.dotnet.WalletInfo.html
index 32168f22..8dc730f3 100644
--- a/docs/api/chia.dotnet.WalletInfo.html
+++ b/docs/api/chia.dotnet.WalletInfo.html
@@ -96,21 +96,7 @@ <h5>Inherited Members</h5>
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object)">Object.Equals(Object)</a>
     </div>
     <div>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object-system-object)">Object.Equals(Object, Object)</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-      <span class="xref">System.Object.Equals(System.Object, System.Object)</span>
-=======
-      <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object-system-object)">Object.Equals(Object, Object)</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
     </div>
     <div>
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.gethashcode#system-object-gethashcode">Object.GetHashCode()</a>
@@ -138,24 +124,10 @@ <h3 id="properties">Properties
   </h3>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_WalletInfo_Data.md&amp;value=---%0Auid%3A%20chia.dotnet.WalletInfo.Data%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_WalletInfo_Data.md&amp;value=---%0Auid%3A%20chia.dotnet.WalletInfo.Data%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_WalletInfo_Data.md&amp;value=---%0Auid%3A%20chia.dotnet.WalletInfo.Data%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/WalletInfo.cs/#L16">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/WalletInfo.cs/#L16">View Source</a>
   </span>
   <a id="chia_dotnet_WalletInfo_Data_" data-uid="chia.dotnet.WalletInfo.Data*"></a>
   <h4 id="chia_dotnet_WalletInfo_Data" data-uid="chia.dotnet.WalletInfo.Data">Data</h4>
@@ -182,24 +154,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_WalletInfo_Id.md&amp;value=---%0Auid%3A%20chia.dotnet.WalletInfo.Id%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_WalletInfo_Id.md&amp;value=---%0Auid%3A%20chia.dotnet.WalletInfo.Id%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_WalletInfo_Id.md&amp;value=---%0Auid%3A%20chia.dotnet.WalletInfo.Id%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/WalletInfo.cs/#L13">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/WalletInfo.cs/#L13">View Source</a>
   </span>
   <a id="chia_dotnet_WalletInfo_Id_" data-uid="chia.dotnet.WalletInfo.Id*"></a>
   <h4 id="chia_dotnet_WalletInfo_Id" data-uid="chia.dotnet.WalletInfo.Id">Id</h4>
@@ -226,24 +184,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_WalletInfo_Name.md&amp;value=---%0Auid%3A%20chia.dotnet.WalletInfo.Name%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_WalletInfo_Name.md&amp;value=---%0Auid%3A%20chia.dotnet.WalletInfo.Name%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_WalletInfo_Name.md&amp;value=---%0Auid%3A%20chia.dotnet.WalletInfo.Name%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/WalletInfo.cs/#L14">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/WalletInfo.cs/#L14">View Source</a>
   </span>
   <a id="chia_dotnet_WalletInfo_Name_" data-uid="chia.dotnet.WalletInfo.Name*"></a>
   <h4 id="chia_dotnet_WalletInfo_Name" data-uid="chia.dotnet.WalletInfo.Name">Name</h4>
@@ -270,24 +214,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_WalletInfo_Type.md&amp;value=---%0Auid%3A%20chia.dotnet.WalletInfo.Type%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_WalletInfo_Type.md&amp;value=---%0Auid%3A%20chia.dotnet.WalletInfo.Type%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_WalletInfo_Type.md&amp;value=---%0Auid%3A%20chia.dotnet.WalletInfo.Type%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/WalletInfo.cs/#L15">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/WalletInfo.cs/#L15">View Source</a>
   </span>
   <a id="chia_dotnet_WalletInfo_Type_" data-uid="chia.dotnet.WalletInfo.Type*"></a>
   <h4 id="chia_dotnet_WalletInfo_Type" data-uid="chia.dotnet.WalletInfo.Type">Type</h4>
@@ -324,24 +254,10 @@ <h3 id="implements">Implements</h3>
               <div class="contribution">
                 <ul class="nav">
                   <li>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-                    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_WalletInfo.md&amp;value=---%0Auid%3A%20chia.dotnet.WalletInfo%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-                    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_WalletInfo.md&amp;value=---%0Auid%3A%20chia.dotnet.WalletInfo%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-=======
                     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_WalletInfo.md&amp;value=---%0Auid%3A%20chia.dotnet.WalletInfo%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
                   </li>
                   <li>
-                    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/WalletInfo.cs/#L11" class="contribution-link">View Source</a>
+                    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/WalletInfo.cs/#L11" class="contribution-link">View Source</a>
                   </li>
                 </ul>
               </div>
diff --git a/docs/api/chia.dotnet.WalletProxy.html b/docs/api/chia.dotnet.WalletProxy.html
index 28d839bd..6da78f67 100644
--- a/docs/api/chia.dotnet.WalletProxy.html
+++ b/docs/api/chia.dotnet.WalletProxy.html
@@ -143,24 +143,10 @@ <h3 id="constructors">Constructors
   </h3>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_WalletProxy__ctor_chia_dotnet_IRpcClient_System_String_.md&amp;value=---%0Auid%3A%20chia.dotnet.WalletProxy.%23ctor(chia.dotnet.IRpcClient%2CSystem.String)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_WalletProxy__ctor_chia_dotnet_IRpcClient_System_String_.md&amp;value=---%0Auid%3A%20chia.dotnet.WalletProxy.%23ctor(chia.dotnet.IRpcClient%2CSystem.String)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_WalletProxy__ctor_chia_dotnet_IRpcClient_System_String_.md&amp;value=---%0Auid%3A%20chia.dotnet.WalletProxy.%23ctor(chia.dotnet.IRpcClient%2CSystem.String)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/WalletProxy.cs/#L21">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/WalletProxy.cs/#L21">View Source</a>
   </span>
   <a id="chia_dotnet_WalletProxy__ctor_" data-uid="chia.dotnet.WalletProxy.#ctor*"></a>
   <h4 id="chia_dotnet_WalletProxy__ctor_chia_dotnet_IRpcClient_System_String_" data-uid="chia.dotnet.WalletProxy.#ctor(chia.dotnet.IRpcClient,System.String)">WalletProxy(IRpcClient, String)</h4>
@@ -199,24 +185,10 @@ <h3 id="properties">Properties
   </h3>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_WalletProxy_Fingerprint.md&amp;value=---%0Auid%3A%20chia.dotnet.WalletProxy.Fingerprint%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_WalletProxy_Fingerprint.md&amp;value=---%0Auid%3A%20chia.dotnet.WalletProxy.Fingerprint%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_WalletProxy_Fingerprint.md&amp;value=---%0Auid%3A%20chia.dotnet.WalletProxy.Fingerprint%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/WalletProxy.cs/#L30">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/WalletProxy.cs/#L30">View Source</a>
   </span>
   <a id="chia_dotnet_WalletProxy_Fingerprint_" data-uid="chia.dotnet.WalletProxy.Fingerprint*"></a>
   <h4 id="chia_dotnet_WalletProxy_Fingerprint" data-uid="chia.dotnet.WalletProxy.Fingerprint">Fingerprint</h4>
@@ -249,34 +221,10 @@ <h3 id="methods">Methods
   </h3>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_WalletProxy_AddKey_System_Collections_Generic_IEnumerable_System_String__System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.WalletProxy.AddKey(System.Collections.Generic.IEnumerable%7BSystem.String%7D%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-<<<<<<< HEAD
-    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/WalletProxy.cs/#L235">View Source</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_WalletProxy_AddKey_System_Collections_Generic_IEnumerable_System_String__System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.WalletProxy.AddKey(System.Collections.Generic.IEnumerable%7BSystem.String%7D%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/WalletProxy.cs/#L235">View Source</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_WalletProxy_AddKey_System_Collections_Generic_IEnumerable_System_String__System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.WalletProxy.AddKey(System.Collections.Generic.IEnumerable%7BSystem.String%7D%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/WalletProxy.cs/#L235">View Source</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-=======
     <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/WalletProxy.cs/#L233">View Source</a>
->>>>>>> main
   </span>
   <a id="chia_dotnet_WalletProxy_AddKey_" data-uid="chia.dotnet.WalletProxy.AddKey*"></a>
   <h4 id="chia_dotnet_WalletProxy_AddKey_System_Collections_Generic_IEnumerable_System_String__System_Threading_CancellationToken_" data-uid="chia.dotnet.WalletProxy.AddKey(System.Collections.Generic.IEnumerable{System.String},System.Threading.CancellationToken)">AddKey(IEnumerable&lt;String&gt;, CancellationToken)</h4>
@@ -329,34 +277,10 @@ <h5 class="returns">Returns</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_WalletProxy_CalculateRoyalties_System_Collections_Generic_IEnumerable_chia_dotnet_FungibleAsset__System_Collections_Generic_IEnumerable_chia_dotnet_RoyaltyAsset__System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.WalletProxy.CalculateRoyalties(System.Collections.Generic.IEnumerable%7Bchia.dotnet.FungibleAsset%7D%2CSystem.Collections.Generic.IEnumerable%7Bchia.dotnet.RoyaltyAsset%7D%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-<<<<<<< HEAD
-    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/WalletProxy.cs/#L748">View Source</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_WalletProxy_CalculateRoyalties_System_Collections_Generic_IEnumerable_chia_dotnet_FungibleAsset__System_Collections_Generic_IEnumerable_chia_dotnet_RoyaltyAsset__System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.WalletProxy.CalculateRoyalties(System.Collections.Generic.IEnumerable%7Bchia.dotnet.FungibleAsset%7D%2CSystem.Collections.Generic.IEnumerable%7Bchia.dotnet.RoyaltyAsset%7D%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/WalletProxy.cs/#L748">View Source</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_WalletProxy_CalculateRoyalties_System_Collections_Generic_IEnumerable_chia_dotnet_FungibleAsset__System_Collections_Generic_IEnumerable_chia_dotnet_RoyaltyAsset__System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.WalletProxy.CalculateRoyalties(System.Collections.Generic.IEnumerable%7Bchia.dotnet.FungibleAsset%7D%2CSystem.Collections.Generic.IEnumerable%7Bchia.dotnet.RoyaltyAsset%7D%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/WalletProxy.cs/#L748">View Source</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-=======
     <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/WalletProxy.cs/#L732">View Source</a>
->>>>>>> main
   </span>
   <a id="chia_dotnet_WalletProxy_CalculateRoyalties_" data-uid="chia.dotnet.WalletProxy.CalculateRoyalties*"></a>
   <h4 id="chia_dotnet_WalletProxy_CalculateRoyalties_System_Collections_Generic_IEnumerable_chia_dotnet_FungibleAsset__System_Collections_Generic_IEnumerable_chia_dotnet_RoyaltyAsset__System_Threading_CancellationToken_" data-uid="chia.dotnet.WalletProxy.CalculateRoyalties(System.Collections.Generic.IEnumerable{chia.dotnet.FungibleAsset},System.Collections.Generic.IEnumerable{chia.dotnet.RoyaltyAsset},System.Threading.CancellationToken)">CalculateRoyalties(IEnumerable&lt;FungibleAsset&gt;, IEnumerable&lt;RoyaltyAsset&gt;, CancellationToken)</h4>
@@ -413,34 +337,10 @@ <h5 class="returns">Returns</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_WalletProxy_CheckDeleteKey_System_UInt32_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.WalletProxy.CheckDeleteKey(System.UInt32%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
   </span>
   <span class="small pull-right mobile-hide">
-<<<<<<< HEAD
-    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/WalletProxy.cs/#L274">View Source</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_WalletProxy_CheckDeleteKey_System_UInt32_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.WalletProxy.CheckDeleteKey(System.UInt32%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/WalletProxy.cs/#L274">View Source</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_WalletProxy_CheckDeleteKey_System_UInt32_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.WalletProxy.CheckDeleteKey(System.UInt32%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/WalletProxy.cs/#L274">View Source</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-=======
     <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/WalletProxy.cs/#L270">View Source</a>
->>>>>>> main
   </span>
   <a id="chia_dotnet_WalletProxy_CheckDeleteKey_" data-uid="chia.dotnet.WalletProxy.CheckDeleteKey*"></a>
   <h4 id="chia_dotnet_WalletProxy_CheckDeleteKey_System_UInt32_System_Threading_CancellationToken_" data-uid="chia.dotnet.WalletProxy.CheckDeleteKey(System.UInt32,System.Threading.CancellationToken)">CheckDeleteKey(UInt32, CancellationToken)</h4>
@@ -495,34 +395,10 @@ <h5 class="returns">Returns</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_WalletProxy_CreateCATWallet_System_String_System_UInt64_System_UInt64_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.WalletProxy.CreateCATWallet(System.String%2CSystem.UInt64%2CSystem.UInt64%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-<<<<<<< HEAD
-    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/WalletProxy.cs/#L331">View Source</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_WalletProxy_CreateCATWallet_System_String_System_UInt64_System_UInt64_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.WalletProxy.CreateCATWallet(System.String%2CSystem.UInt64%2CSystem.UInt64%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/WalletProxy.cs/#L331">View Source</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_WalletProxy_CreateCATWallet_System_String_System_UInt64_System_UInt64_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.WalletProxy.CreateCATWallet(System.String%2CSystem.UInt64%2CSystem.UInt64%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/WalletProxy.cs/#L331">View Source</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-=======
     <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/WalletProxy.cs/#L325">View Source</a>
->>>>>>> main
   </span>
   <a id="chia_dotnet_WalletProxy_CreateCATWallet_" data-uid="chia.dotnet.WalletProxy.CreateCATWallet*"></a>
   <h4 id="chia_dotnet_WalletProxy_CreateCATWallet_System_String_System_UInt64_System_UInt64_System_Threading_CancellationToken_" data-uid="chia.dotnet.WalletProxy.CreateCATWallet(System.String,System.UInt64,System.UInt64,System.Threading.CancellationToken)">CreateCATWallet(String, UInt64, UInt64, CancellationToken)</h4>
@@ -587,34 +463,10 @@ <h5 class="returns">Returns</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_WalletProxy_CreateCATWallet_System_UInt64_System_UInt64_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.WalletProxy.CreateCATWallet(System.UInt64%2CSystem.UInt64%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
   </span>
   <span class="small pull-right mobile-hide">
-<<<<<<< HEAD
-    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/WalletProxy.cs/#L318">View Source</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_WalletProxy_CreateCATWallet_System_UInt64_System_UInt64_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.WalletProxy.CreateCATWallet(System.UInt64%2CSystem.UInt64%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/WalletProxy.cs/#L318">View Source</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_WalletProxy_CreateCATWallet_System_UInt64_System_UInt64_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.WalletProxy.CreateCATWallet(System.UInt64%2CSystem.UInt64%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/WalletProxy.cs/#L318">View Source</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-=======
     <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/WalletProxy.cs/#L312">View Source</a>
->>>>>>> main
   </span>
   <a id="chia_dotnet_WalletProxy_CreateCATWallet_" data-uid="chia.dotnet.WalletProxy.CreateCATWallet*"></a>
   <h4 id="chia_dotnet_WalletProxy_CreateCATWallet_System_UInt64_System_UInt64_System_Threading_CancellationToken_" data-uid="chia.dotnet.WalletProxy.CreateCATWallet(System.UInt64,System.UInt64,System.Threading.CancellationToken)">CreateCATWallet(UInt64, UInt64, CancellationToken)</h4>
@@ -673,34 +525,10 @@ <h5 class="returns">Returns</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_WalletProxy_CreateDIDWallet_System_Collections_Generic_IEnumerable_System_String__System_UInt64_System_String_System_Collections_Generic_IDictionary_System_String_System_String__System_UInt64_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.WalletProxy.CreateDIDWallet(System.Collections.Generic.IEnumerable%7BSystem.String%7D%2CSystem.UInt64%2CSystem.String%2CSystem.Collections.Generic.IDictionary%7BSystem.String%2CSystem.String%7D%2CSystem.UInt64%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
   </span>
   <span class="small pull-right mobile-hide">
-<<<<<<< HEAD
-    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/WalletProxy.cs/#L464">View Source</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_WalletProxy_CreateDIDWallet_System_Collections_Generic_IEnumerable_System_String__System_UInt64_System_String_System_Collections_Generic_IDictionary_System_String_System_String__System_UInt64_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.WalletProxy.CreateDIDWallet(System.Collections.Generic.IEnumerable%7BSystem.String%7D%2CSystem.UInt64%2CSystem.String%2CSystem.Collections.Generic.IDictionary%7BSystem.String%2CSystem.String%7D%2CSystem.UInt64%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/WalletProxy.cs/#L464">View Source</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_WalletProxy_CreateDIDWallet_System_Collections_Generic_IEnumerable_System_String__System_UInt64_System_String_System_Collections_Generic_IDictionary_System_String_System_String__System_UInt64_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.WalletProxy.CreateDIDWallet(System.Collections.Generic.IEnumerable%7BSystem.String%7D%2CSystem.UInt64%2CSystem.String%2CSystem.Collections.Generic.IDictionary%7BSystem.String%2CSystem.String%7D%2CSystem.UInt64%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/WalletProxy.cs/#L464">View Source</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-=======
     <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/WalletProxy.cs/#L456">View Source</a>
->>>>>>> main
   </span>
   <a id="chia_dotnet_WalletProxy_CreateDIDWallet_" data-uid="chia.dotnet.WalletProxy.CreateDIDWallet*"></a>
   <h4 id="chia_dotnet_WalletProxy_CreateDIDWallet_System_Collections_Generic_IEnumerable_System_String__System_UInt64_System_String_System_Collections_Generic_IDictionary_System_String_System_String__System_UInt64_System_Threading_CancellationToken_" data-uid="chia.dotnet.WalletProxy.CreateDIDWallet(System.Collections.Generic.IEnumerable{System.String},System.UInt64,System.String,System.Collections.Generic.IDictionary{System.String,System.String},System.UInt64,System.Threading.CancellationToken)">CreateDIDWallet(IEnumerable&lt;String&gt;, UInt64, String, IDictionary&lt;String, String&gt;, UInt64, CancellationToken)</h4>
@@ -774,36 +602,11 @@ <h5 class="returns">Returns</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_WalletProxy_CreateNewDl_System_String_System_UInt64_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.WalletProxy.CreateNewDl(System.String%2CSystem.UInt64%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
   </span>
   <span class="small pull-right mobile-hide">
     <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/WalletProxy.cs/#L716">View Source</a>
   </span>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_WalletProxy_CreateNewDl_System_String_System_UInt64_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.WalletProxy.CreateNewDl(System.String%2CSystem.UInt64%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/WalletProxy.cs/#L732">View Source</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_WalletProxy_CreateNewDl_System_String_System_UInt64_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.WalletProxy.CreateNewDl(System.String%2CSystem.UInt64%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-<<<<<<< HEAD
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/WalletProxy.cs/#L732">View Source</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-=======
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/WalletProxy.cs/#L732">View Source</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-  </span>
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
   <a id="chia_dotnet_WalletProxy_CreateNewDl_" data-uid="chia.dotnet.WalletProxy.CreateNewDl*"></a>
   <h4 id="chia_dotnet_WalletProxy_CreateNewDl_System_String_System_UInt64_System_Threading_CancellationToken_" data-uid="chia.dotnet.WalletProxy.CreateNewDl(System.String,System.UInt64,System.Threading.CancellationToken)">CreateNewDl(String, UInt64, CancellationToken)</h4>
   <div class="markdown level1 summary"><p>Initialize the new data layer wallets.</p>
@@ -860,37 +663,10 @@ <h5 class="returns">Returns</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_WalletProxy_CreateNFTWallet_System_String_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.WalletProxy.CreateNFTWallet(System.String%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/WalletProxy.cs/#L439">View Source</a>
-=======
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_WalletProxy_CreateNFTWallet_System_String_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.WalletProxy.CreateNFTWallet(System.String%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
   </span>
   <span class="small pull-right mobile-hide">
-<<<<<<< HEAD
-    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/WalletProxy.cs/#L439">View Source</a>
-<<<<<<< HEAD
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-=======
-<<<<<<< HEAD
-=======
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-=======
     <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/WalletProxy.cs/#L431">View Source</a>
->>>>>>> main
   </span>
   <a id="chia_dotnet_WalletProxy_CreateNFTWallet_" data-uid="chia.dotnet.WalletProxy.CreateNFTWallet*"></a>
   <h4 id="chia_dotnet_WalletProxy_CreateNFTWallet_System_String_System_Threading_CancellationToken_" data-uid="chia.dotnet.WalletProxy.CreateNFTWallet(System.String,System.Threading.CancellationToken)">CreateNFTWallet(String, CancellationToken)</h4>
@@ -943,34 +719,10 @@ <h5 class="returns">Returns</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_WalletProxy_CreatePoolWallet_chia_dotnet_PoolState_System_Nullable_System_UInt64__System_String_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.WalletProxy.CreatePoolWallet(chia.dotnet.PoolState%2CSystem.Nullable%7BSystem.UInt64%7D%2CSystem.String%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-<<<<<<< HEAD
-    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/WalletProxy.cs/#L565">View Source</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_WalletProxy_CreatePoolWallet_chia_dotnet_PoolState_System_Nullable_System_UInt64__System_String_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.WalletProxy.CreatePoolWallet(chia.dotnet.PoolState%2CSystem.Nullable%7BSystem.UInt64%7D%2CSystem.String%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/WalletProxy.cs/#L565">View Source</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_WalletProxy_CreatePoolWallet_chia_dotnet_PoolState_System_Nullable_System_UInt64__System_String_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.WalletProxy.CreatePoolWallet(chia.dotnet.PoolState%2CSystem.Nullable%7BSystem.UInt64%7D%2CSystem.String%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/WalletProxy.cs/#L565">View Source</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-=======
     <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/WalletProxy.cs/#L557">View Source</a>
->>>>>>> main
   </span>
   <a id="chia_dotnet_WalletProxy_CreatePoolWallet_" data-uid="chia.dotnet.WalletProxy.CreatePoolWallet*"></a>
   <h4 id="chia_dotnet_WalletProxy_CreatePoolWallet_chia_dotnet_PoolState_System_Nullable_System_UInt64__System_String_System_Threading_CancellationToken_" data-uid="chia.dotnet.WalletProxy.CreatePoolWallet(chia.dotnet.PoolState,System.Nullable{System.UInt64},System.String,System.Threading.CancellationToken)">CreatePoolWallet(PoolState, Nullable&lt;UInt64&gt;, String, CancellationToken)</h4>
@@ -1035,34 +787,10 @@ <h5 class="returns">Returns</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_WalletProxy_CreateSignedTransaction_System_Collections_Generic_IEnumerable_chia_dotnet_AmountWithPuzzlehash__System_Collections_Generic_IEnumerable_System_UInt64__System_Collections_Generic_IEnumerable_chia_dotnet_Coin__System_Collections_Generic_IEnumerable_chia_dotnet_PuzzleAnnouncement__System_Collections_Generic_IEnumerable_chia_dotnet_CoinAnnouncement__System_Collections_Generic_IEnumerable_chia_dotnet_Coin__System_UInt64_System_UInt64_System_UInt64_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.WalletProxy.CreateSignedTransaction(System.Collections.Generic.IEnumerable%7Bchia.dotnet.AmountWithPuzzlehash%7D%2CSystem.Collections.Generic.IEnumerable%7BSystem.UInt64%7D%2CSystem.Collections.Generic.IEnumerable%7Bchia.dotnet.Coin%7D%2CSystem.Collections.Generic.IEnumerable%7Bchia.dotnet.PuzzleAnnouncement%7D%2CSystem.Collections.Generic.IEnumerable%7Bchia.dotnet.CoinAnnouncement%7D%2CSystem.Collections.Generic.IEnumerable%7Bchia.dotnet.Coin%7D%2CSystem.UInt64%2CSystem.UInt64%2CSystem.UInt64%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-<<<<<<< HEAD
-    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/WalletProxy.cs/#L629">View Source</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_WalletProxy_CreateSignedTransaction_System_Collections_Generic_IEnumerable_chia_dotnet_AmountWithPuzzlehash__System_Collections_Generic_IEnumerable_System_UInt64__System_Collections_Generic_IEnumerable_chia_dotnet_Coin__System_Collections_Generic_IEnumerable_chia_dotnet_PuzzleAnnouncement__System_Collections_Generic_IEnumerable_chia_dotnet_CoinAnnouncement__System_Collections_Generic_IEnumerable_chia_dotnet_Coin__System_UInt64_System_UInt64_System_UInt64_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.WalletProxy.CreateSignedTransaction(System.Collections.Generic.IEnumerable%7Bchia.dotnet.AmountWithPuzzlehash%7D%2CSystem.Collections.Generic.IEnumerable%7BSystem.UInt64%7D%2CSystem.Collections.Generic.IEnumerable%7Bchia.dotnet.Coin%7D%2CSystem.Collections.Generic.IEnumerable%7Bchia.dotnet.PuzzleAnnouncement%7D%2CSystem.Collections.Generic.IEnumerable%7Bchia.dotnet.CoinAnnouncement%7D%2CSystem.Collections.Generic.IEnumerable%7Bchia.dotnet.Coin%7D%2CSystem.UInt64%2CSystem.UInt64%2CSystem.UInt64%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/WalletProxy.cs/#L629">View Source</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_WalletProxy_CreateSignedTransaction_System_Collections_Generic_IEnumerable_chia_dotnet_AmountWithPuzzlehash__System_Collections_Generic_IEnumerable_System_UInt64__System_Collections_Generic_IEnumerable_chia_dotnet_Coin__System_Collections_Generic_IEnumerable_chia_dotnet_PuzzleAnnouncement__System_Collections_Generic_IEnumerable_chia_dotnet_CoinAnnouncement__System_Collections_Generic_IEnumerable_chia_dotnet_Coin__System_UInt64_System_UInt64_System_UInt64_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.WalletProxy.CreateSignedTransaction(System.Collections.Generic.IEnumerable%7Bchia.dotnet.AmountWithPuzzlehash%7D%2CSystem.Collections.Generic.IEnumerable%7BSystem.UInt64%7D%2CSystem.Collections.Generic.IEnumerable%7Bchia.dotnet.Coin%7D%2CSystem.Collections.Generic.IEnumerable%7Bchia.dotnet.PuzzleAnnouncement%7D%2CSystem.Collections.Generic.IEnumerable%7Bchia.dotnet.CoinAnnouncement%7D%2CSystem.Collections.Generic.IEnumerable%7Bchia.dotnet.Coin%7D%2CSystem.UInt64%2CSystem.UInt64%2CSystem.UInt64%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/WalletProxy.cs/#L629">View Source</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-=======
     <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/WalletProxy.cs/#L621">View Source</a>
->>>>>>> main
   </span>
   <a id="chia_dotnet_WalletProxy_CreateSignedTransaction_" data-uid="chia.dotnet.WalletProxy.CreateSignedTransaction*"></a>
   <h4 id="chia_dotnet_WalletProxy_CreateSignedTransaction_System_Collections_Generic_IEnumerable_chia_dotnet_AmountWithPuzzlehash__System_Collections_Generic_IEnumerable_System_UInt64__System_Collections_Generic_IEnumerable_chia_dotnet_Coin__System_Collections_Generic_IEnumerable_chia_dotnet_PuzzleAnnouncement__System_Collections_Generic_IEnumerable_chia_dotnet_CoinAnnouncement__System_Collections_Generic_IEnumerable_chia_dotnet_Coin__System_UInt64_System_UInt64_System_UInt64_System_Threading_CancellationToken_" data-uid="chia.dotnet.WalletProxy.CreateSignedTransaction(System.Collections.Generic.IEnumerable{chia.dotnet.AmountWithPuzzlehash},System.Collections.Generic.IEnumerable{System.UInt64},System.Collections.Generic.IEnumerable{chia.dotnet.Coin},System.Collections.Generic.IEnumerable{chia.dotnet.PuzzleAnnouncement},System.Collections.Generic.IEnumerable{chia.dotnet.CoinAnnouncement},System.Collections.Generic.IEnumerable{chia.dotnet.Coin},System.UInt64,System.UInt64,System.UInt64,System.Threading.CancellationToken)">CreateSignedTransaction(IEnumerable&lt;AmountWithPuzzlehash&gt;, IEnumerable&lt;UInt64&gt;, IEnumerable&lt;Coin&gt;, IEnumerable&lt;PuzzleAnnouncement&gt;, IEnumerable&lt;CoinAnnouncement&gt;, IEnumerable&lt;Coin&gt;, UInt64, UInt64, UInt64, CancellationToken)</h4>
@@ -1155,34 +883,10 @@ <h5 class="returns">Returns</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_WalletProxy_CreateSignedTransaction_System_Collections_Generic_IEnumerable_chia_dotnet_Coin__System_UInt64_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.WalletProxy.CreateSignedTransaction(System.Collections.Generic.IEnumerable%7Bchia.dotnet.Coin%7D%2CSystem.UInt64%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
   </span>
   <span class="small pull-right mobile-hide">
-<<<<<<< HEAD
-    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/WalletProxy.cs/#L686">View Source</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_WalletProxy_CreateSignedTransaction_System_Collections_Generic_IEnumerable_chia_dotnet_Coin__System_UInt64_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.WalletProxy.CreateSignedTransaction(System.Collections.Generic.IEnumerable%7Bchia.dotnet.Coin%7D%2CSystem.UInt64%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/WalletProxy.cs/#L686">View Source</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_WalletProxy_CreateSignedTransaction_System_Collections_Generic_IEnumerable_chia_dotnet_Coin__System_UInt64_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.WalletProxy.CreateSignedTransaction(System.Collections.Generic.IEnumerable%7Bchia.dotnet.Coin%7D%2CSystem.UInt64%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/WalletProxy.cs/#L686">View Source</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-=======
     <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/WalletProxy.cs/#L678">View Source</a>
->>>>>>> main
   </span>
   <a id="chia_dotnet_WalletProxy_CreateSignedTransaction_" data-uid="chia.dotnet.WalletProxy.CreateSignedTransaction*"></a>
   <h4 id="chia_dotnet_WalletProxy_CreateSignedTransaction_System_Collections_Generic_IEnumerable_chia_dotnet_Coin__System_UInt64_System_Threading_CancellationToken_" data-uid="chia.dotnet.WalletProxy.CreateSignedTransaction(System.Collections.Generic.IEnumerable{chia.dotnet.Coin},System.UInt64,System.Threading.CancellationToken)">CreateSignedTransaction(IEnumerable&lt;Coin&gt;, UInt64, CancellationToken)</h4>
@@ -1241,34 +945,10 @@ <h5 class="returns">Returns</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_WalletProxy_CreateWalletForCAT_System_String_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.WalletProxy.CreateWalletForCAT(System.String%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
   </span>
   <span class="small pull-right mobile-hide">
-<<<<<<< HEAD
-    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/WalletProxy.cs/#L358">View Source</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_WalletProxy_CreateWalletForCAT_System_String_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.WalletProxy.CreateWalletForCAT(System.String%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/WalletProxy.cs/#L358">View Source</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_WalletProxy_CreateWalletForCAT_System_String_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.WalletProxy.CreateWalletForCAT(System.String%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/WalletProxy.cs/#L358">View Source</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-=======
     <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/WalletProxy.cs/#L352">View Source</a>
->>>>>>> main
   </span>
   <a id="chia_dotnet_WalletProxy_CreateWalletForCAT_" data-uid="chia.dotnet.WalletProxy.CreateWalletForCAT*"></a>
   <h4 id="chia_dotnet_WalletProxy_CreateWalletForCAT_System_String_System_Threading_CancellationToken_" data-uid="chia.dotnet.WalletProxy.CreateWalletForCAT(System.String,System.Threading.CancellationToken)">CreateWalletForCAT(String, CancellationToken)</h4>
@@ -1321,34 +1001,10 @@ <h5 class="returns">Returns</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_WalletProxy_DeleteAllKeys_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.WalletProxy.DeleteAllKeys(System.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-<<<<<<< HEAD
-    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/WalletProxy.cs/#L294">View Source</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_WalletProxy_DeleteAllKeys_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.WalletProxy.DeleteAllKeys(System.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/WalletProxy.cs/#L294">View Source</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_WalletProxy_DeleteAllKeys_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.WalletProxy.DeleteAllKeys(System.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/WalletProxy.cs/#L294">View Source</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-=======
     <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/WalletProxy.cs/#L290">View Source</a>
->>>>>>> main
   </span>
   <a id="chia_dotnet_WalletProxy_DeleteAllKeys_" data-uid="chia.dotnet.WalletProxy.DeleteAllKeys*"></a>
   <h4 id="chia_dotnet_WalletProxy_DeleteAllKeys_System_Threading_CancellationToken_" data-uid="chia.dotnet.WalletProxy.DeleteAllKeys(System.Threading.CancellationToken)">DeleteAllKeys(CancellationToken)</h4>
@@ -1395,34 +1051,10 @@ <h5 class="returns">Returns</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_WalletProxy_DeleteKey_System_UInt32_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.WalletProxy.DeleteKey(System.UInt32%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
   </span>
   <span class="small pull-right mobile-hide">
-<<<<<<< HEAD
-    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/WalletProxy.cs/#L256">View Source</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_WalletProxy_DeleteKey_System_UInt32_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.WalletProxy.DeleteKey(System.UInt32%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/WalletProxy.cs/#L256">View Source</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_WalletProxy_DeleteKey_System_UInt32_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.WalletProxy.DeleteKey(System.UInt32%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/WalletProxy.cs/#L256">View Source</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-=======
     <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/WalletProxy.cs/#L252">View Source</a>
->>>>>>> main
   </span>
   <a id="chia_dotnet_WalletProxy_DeleteKey_" data-uid="chia.dotnet.WalletProxy.DeleteKey*"></a>
   <h4 id="chia_dotnet_WalletProxy_DeleteKey_System_UInt32_System_Threading_CancellationToken_" data-uid="chia.dotnet.WalletProxy.DeleteKey(System.UInt32,System.Threading.CancellationToken)">DeleteKey(UInt32, CancellationToken)</h4>
@@ -1475,34 +1107,10 @@ <h5 class="returns">Returns</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_WalletProxy_DeleteNotifications_System_Collections_Generic_IEnumerable_System_String__System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.WalletProxy.DeleteNotifications(System.Collections.Generic.IEnumerable%7BSystem.String%7D%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-<<<<<<< HEAD
-    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/WalletProxy.cs/#L881">View Source</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_WalletProxy_DeleteNotifications_System_Collections_Generic_IEnumerable_System_String__System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.WalletProxy.DeleteNotifications(System.Collections.Generic.IEnumerable%7BSystem.String%7D%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/WalletProxy.cs/#L881">View Source</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_WalletProxy_DeleteNotifications_System_Collections_Generic_IEnumerable_System_String__System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.WalletProxy.DeleteNotifications(System.Collections.Generic.IEnumerable%7BSystem.String%7D%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/WalletProxy.cs/#L881">View Source</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-=======
     <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/WalletProxy.cs/#L865">View Source</a>
->>>>>>> main
   </span>
   <a id="chia_dotnet_WalletProxy_DeleteNotifications_" data-uid="chia.dotnet.WalletProxy.DeleteNotifications*"></a>
   <h4 id="chia_dotnet_WalletProxy_DeleteNotifications_System_Collections_Generic_IEnumerable_System_String__System_Threading_CancellationToken_" data-uid="chia.dotnet.WalletProxy.DeleteNotifications(System.Collections.Generic.IEnumerable{System.String},System.Threading.CancellationToken)">DeleteNotifications(IEnumerable&lt;String&gt;, CancellationToken)</h4>
@@ -1554,34 +1162,10 @@ <h5 class="returns">Returns</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_WalletProxy_DidFindLostDid_System_String_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.WalletProxy.DidFindLostDid(System.String%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
   </span>
   <span class="small pull-right mobile-hide">
-<<<<<<< HEAD
-    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/WalletProxy.cs/#L818">View Source</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_WalletProxy_DidFindLostDid_System_String_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.WalletProxy.DidFindLostDid(System.String%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/WalletProxy.cs/#L818">View Source</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_WalletProxy_DidFindLostDid_System_String_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.WalletProxy.DidFindLostDid(System.String%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/WalletProxy.cs/#L818">View Source</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-=======
     <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/WalletProxy.cs/#L802">View Source</a>
->>>>>>> main
   </span>
   <a id="chia_dotnet_WalletProxy_DidFindLostDid_" data-uid="chia.dotnet.WalletProxy.DidFindLostDid*"></a>
   <h4 id="chia_dotnet_WalletProxy_DidFindLostDid_System_String_System_Threading_CancellationToken_" data-uid="chia.dotnet.WalletProxy.DidFindLostDid(System.String,System.Threading.CancellationToken)">DidFindLostDid(String, CancellationToken)</h4>
@@ -1633,34 +1217,10 @@ <h5 class="returns">Returns</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_WalletProxy_DidGetInfo_System_String_System_Boolean_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.WalletProxy.DidGetInfo(System.String%2CSystem.Boolean%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-<<<<<<< HEAD
-    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/WalletProxy.cs/#L804">View Source</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_WalletProxy_DidGetInfo_System_String_System_Boolean_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.WalletProxy.DidGetInfo(System.String%2CSystem.Boolean%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/WalletProxy.cs/#L804">View Source</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_WalletProxy_DidGetInfo_System_String_System_Boolean_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.WalletProxy.DidGetInfo(System.String%2CSystem.Boolean%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/WalletProxy.cs/#L804">View Source</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-=======
     <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/WalletProxy.cs/#L788">View Source</a>
->>>>>>> main
   </span>
   <a id="chia_dotnet_WalletProxy_DidGetInfo_" data-uid="chia.dotnet.WalletProxy.DidGetInfo*"></a>
   <h4 id="chia_dotnet_WalletProxy_DidGetInfo_System_String_System_Boolean_System_Threading_CancellationToken_" data-uid="chia.dotnet.WalletProxy.DidGetInfo(System.String,System.Boolean,System.Threading.CancellationToken)">DidGetInfo(String, Boolean, CancellationToken)</h4>
@@ -1717,34 +1277,10 @@ <h5 class="returns">Returns</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_WalletProxy_ExtendDerivationIndex_System_UInt32_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.WalletProxy.ExtendDerivationIndex(System.UInt32%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
   </span>
   <span class="small pull-right mobile-hide">
-<<<<<<< HEAD
-    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/WalletProxy.cs/#L840">View Source</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_WalletProxy_ExtendDerivationIndex_System_UInt32_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.WalletProxy.ExtendDerivationIndex(System.UInt32%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/WalletProxy.cs/#L840">View Source</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_WalletProxy_ExtendDerivationIndex_System_UInt32_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.WalletProxy.ExtendDerivationIndex(System.UInt32%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/WalletProxy.cs/#L840">View Source</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-=======
     <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/WalletProxy.cs/#L824">View Source</a>
->>>>>>> main
   </span>
   <a id="chia_dotnet_WalletProxy_ExtendDerivationIndex_" data-uid="chia.dotnet.WalletProxy.ExtendDerivationIndex*"></a>
   <h4 id="chia_dotnet_WalletProxy_ExtendDerivationIndex_System_UInt32_System_Threading_CancellationToken_" data-uid="chia.dotnet.WalletProxy.ExtendDerivationIndex(System.UInt32,System.Threading.CancellationToken)">ExtendDerivationIndex(UInt32, CancellationToken)</h4>
@@ -1796,34 +1332,10 @@ <h5 class="returns">Returns</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_WalletProxy_GenerateMnemonic_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.WalletProxy.GenerateMnemonic(System.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
   </span>
   <span class="small pull-right mobile-hide">
-<<<<<<< HEAD
-    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/WalletProxy.cs/#L304">View Source</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_WalletProxy_GenerateMnemonic_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.WalletProxy.GenerateMnemonic(System.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/WalletProxy.cs/#L304">View Source</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_WalletProxy_GenerateMnemonic_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.WalletProxy.GenerateMnemonic(System.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/WalletProxy.cs/#L304">View Source</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-=======
     <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/WalletProxy.cs/#L300">View Source</a>
->>>>>>> main
   </span>
   <a id="chia_dotnet_WalletProxy_GenerateMnemonic_" data-uid="chia.dotnet.WalletProxy.GenerateMnemonic*"></a>
   <h4 id="chia_dotnet_WalletProxy_GenerateMnemonic_System_Threading_CancellationToken_" data-uid="chia.dotnet.WalletProxy.GenerateMnemonic(System.Threading.CancellationToken)">GenerateMnemonic(CancellationToken)</h4>
@@ -1870,34 +1382,10 @@ <h5 class="returns">Returns</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_WalletProxy_GetAutoClaim_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.WalletProxy.GetAutoClaim(System.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-<<<<<<< HEAD
-    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/WalletProxy.cs/#L1082">View Source</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_WalletProxy_GetAutoClaim_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.WalletProxy.GetAutoClaim(System.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/WalletProxy.cs/#L1082">View Source</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_WalletProxy_GetAutoClaim_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.WalletProxy.GetAutoClaim(System.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/WalletProxy.cs/#L1082">View Source</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-=======
     <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/WalletProxy.cs/#L1069">View Source</a>
->>>>>>> main
   </span>
   <a id="chia_dotnet_WalletProxy_GetAutoClaim_" data-uid="chia.dotnet.WalletProxy.GetAutoClaim*"></a>
   <h4 id="chia_dotnet_WalletProxy_GetAutoClaim_System_Threading_CancellationToken_" data-uid="chia.dotnet.WalletProxy.GetAutoClaim(System.Threading.CancellationToken)">GetAutoClaim(CancellationToken)</h4>
@@ -1944,34 +1432,10 @@ <h5 class="returns">Returns</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_WalletProxy_GetCoinRecords_chia_dotnet_UInt32Range_chia_dotnet_UInt32Range_chia_dotnet_UInt64Range_chia_dotnet_AmountFilter_chia_dotnet_HashFilter_chia_dotnet_HashFilter_chia_dotnet_HashFilter_System_Nullable_chia_dotnet_CoinType__System_Nullable_chia_dotnet_WalletType__System_Nullable_System_UInt32__System_Nullable_System_UInt32__chia_dotnet_CoinRecordOrder_System_UInt32_System_Boolean_System_Boolean_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.WalletProxy.GetCoinRecords(chia.dotnet.UInt32Range%2Cchia.dotnet.UInt32Range%2Cchia.dotnet.UInt64Range%2Cchia.dotnet.AmountFilter%2Cchia.dotnet.HashFilter%2Cchia.dotnet.HashFilter%2Cchia.dotnet.HashFilter%2CSystem.Nullable%7Bchia.dotnet.CoinType%7D%2CSystem.Nullable%7Bchia.dotnet.WalletType%7D%2CSystem.Nullable%7BSystem.UInt32%7D%2CSystem.Nullable%7BSystem.UInt32%7D%2Cchia.dotnet.CoinRecordOrder%2CSystem.UInt32%2CSystem.Boolean%2CSystem.Boolean%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-<<<<<<< HEAD
-    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/WalletProxy.cs/#L959">View Source</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_WalletProxy_GetCoinRecords_chia_dotnet_UInt32Range_chia_dotnet_UInt32Range_chia_dotnet_UInt64Range_chia_dotnet_AmountFilter_chia_dotnet_HashFilter_chia_dotnet_HashFilter_chia_dotnet_HashFilter_System_Nullable_chia_dotnet_CoinType__System_Nullable_chia_dotnet_WalletType__System_Nullable_System_UInt32__System_Nullable_System_UInt32__chia_dotnet_CoinRecordOrder_System_UInt32_System_Boolean_System_Boolean_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.WalletProxy.GetCoinRecords(chia.dotnet.UInt32Range%2Cchia.dotnet.UInt32Range%2Cchia.dotnet.UInt64Range%2Cchia.dotnet.AmountFilter%2Cchia.dotnet.HashFilter%2Cchia.dotnet.HashFilter%2Cchia.dotnet.HashFilter%2CSystem.Nullable%7Bchia.dotnet.CoinType%7D%2CSystem.Nullable%7Bchia.dotnet.WalletType%7D%2CSystem.Nullable%7BSystem.UInt32%7D%2CSystem.Nullable%7BSystem.UInt32%7D%2Cchia.dotnet.CoinRecordOrder%2CSystem.UInt32%2CSystem.Boolean%2CSystem.Boolean%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/WalletProxy.cs/#L959">View Source</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_WalletProxy_GetCoinRecords_chia_dotnet_UInt32Range_chia_dotnet_UInt32Range_chia_dotnet_UInt64Range_chia_dotnet_AmountFilter_chia_dotnet_HashFilter_chia_dotnet_HashFilter_chia_dotnet_HashFilter_System_Nullable_chia_dotnet_CoinType__System_Nullable_chia_dotnet_WalletType__System_Nullable_System_UInt32__System_Nullable_System_UInt32__chia_dotnet_CoinRecordOrder_System_UInt32_System_Boolean_System_Boolean_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.WalletProxy.GetCoinRecords(chia.dotnet.UInt32Range%2Cchia.dotnet.UInt32Range%2Cchia.dotnet.UInt64Range%2Cchia.dotnet.AmountFilter%2Cchia.dotnet.HashFilter%2Cchia.dotnet.HashFilter%2Cchia.dotnet.HashFilter%2CSystem.Nullable%7Bchia.dotnet.CoinType%7D%2CSystem.Nullable%7Bchia.dotnet.WalletType%7D%2CSystem.Nullable%7BSystem.UInt32%7D%2CSystem.Nullable%7BSystem.UInt32%7D%2Cchia.dotnet.CoinRecordOrder%2CSystem.UInt32%2CSystem.Boolean%2CSystem.Boolean%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/WalletProxy.cs/#L959">View Source</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-=======
     <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/WalletProxy.cs/#L943">View Source</a>
->>>>>>> main
   </span>
   <a id="chia_dotnet_WalletProxy_GetCoinRecords_" data-uid="chia.dotnet.WalletProxy.GetCoinRecords*"></a>
   <h4 id="chia_dotnet_WalletProxy_GetCoinRecords_chia_dotnet_UInt32Range_chia_dotnet_UInt32Range_chia_dotnet_UInt64Range_chia_dotnet_AmountFilter_chia_dotnet_HashFilter_chia_dotnet_HashFilter_chia_dotnet_HashFilter_System_Nullable_chia_dotnet_CoinType__System_Nullable_chia_dotnet_WalletType__System_Nullable_System_UInt32__System_Nullable_System_UInt32__chia_dotnet_CoinRecordOrder_System_UInt32_System_Boolean_System_Boolean_System_Threading_CancellationToken_" data-uid="chia.dotnet.WalletProxy.GetCoinRecords(chia.dotnet.UInt32Range,chia.dotnet.UInt32Range,chia.dotnet.UInt64Range,chia.dotnet.AmountFilter,chia.dotnet.HashFilter,chia.dotnet.HashFilter,chia.dotnet.HashFilter,System.Nullable{chia.dotnet.CoinType},System.Nullable{chia.dotnet.WalletType},System.Nullable{System.UInt32},System.Nullable{System.UInt32},chia.dotnet.CoinRecordOrder,System.UInt32,System.Boolean,System.Boolean,System.Threading.CancellationToken)">GetCoinRecords(UInt32Range, UInt32Range, UInt64Range, AmountFilter, HashFilter, HashFilter, HashFilter, Nullable&lt;CoinType&gt;, Nullable&lt;WalletType&gt;, Nullable&lt;UInt32&gt;, Nullable&lt;UInt32&gt;, CoinRecordOrder, UInt32, Boolean, Boolean, CancellationToken)</h4>
@@ -2092,37 +1556,10 @@ <h5 class="returns">Returns</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_WalletProxy_GetCoinRecordsByNames_System_Collections_Generic_IEnumerable_System_String__System_Boolean_System_Nullable_System_Int32__System_Nullable_System_Int32__System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.WalletProxy.GetCoinRecordsByNames(System.Collections.Generic.IEnumerable%7BSystem.String%7D%2CSystem.Boolean%2CSystem.Nullable%7BSystem.Int32%7D%2CSystem.Nullable%7BSystem.Int32%7D%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/WalletProxy.cs/#L701">View Source</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_WalletProxy_GetCoinRecordsByNames_System_Collections_Generic_IEnumerable_System_String__System_Boolean_System_Nullable_System_Int32__System_Nullable_System_Int32__System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.WalletProxy.GetCoinRecordsByNames(System.Collections.Generic.IEnumerable%7BSystem.String%7D%2CSystem.Boolean%2CSystem.Nullable%7BSystem.Int32%7D%2CSystem.Nullable%7BSystem.Int32%7D%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/WalletProxy.cs/#L701">View Source</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_WalletProxy_GetCoinRecordsByNames_System_Collections_Generic_IEnumerable_System_String__System_Boolean_System_Nullable_System_Int32__System_Nullable_System_Int32__System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.WalletProxy.GetCoinRecordsByNames(System.Collections.Generic.IEnumerable%7BSystem.String%7D%2CSystem.Boolean%2CSystem.Nullable%7BSystem.Int32%7D%2CSystem.Nullable%7BSystem.Int32%7D%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/WalletProxy.cs/#L701">View Source</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_WalletProxy_GetCoinRecordsByNames_System_Collections_Generic_IEnumerable_System_String__System_Boolean_System_Nullable_System_UInt32__System_Nullable_System_UInt32__System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.WalletProxy.GetCoinRecordsByNames(System.Collections.Generic.IEnumerable%7BSystem.String%7D%2CSystem.Boolean%2CSystem.Nullable%7BSystem.UInt32%7D%2CSystem.Nullable%7BSystem.UInt32%7D%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
   </span>
   <span class="small pull-right mobile-hide">
     <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/WalletProxy.cs/#L693">View Source</a>
->>>>>>> main
   </span>
   <a id="chia_dotnet_WalletProxy_GetCoinRecordsByNames_" data-uid="chia.dotnet.WalletProxy.GetCoinRecordsByNames*"></a>
   <h4 id="chia_dotnet_WalletProxy_GetCoinRecordsByNames_System_Collections_Generic_IEnumerable_System_String__System_Boolean_System_Nullable_System_UInt32__System_Nullable_System_UInt32__System_Threading_CancellationToken_" data-uid="chia.dotnet.WalletProxy.GetCoinRecordsByNames(System.Collections.Generic.IEnumerable{System.String},System.Boolean,System.Nullable{System.UInt32},System.Nullable{System.UInt32},System.Threading.CancellationToken)">GetCoinRecordsByNames(IEnumerable&lt;String&gt;, Boolean, Nullable&lt;UInt32&gt;, Nullable&lt;UInt32&gt;, CancellationToken)</h4>
@@ -2193,34 +1630,10 @@ <h5 class="returns">Returns</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_WalletProxy_GetCurrentDerivationIndex_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.WalletProxy.GetCurrentDerivationIndex(System.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
   </span>
   <span class="small pull-right mobile-hide">
-<<<<<<< HEAD
-    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/WalletProxy.cs/#L829">View Source</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_WalletProxy_GetCurrentDerivationIndex_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.WalletProxy.GetCurrentDerivationIndex(System.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/WalletProxy.cs/#L829">View Source</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_WalletProxy_GetCurrentDerivationIndex_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.WalletProxy.GetCurrentDerivationIndex(System.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/WalletProxy.cs/#L829">View Source</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-=======
     <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/WalletProxy.cs/#L813">View Source</a>
->>>>>>> main
   </span>
   <a id="chia_dotnet_WalletProxy_GetCurrentDerivationIndex_" data-uid="chia.dotnet.WalletProxy.GetCurrentDerivationIndex*"></a>
   <h4 id="chia_dotnet_WalletProxy_GetCurrentDerivationIndex_System_Threading_CancellationToken_" data-uid="chia.dotnet.WalletProxy.GetCurrentDerivationIndex(System.Threading.CancellationToken)">GetCurrentDerivationIndex(CancellationToken)</h4>
@@ -2267,34 +1680,10 @@ <h5 class="returns">Returns</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_WalletProxy_GetFarmedAmount_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.WalletProxy.GetFarmedAmount(System.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-<<<<<<< HEAD
-    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/WalletProxy.cs/#L602">View Source</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_WalletProxy_GetFarmedAmount_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.WalletProxy.GetFarmedAmount(System.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/WalletProxy.cs/#L602">View Source</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_WalletProxy_GetFarmedAmount_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.WalletProxy.GetFarmedAmount(System.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/WalletProxy.cs/#L602">View Source</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-=======
     <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/WalletProxy.cs/#L594">View Source</a>
->>>>>>> main
   </span>
   <a id="chia_dotnet_WalletProxy_GetFarmedAmount_" data-uid="chia.dotnet.WalletProxy.GetFarmedAmount*"></a>
   <h4 id="chia_dotnet_WalletProxy_GetFarmedAmount_System_Threading_CancellationToken_" data-uid="chia.dotnet.WalletProxy.GetFarmedAmount(System.Threading.CancellationToken)">GetFarmedAmount(CancellationToken)</h4>
@@ -2341,30 +1730,10 @@ <h5 class="returns">Returns</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_WalletProxy_GetHeightInfo_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.WalletProxy.GetHeightInfo(System.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
   </span>
   <span class="small pull-right mobile-hide">
     <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/WalletProxy.cs/#L162">View Source</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_WalletProxy_GetHeightInfo_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.WalletProxy.GetHeightInfo(System.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/WalletProxy.cs/#L162">View Source</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_WalletProxy_GetHeightInfo_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.WalletProxy.GetHeightInfo(System.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/WalletProxy.cs/#L162">View Source</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <a id="chia_dotnet_WalletProxy_GetHeightInfo_" data-uid="chia.dotnet.WalletProxy.GetHeightInfo*"></a>
   <h4 id="chia_dotnet_WalletProxy_GetHeightInfo_System_Threading_CancellationToken_" data-uid="chia.dotnet.WalletProxy.GetHeightInfo(System.Threading.CancellationToken)">GetHeightInfo(CancellationToken)</h4>
@@ -2411,30 +1780,10 @@ <h5 class="returns">Returns</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_WalletProxy_GetLoggedInFingerprint_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.WalletProxy.GetLoggedInFingerprint(System.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/WalletProxy.cs/#L110">View Source</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_WalletProxy_GetLoggedInFingerprint_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.WalletProxy.GetLoggedInFingerprint(System.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/WalletProxy.cs/#L110">View Source</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_WalletProxy_GetLoggedInFingerprint_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.WalletProxy.GetLoggedInFingerprint(System.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
   </span>
   <span class="small pull-right mobile-hide">
     <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/WalletProxy.cs/#L110">View Source</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <a id="chia_dotnet_WalletProxy_GetLoggedInFingerprint_" data-uid="chia.dotnet.WalletProxy.GetLoggedInFingerprint*"></a>
   <h4 id="chia_dotnet_WalletProxy_GetLoggedInFingerprint_System_Threading_CancellationToken_" data-uid="chia.dotnet.WalletProxy.GetLoggedInFingerprint(System.Threading.CancellationToken)">GetLoggedInFingerprint(CancellationToken)</h4>
@@ -2481,36 +1830,11 @@ <h5 class="returns">Returns</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_WalletProxy_GetNetworkInfo_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.WalletProxy.GetNetworkInfo(System.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
   </span>
   <span class="small pull-right mobile-hide">
     <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/WalletProxy.cs/#L150">View Source</a>
   </span>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_WalletProxy_GetNetworkInfo_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.WalletProxy.GetNetworkInfo(System.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/WalletProxy.cs/#L150">View Source</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_WalletProxy_GetNetworkInfo_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.WalletProxy.GetNetworkInfo(System.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-<<<<<<< HEAD
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/WalletProxy.cs/#L150">View Source</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-=======
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/WalletProxy.cs/#L150">View Source</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-  </span>
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
   <a id="chia_dotnet_WalletProxy_GetNetworkInfo_" data-uid="chia.dotnet.WalletProxy.GetNetworkInfo*"></a>
   <h4 id="chia_dotnet_WalletProxy_GetNetworkInfo_System_Threading_CancellationToken_" data-uid="chia.dotnet.WalletProxy.GetNetworkInfo(System.Threading.CancellationToken)">GetNetworkInfo(CancellationToken)</h4>
   <div class="markdown level1 summary"><p>Retrieves information about the current network</p>
@@ -2556,37 +1880,10 @@ <h5 class="returns">Returns</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_WalletProxy_GetNFTByDID_System_String_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.WalletProxy.GetNFTByDID(System.String%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/WalletProxy.cs/#L385">View Source</a>
-=======
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_WalletProxy_GetNFTByDID_System_String_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.WalletProxy.GetNFTByDID(System.String%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
   </span>
   <span class="small pull-right mobile-hide">
-<<<<<<< HEAD
-    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/WalletProxy.cs/#L385">View Source</a>
-<<<<<<< HEAD
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-=======
-<<<<<<< HEAD
-=======
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-=======
     <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/WalletProxy.cs/#L379">View Source</a>
->>>>>>> main
   </span>
   <a id="chia_dotnet_WalletProxy_GetNFTByDID_" data-uid="chia.dotnet.WalletProxy.GetNFTByDID*"></a>
   <h4 id="chia_dotnet_WalletProxy_GetNFTByDID_System_String_System_Threading_CancellationToken_" data-uid="chia.dotnet.WalletProxy.GetNFTByDID(System.String,System.Threading.CancellationToken)">GetNFTByDID(String, CancellationToken)</h4>
@@ -2639,34 +1936,10 @@ <h5 class="returns">Returns</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_WalletProxy_GetNFTInfo_System_String_System_Boolean_System_Boolean_System_Nullable_System_Boolean__System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.WalletProxy.GetNFTInfo(System.String%2CSystem.Boolean%2CSystem.Boolean%2CSystem.Nullable%7BSystem.Boolean%7D%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-<<<<<<< HEAD
-    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/WalletProxy.cs/#L422">View Source</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_WalletProxy_GetNFTInfo_System_String_System_Boolean_System_Boolean_System_Nullable_System_Boolean__System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.WalletProxy.GetNFTInfo(System.String%2CSystem.Boolean%2CSystem.Boolean%2CSystem.Nullable%7BSystem.Boolean%7D%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/WalletProxy.cs/#L422">View Source</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_WalletProxy_GetNFTInfo_System_String_System_Boolean_System_Boolean_System_Nullable_System_Boolean__System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.WalletProxy.GetNFTInfo(System.String%2CSystem.Boolean%2CSystem.Boolean%2CSystem.Nullable%7BSystem.Boolean%7D%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/WalletProxy.cs/#L422">View Source</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-=======
     <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/WalletProxy.cs/#L414">View Source</a>
->>>>>>> main
   </span>
   <a id="chia_dotnet_WalletProxy_GetNFTInfo_" data-uid="chia.dotnet.WalletProxy.GetNFTInfo*"></a>
   <h4 id="chia_dotnet_WalletProxy_GetNFTInfo_System_String_System_Boolean_System_Boolean_System_Nullable_System_Boolean__System_Threading_CancellationToken_" data-uid="chia.dotnet.WalletProxy.GetNFTInfo(System.String,System.Boolean,System.Boolean,System.Nullable{System.Boolean},System.Threading.CancellationToken)">GetNFTInfo(String, Boolean, Boolean, Nullable&lt;Boolean&gt;, CancellationToken)</h4>
@@ -2734,34 +2007,10 @@ <h5 class="returns">Returns</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_WalletProxy_GetPoolInfo_System_Uri_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.WalletProxy.GetPoolInfo(System.Uri%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
   </span>
   <span class="small pull-right mobile-hide">
-<<<<<<< HEAD
-    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/WalletProxy.cs/#L540">View Source</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_WalletProxy_GetPoolInfo_System_Uri_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.WalletProxy.GetPoolInfo(System.Uri%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/WalletProxy.cs/#L540">View Source</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_WalletProxy_GetPoolInfo_System_Uri_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.WalletProxy.GetPoolInfo(System.Uri%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/WalletProxy.cs/#L540">View Source</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-=======
     <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/WalletProxy.cs/#L532">View Source</a>
->>>>>>> main
   </span>
   <a id="chia_dotnet_WalletProxy_GetPoolInfo_" data-uid="chia.dotnet.WalletProxy.GetPoolInfo*"></a>
   <h4 id="chia_dotnet_WalletProxy_GetPoolInfo_System_Uri_System_Threading_CancellationToken_" data-uid="chia.dotnet.WalletProxy.GetPoolInfo(System.Uri,System.Threading.CancellationToken)">GetPoolInfo(Uri, CancellationToken)</h4>
@@ -2814,30 +2063,10 @@ <h5 class="returns">Returns</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_WalletProxy_GetPrivateKey_System_UInt32_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.WalletProxy.GetPrivateKey(System.UInt32%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/WalletProxy.cs/#L121">View Source</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_WalletProxy_GetPrivateKey_System_UInt32_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.WalletProxy.GetPrivateKey(System.UInt32%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/WalletProxy.cs/#L121">View Source</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_WalletProxy_GetPrivateKey_System_UInt32_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.WalletProxy.GetPrivateKey(System.UInt32%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
   </span>
   <span class="small pull-right mobile-hide">
     <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/WalletProxy.cs/#L121">View Source</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <a id="chia_dotnet_WalletProxy_GetPrivateKey_" data-uid="chia.dotnet.WalletProxy.GetPrivateKey*"></a>
   <h4 id="chia_dotnet_WalletProxy_GetPrivateKey_System_UInt32_System_Threading_CancellationToken_" data-uid="chia.dotnet.WalletProxy.GetPrivateKey(System.UInt32,System.Threading.CancellationToken)">GetPrivateKey(UInt32, CancellationToken)</h4>
@@ -2890,30 +2119,10 @@ <h5 class="returns">Returns</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_WalletProxy_GetPublicKeys_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.WalletProxy.GetPublicKeys(System.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
   </span>
   <span class="small pull-right mobile-hide">
     <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/WalletProxy.cs/#L98">View Source</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_WalletProxy_GetPublicKeys_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.WalletProxy.GetPublicKeys(System.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/WalletProxy.cs/#L98">View Source</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_WalletProxy_GetPublicKeys_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.WalletProxy.GetPublicKeys(System.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/WalletProxy.cs/#L98">View Source</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <a id="chia_dotnet_WalletProxy_GetPublicKeys_" data-uid="chia.dotnet.WalletProxy.GetPublicKeys*"></a>
   <h4 id="chia_dotnet_WalletProxy_GetPublicKeys_System_Threading_CancellationToken_" data-uid="chia.dotnet.WalletProxy.GetPublicKeys(System.Threading.CancellationToken)">GetPublicKeys(CancellationToken)</h4>
@@ -2960,30 +2169,10 @@ <h5 class="returns">Returns</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_WalletProxy_GetSyncStatus_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.WalletProxy.GetSyncStatus(System.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/WalletProxy.cs/#L134">View Source</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_WalletProxy_GetSyncStatus_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.WalletProxy.GetSyncStatus(System.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/WalletProxy.cs/#L134">View Source</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_WalletProxy_GetSyncStatus_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.WalletProxy.GetSyncStatus(System.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
   </span>
   <span class="small pull-right mobile-hide">
     <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/WalletProxy.cs/#L134">View Source</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <a id="chia_dotnet_WalletProxy_GetSyncStatus_" data-uid="chia.dotnet.WalletProxy.GetSyncStatus*"></a>
   <h4 id="chia_dotnet_WalletProxy_GetSyncStatus_System_Threading_CancellationToken_" data-uid="chia.dotnet.WalletProxy.GetSyncStatus(System.Threading.CancellationToken)">GetSyncStatus(CancellationToken)</h4>
@@ -3030,34 +2219,10 @@ <h5 class="returns">Returns</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_WalletProxy_GetTimestampForHeight_System_UInt32_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.WalletProxy.GetTimestampForHeight(System.UInt32%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
   </span>
   <span class="small pull-right mobile-hide">
-<<<<<<< HEAD
-    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/WalletProxy.cs/#L1025">View Source</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_WalletProxy_GetTimestampForHeight_System_UInt32_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.WalletProxy.GetTimestampForHeight(System.UInt32%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/WalletProxy.cs/#L1025">View Source</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_WalletProxy_GetTimestampForHeight_System_UInt32_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.WalletProxy.GetTimestampForHeight(System.UInt32%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/WalletProxy.cs/#L1025">View Source</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-=======
     <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/WalletProxy.cs/#L1009">View Source</a>
->>>>>>> main
   </span>
   <a id="chia_dotnet_WalletProxy_GetTimestampForHeight_" data-uid="chia.dotnet.WalletProxy.GetTimestampForHeight*"></a>
   <h4 id="chia_dotnet_WalletProxy_GetTimestampForHeight_System_UInt32_System_Threading_CancellationToken_" data-uid="chia.dotnet.WalletProxy.GetTimestampForHeight(System.UInt32,System.Threading.CancellationToken)">GetTimestampForHeight(UInt32, CancellationToken)</h4>
@@ -3109,34 +2274,10 @@ <h5 class="returns">Returns</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_WalletProxy_GetTransaction_System_String_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.WalletProxy.GetTransaction(System.String%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
   </span>
   <span class="small pull-right mobile-hide">
-<<<<<<< HEAD
-    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/WalletProxy.cs/#L175">View Source</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_WalletProxy_GetTransaction_System_String_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.WalletProxy.GetTransaction(System.String%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/WalletProxy.cs/#L175">View Source</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_WalletProxy_GetTransaction_System_String_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.WalletProxy.GetTransaction(System.String%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/WalletProxy.cs/#L175">View Source</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-=======
     <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/WalletProxy.cs/#L173">View Source</a>
->>>>>>> main
   </span>
   <a id="chia_dotnet_WalletProxy_GetTransaction_" data-uid="chia.dotnet.WalletProxy.GetTransaction*"></a>
   <h4 id="chia_dotnet_WalletProxy_GetTransaction_System_String_System_Threading_CancellationToken_" data-uid="chia.dotnet.WalletProxy.GetTransaction(System.String,System.Threading.CancellationToken)">GetTransaction(String, CancellationToken)</h4>
@@ -3189,34 +2330,10 @@ <h5 class="returns">Returns</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_WalletProxy_GetTransactionMemo_System_String_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.WalletProxy.GetTransactionMemo(System.String%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-<<<<<<< HEAD
-    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/WalletProxy.cs/#L853">View Source</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_WalletProxy_GetTransactionMemo_System_String_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.WalletProxy.GetTransactionMemo(System.String%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/WalletProxy.cs/#L853">View Source</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_WalletProxy_GetTransactionMemo_System_String_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.WalletProxy.GetTransactionMemo(System.String%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/WalletProxy.cs/#L853">View Source</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-=======
     <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/WalletProxy.cs/#L837">View Source</a>
->>>>>>> main
   </span>
   <a id="chia_dotnet_WalletProxy_GetTransactionMemo_" data-uid="chia.dotnet.WalletProxy.GetTransactionMemo*"></a>
   <h4 id="chia_dotnet_WalletProxy_GetTransactionMemo_System_String_System_Threading_CancellationToken_" data-uid="chia.dotnet.WalletProxy.GetTransactionMemo(System.String,System.Threading.CancellationToken)">GetTransactionMemo(String, CancellationToken)</h4>
@@ -3268,34 +2385,10 @@ <h5 class="returns">Returns</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_WalletProxy_GetWalletBalances_System_Collections_Generic_IEnumerable_System_UInt32__System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.WalletProxy.GetWalletBalances(System.Collections.Generic.IEnumerable%7BSystem.UInt32%7D%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
   </span>
   <span class="small pull-right mobile-hide">
-<<<<<<< HEAD
-    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/WalletProxy.cs/#L868">View Source</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_WalletProxy_GetWalletBalances_System_Collections_Generic_IEnumerable_System_UInt32__System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.WalletProxy.GetWalletBalances(System.Collections.Generic.IEnumerable%7BSystem.UInt32%7D%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/WalletProxy.cs/#L868">View Source</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_WalletProxy_GetWalletBalances_System_Collections_Generic_IEnumerable_System_UInt32__System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.WalletProxy.GetWalletBalances(System.Collections.Generic.IEnumerable%7BSystem.UInt32%7D%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/WalletProxy.cs/#L868">View Source</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-=======
     <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/WalletProxy.cs/#L852">View Source</a>
->>>>>>> main
   </span>
   <a id="chia_dotnet_WalletProxy_GetWalletBalances_" data-uid="chia.dotnet.WalletProxy.GetWalletBalances*"></a>
   <h4 id="chia_dotnet_WalletProxy_GetWalletBalances_System_Collections_Generic_IEnumerable_System_UInt32__System_Threading_CancellationToken_" data-uid="chia.dotnet.WalletProxy.GetWalletBalances(System.Collections.Generic.IEnumerable{System.UInt32},System.Threading.CancellationToken)">GetWalletBalances(IEnumerable&lt;UInt32&gt;, CancellationToken)</h4>
@@ -3347,30 +2440,10 @@ <h5 class="returns">Returns</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_WalletProxy_GetWallets_chia_dotnet_WalletType_System_Boolean_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.WalletProxy.GetWallets(chia.dotnet.WalletType%2CSystem.Boolean%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
   </span>
   <span class="small pull-right mobile-hide">
     <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/WalletProxy.cs/#L84">View Source</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_WalletProxy_GetWallets_chia_dotnet_WalletType_System_Boolean_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.WalletProxy.GetWallets(chia.dotnet.WalletType%2CSystem.Boolean%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/WalletProxy.cs/#L84">View Source</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_WalletProxy_GetWallets_chia_dotnet_WalletType_System_Boolean_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.WalletProxy.GetWallets(chia.dotnet.WalletType%2CSystem.Boolean%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/WalletProxy.cs/#L84">View Source</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <a id="chia_dotnet_WalletProxy_GetWallets_" data-uid="chia.dotnet.WalletProxy.GetWallets*"></a>
   <h4 id="chia_dotnet_WalletProxy_GetWallets_chia_dotnet_WalletType_System_Boolean_System_Threading_CancellationToken_" data-uid="chia.dotnet.WalletProxy.GetWallets(chia.dotnet.WalletType,System.Boolean,System.Threading.CancellationToken)">GetWallets(WalletType, Boolean, CancellationToken)</h4>
@@ -3428,15 +2501,6 @@ <h5 class="returns">Returns</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_WalletProxy_GetWallets_System_Boolean_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.WalletProxy.GetWallets(System.Boolean%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/WalletProxy.cs/#L68">View Source</a>
-=======
-=======
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_WalletProxy_GetWallets_System_Boolean_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.WalletProxy.GetWallets(System.Boolean%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
   </span>
   <span class="small pull-right mobile-hide">
@@ -3495,185 +2559,7 @@ <h5 class="returns">Returns</h5>
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_WalletProxy_GetWalletsWithDIDs_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.WalletProxy.GetWalletsWithDIDs(System.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
   </span>
   <span class="small pull-right mobile-hide">
-<<<<<<< HEAD
-    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/WalletProxy.cs/#L400">View Source</a>
-<<<<<<< HEAD
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-=======
-=======
-<<<<<<< HEAD
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_WalletProxy_GetWallets_System_Boolean_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.WalletProxy.GetWallets(System.Boolean%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/WalletProxy.cs/#L68">View Source</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_WalletProxy_GetWallets_System_Boolean_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.WalletProxy.GetWallets(System.Boolean%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/WalletProxy.cs/#L68">View Source</a>
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-  </span>
-  <a id="chia_dotnet_WalletProxy_GetWallets_" data-uid="chia.dotnet.WalletProxy.GetWallets*"></a>
-  <h4 id="chia_dotnet_WalletProxy_GetWallets_System_Boolean_System_Threading_CancellationToken_" data-uid="chia.dotnet.WalletProxy.GetWallets(System.Boolean,System.Threading.CancellationToken)">GetWallets(Boolean, CancellationToken)</h4>
-  <div class="markdown level1 summary"><p>Get the list of wallets</p>
-</div>
-  <div class="markdown level1 conceptual"></div>
-  <h5 class="decalaration">Declaration</h5>
-  <div class="codewrapper">
-<<<<<<< HEAD
-<<<<<<< HEAD
-    <pre><code class="lang-csharp hljs">public async Task&lt;(IEnumerable&lt;WalletInfo&gt; Wallets, uint Fingerprint)&gt; GetWallets(bool includeData = true, CancellationToken cancellationToken = default(CancellationToken))</code></pre>
-=======
-    <pre><code class="lang-csharp hljs">public async Task&lt;IEnumerable&lt;(uint WalletId, string DIDId, uint DIDWalletID)&gt;&gt; GetWalletsWithDIDs(CancellationToken cancellationToken = default(CancellationToken))</code></pre>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-=======
-    <pre><code class="lang-csharp hljs">public async Task&lt;IEnumerable&lt;(uint WalletId, string DIDId, uint DIDWalletID)&gt;&gt; GetWalletsWithDIDs(CancellationToken cancellationToken = default(CancellationToken))</code></pre>
-=======
-    <pre><code class="lang-csharp hljs">public async Task&lt;(IEnumerable&lt;WalletInfo&gt; Wallets, uint Fingerprint)&gt; GetWallets(bool includeData = true, CancellationToken cancellationToken = default(CancellationToken))</code></pre>
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-  </div>
-  <h5 class="parameters">Parameters</h5>
-  <table class="table table-bordered table-striped table-condensed">
-    <thead>
-      <tr>
-        <th>Type</th>
-        <th>Name</th>
-        <th>Description</th>
-      </tr>
-    </thead>
-    <tbody>
-      <tr>
-        <td><a class="xref" href="https://learn.microsoft.com/dotnet/api/system.boolean">Boolean</a></td>
-        <td><span class="parametername">includeData</span></td>
-        <td></td>
-      </tr>
-      <tr>
-        <td><a class="xref" href="https://learn.microsoft.com/dotnet/api/system.threading.cancellationtoken">CancellationToken</a></td>
-        <td><span class="parametername">cancellationToken</span></td>
-        <td><p>A token to allow the call to be cancelled</p>
-</td>
-      </tr>
-    </tbody>
-  </table>
-  <h5 class="returns">Returns</h5>
-  <table class="table table-bordered table-striped table-condensed">
-    <thead>
-      <tr>
-        <th>Type</th>
-        <th>Description</th>
-      </tr>
-    </thead>
-    <tbody>
-      <tr>
-<<<<<<< HEAD
-<<<<<<< HEAD
-        <td><a class="xref" href="https://learn.microsoft.com/dotnet/api/system.threading.tasks.task-1">Task</a>&lt;<a class="xref" href="https://learn.microsoft.com/dotnet/api/system.valuetuple-2">(T1, T2)</a>&lt;<a class="xref" href="https://learn.microsoft.com/dotnet/api/system.collections.generic.ienumerable-1">IEnumerable</a>&lt;<a class="xref" href="chia.dotnet.WalletInfo.html">WalletInfo</a>&gt;, <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.uint32">UInt32</a>&gt;&gt;</td>
-=======
-        <td><a class="xref" href="https://learn.microsoft.com/dotnet/api/system.threading.tasks.task-1">Task</a>&lt;<a class="xref" href="https://learn.microsoft.com/dotnet/api/system.collections.generic.ienumerable-1">IEnumerable</a>&lt;<a class="xref" href="https://learn.microsoft.com/dotnet/api/system.valuetuple-3">(T1, T2, T3)</a>&lt;<a class="xref" href="https://learn.microsoft.com/dotnet/api/system.uint32">UInt32</a>, <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.string">String</a>, <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.uint32">UInt32</a>&gt;&gt;&gt;</td>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-=======
-        <td><a class="xref" href="https://learn.microsoft.com/dotnet/api/system.threading.tasks.task-1">Task</a>&lt;<a class="xref" href="https://learn.microsoft.com/dotnet/api/system.collections.generic.ienumerable-1">IEnumerable</a>&lt;<a class="xref" href="https://learn.microsoft.com/dotnet/api/system.valuetuple-3">(T1, T2, T3)</a>&lt;<a class="xref" href="https://learn.microsoft.com/dotnet/api/system.uint32">UInt32</a>, <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.string">String</a>, <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.uint32">UInt32</a>&gt;&gt;&gt;</td>
-=======
-        <td><a class="xref" href="https://learn.microsoft.com/dotnet/api/system.threading.tasks.task-1">Task</a>&lt;<a class="xref" href="https://learn.microsoft.com/dotnet/api/system.valuetuple-2">(T1, T2)</a>&lt;<a class="xref" href="https://learn.microsoft.com/dotnet/api/system.collections.generic.ienumerable-1">IEnumerable</a>&lt;<a class="xref" href="chia.dotnet.WalletInfo.html">WalletInfo</a>&gt;, <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.uint32">UInt32</a>&gt;&gt;</td>
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-        <td><p>The list of wallets</p>
-</td>
-      </tr>
-    </tbody>
-  </table>
-  <span class="small pull-right mobile-hide">
-    <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_WalletProxy_LogIn_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.WalletProxy.LogIn(System.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_WalletProxy_GetWalletsWithDIDs_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.WalletProxy.GetWalletsWithDIDs(System.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/WalletProxy.cs/#L400">View Source</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-  </span>
-  <a id="chia_dotnet_WalletProxy_GetWallets_" data-uid="chia.dotnet.WalletProxy.GetWallets*"></a>
-  <h4 id="chia_dotnet_WalletProxy_GetWallets_System_Boolean_System_Threading_CancellationToken_" data-uid="chia.dotnet.WalletProxy.GetWallets(System.Boolean,System.Threading.CancellationToken)">GetWallets(Boolean, CancellationToken)</h4>
-  <div class="markdown level1 summary"><p>Get the list of wallets</p>
-</div>
-  <div class="markdown level1 conceptual"></div>
-  <h5 class="decalaration">Declaration</h5>
-  <div class="codewrapper">
-<<<<<<< HEAD
-    <pre><code class="lang-csharp hljs">public async Task&lt;uint&gt; LogIn(CancellationToken cancellationToken = default(CancellationToken))</code></pre>
-  </div>
-  <h5 class="parameters">Parameters</h5>
-  <table class="table table-bordered table-striped table-condensed">
-=======
-<<<<<<< HEAD
-    <pre><code class="lang-csharp hljs">public async Task&lt;(IEnumerable&lt;WalletInfo&gt; Wallets, uint Fingerprint)&gt; GetWallets(bool includeData = true, CancellationToken cancellationToken = default(CancellationToken))</code></pre>
-=======
-    <pre><code class="lang-csharp hljs">public async Task&lt;IEnumerable&lt;(uint WalletId, string DIDId, uint DIDWalletID)&gt;&gt; GetWalletsWithDIDs(CancellationToken cancellationToken = default(CancellationToken))</code></pre>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-  </div>
-  <h5 class="parameters">Parameters</h5>
-  <table class="table table-bordered table-striped table-condensed">
-    <thead>
-      <tr>
-        <th>Type</th>
-        <th>Name</th>
-        <th>Description</th>
-      </tr>
-    </thead>
-    <tbody>
-      <tr>
-        <td><a class="xref" href="https://learn.microsoft.com/dotnet/api/system.boolean">Boolean</a></td>
-        <td><span class="parametername">includeData</span></td>
-        <td></td>
-      </tr>
-      <tr>
-        <td><a class="xref" href="https://learn.microsoft.com/dotnet/api/system.threading.cancellationtoken">CancellationToken</a></td>
-        <td><span class="parametername">cancellationToken</span></td>
-        <td><p>A token to allow the call to be cancelled</p>
-</td>
-      </tr>
-    </tbody>
-  </table>
-  <h5 class="returns">Returns</h5>
-  <table class="table table-bordered table-striped table-condensed">
-    <thead>
-      <tr>
-        <th>Type</th>
-        <th>Description</th>
-      </tr>
-    </thead>
-    <tbody>
-      <tr>
-<<<<<<< HEAD
-        <td><a class="xref" href="https://learn.microsoft.com/dotnet/api/system.threading.tasks.task-1">Task</a>&lt;<a class="xref" href="https://learn.microsoft.com/dotnet/api/system.valuetuple-2">(T1, T2)</a>&lt;<a class="xref" href="https://learn.microsoft.com/dotnet/api/system.collections.generic.ienumerable-1">IEnumerable</a>&lt;<a class="xref" href="chia.dotnet.WalletInfo.html">WalletInfo</a>&gt;, <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.uint32">UInt32</a>&gt;&gt;</td>
-=======
-        <td><a class="xref" href="https://learn.microsoft.com/dotnet/api/system.threading.tasks.task-1">Task</a>&lt;<a class="xref" href="https://learn.microsoft.com/dotnet/api/system.collections.generic.ienumerable-1">IEnumerable</a>&lt;<a class="xref" href="https://learn.microsoft.com/dotnet/api/system.valuetuple-3">(T1, T2, T3)</a>&lt;<a class="xref" href="https://learn.microsoft.com/dotnet/api/system.uint32">UInt32</a>, <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.string">String</a>, <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.uint32">UInt32</a>&gt;&gt;&gt;</td>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-        <td><p>The list of wallets</p>
-</td>
-      </tr>
-    </tbody>
-  </table>
-  <span class="small pull-right mobile-hide">
-    <span class="divider">|</span>
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_WalletProxy_GetWalletsWithDIDs_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.WalletProxy.GetWalletsWithDIDs(System.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_WalletProxy_LogIn_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.WalletProxy.LogIn(System.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/WalletProxy.cs/#L400">View Source</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/WalletProxy.cs/#L392">View Source</a>
->>>>>>> main
   </span>
   <a id="chia_dotnet_WalletProxy_GetWalletsWithDIDs_" data-uid="chia.dotnet.WalletProxy.GetWalletsWithDIDs*"></a>
   <h4 id="chia_dotnet_WalletProxy_GetWalletsWithDIDs_System_Threading_CancellationToken_" data-uid="chia.dotnet.WalletProxy.GetWalletsWithDIDs(System.Threading.CancellationToken)">GetWalletsWithDIDs(CancellationToken)</h4>
@@ -3682,15 +2568,10 @@ <h4 id="chia_dotnet_WalletProxy_GetWalletsWithDIDs_System_Threading_Cancellation
   <div class="markdown level1 conceptual"></div>
   <h5 class="decalaration">Declaration</h5>
   <div class="codewrapper">
-<<<<<<< HEAD
     <pre><code class="lang-csharp hljs">public async Task&lt;IEnumerable&lt;(uint WalletId, string DIDId, uint DIDWalletID)&gt;&gt; GetWalletsWithDIDs(CancellationToken cancellationToken = default(CancellationToken))</code></pre>
-=======
-    <pre><code class="lang-csharp hljs">public async Task&lt;uint&gt; LogIn(CancellationToken cancellationToken = default(CancellationToken))</code></pre>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
   </div>
   <h5 class="parameters">Parameters</h5>
   <table class="table table-bordered table-striped table-condensed">
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
     <thead>
       <tr>
         <th>Type</th>
@@ -3717,83 +2598,27 @@ <h5 class="returns">Returns</h5>
     </thead>
     <tbody>
       <tr>
-<<<<<<< HEAD
-<<<<<<< HEAD
-        <td><a class="xref" href="https://learn.microsoft.com/dotnet/api/system.threading.tasks.task-1">Task</a>&lt;<a class="xref" href="https://learn.microsoft.com/dotnet/api/system.collections.generic.ienumerable-1">IEnumerable</a>&lt;<a class="xref" href="https://learn.microsoft.com/dotnet/api/system.valuetuple-3">(T1, T2, T3)</a>&lt;<a class="xref" href="https://learn.microsoft.com/dotnet/api/system.uint32">UInt32</a>, <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.string">String</a>, <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.uint32">UInt32</a>&gt;&gt;&gt;</td>
-        <td><p>The list of wallets</p>
-=======
-=======
-=======
-<<<<<<< HEAD
         <td><a class="xref" href="https://learn.microsoft.com/dotnet/api/system.threading.tasks.task-1">Task</a>&lt;<a class="xref" href="https://learn.microsoft.com/dotnet/api/system.collections.generic.ienumerable-1">IEnumerable</a>&lt;<a class="xref" href="https://learn.microsoft.com/dotnet/api/system.valuetuple-3">(T1, T2, T3)</a>&lt;<a class="xref" href="https://learn.microsoft.com/dotnet/api/system.uint32">UInt32</a>, <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.string">String</a>, <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.uint32">UInt32</a>&gt;&gt;&gt;</td>
         <td><p>The list of wallets</p>
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-        <td><a class="xref" href="https://learn.microsoft.com/dotnet/api/system.threading.tasks.task-1">Task</a>&lt;<a class="xref" href="https://learn.microsoft.com/dotnet/api/system.uint32">UInt32</a>&gt;</td>
-        <td><p>The key fingerprint</p>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
 </td>
       </tr>
     </tbody>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_WalletProxy_LogIn_System_UInt32_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.WalletProxy.LogIn(System.UInt32%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_WalletProxy_LogIn_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.WalletProxy.LogIn(System.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_WalletProxy_LogIn_System_UInt32_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.WalletProxy.LogIn(System.UInt32%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
+    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_WalletProxy_LogIn_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.WalletProxy.LogIn(System.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/WalletProxy.cs/#L37">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/WalletProxy.cs/#L37">View Source</a>
   </span>
   <a id="chia_dotnet_WalletProxy_LogIn_" data-uid="chia.dotnet.WalletProxy.LogIn*"></a>
-<<<<<<< HEAD
-<<<<<<< HEAD
-  <h4 id="chia_dotnet_WalletProxy_LogIn_System_Threading_CancellationToken_" data-uid="chia.dotnet.WalletProxy.LogIn(System.Threading.CancellationToken)">LogIn(CancellationToken)</h4>
-  <div class="markdown level1 summary"><p>Sets the first key to active.</p>
-=======
-=======
-=======
-<<<<<<< HEAD
   <h4 id="chia_dotnet_WalletProxy_LogIn_System_Threading_CancellationToken_" data-uid="chia.dotnet.WalletProxy.LogIn(System.Threading.CancellationToken)">LogIn(CancellationToken)</h4>
   <div class="markdown level1 summary"><p>Sets the first key to active.</p>
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-  <h4 id="chia_dotnet_WalletProxy_LogIn_System_UInt32_System_Threading_CancellationToken_" data-uid="chia.dotnet.WalletProxy.LogIn(System.UInt32,System.Threading.CancellationToken)">LogIn(UInt32, CancellationToken)</h4>
-  <div class="markdown level1 summary"><p>Sets a key to active.</p>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
 </div>
   <div class="markdown level1 conceptual"></div>
   <h5 class="decalaration">Declaration</h5>
   <div class="codewrapper">
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <pre><code class="lang-csharp hljs">public async Task&lt;uint&gt; LogIn(uint fingerprint, CancellationToken cancellationToken = default(CancellationToken))</code></pre>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
     <pre><code class="lang-csharp hljs">public async Task&lt;uint&gt; LogIn(CancellationToken cancellationToken = default(CancellationToken))</code></pre>
-=======
-    <pre><code class="lang-csharp hljs">public async Task&lt;uint&gt; LogIn(uint fingerprint, CancellationToken cancellationToken = default(CancellationToken))</code></pre>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </div>
   <h5 class="parameters">Parameters</h5>
   <table class="table table-bordered table-striped table-condensed">
@@ -3806,12 +2631,6 @@ <h5 class="parameters">Parameters</h5>
     </thead>
     <tbody>
       <tr>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
         <td><a class="xref" href="https://learn.microsoft.com/dotnet/api/system.threading.cancellationtoken">CancellationToken</a></td>
         <td><span class="parametername">cancellationToken</span></td>
         <td><p>A token to allow the call to be cancelled</p>
@@ -3837,10 +2656,10 @@ <h5 class="returns">Returns</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_WalletProxy_LogIn_System_UInt32_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.WalletProxy.LogIn(System.UInt32%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
+    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_WalletProxy_LogIn_System_UInt32_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.WalletProxy.LogIn(System.UInt32%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/WalletProxy.cs/#L52">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/WalletProxy.cs/#L52">View Source</a>
   </span>
   <a id="chia_dotnet_WalletProxy_LogIn_" data-uid="chia.dotnet.WalletProxy.LogIn*"></a>
   <h4 id="chia_dotnet_WalletProxy_LogIn_System_UInt32_System_Threading_CancellationToken_" data-uid="chia.dotnet.WalletProxy.LogIn(System.UInt32,System.Threading.CancellationToken)">LogIn(UInt32, CancellationToken)</h4>
@@ -3862,12 +2681,6 @@ <h5 class="parameters">Parameters</h5>
     </thead>
     <tbody>
       <tr>
-=======
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
         <td><a class="xref" href="https://learn.microsoft.com/dotnet/api/system.uint32">UInt32</a></td>
         <td><span class="parametername">fingerprint</span></td>
         <td><p>The fingerprint</p>
@@ -3899,34 +2712,10 @@ <h5 class="returns">Returns</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_WalletProxy_NftSetDidBulk_System_String_System_Collections_Generic_IEnumerable_chia_dotnet_NftCoinInfo__System_Nullable_System_Boolean__System_UInt64_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.WalletProxy.NftSetDidBulk(System.String%2CSystem.Collections.Generic.IEnumerable%7Bchia.dotnet.NftCoinInfo%7D%2CSystem.Nullable%7BSystem.Boolean%7D%2CSystem.UInt64%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
   </span>
   <span class="small pull-right mobile-hide">
-<<<<<<< HEAD
-    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/WalletProxy.cs/#L766">View Source</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_WalletProxy_NftSetDidBulk_System_String_System_Collections_Generic_IEnumerable_chia_dotnet_NftCoinInfo__System_Nullable_System_Boolean__System_UInt64_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.WalletProxy.NftSetDidBulk(System.String%2CSystem.Collections.Generic.IEnumerable%7Bchia.dotnet.NftCoinInfo%7D%2CSystem.Nullable%7BSystem.Boolean%7D%2CSystem.UInt64%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/WalletProxy.cs/#L766">View Source</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_WalletProxy_NftSetDidBulk_System_String_System_Collections_Generic_IEnumerable_chia_dotnet_NftCoinInfo__System_Nullable_System_Boolean__System_UInt64_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.WalletProxy.NftSetDidBulk(System.String%2CSystem.Collections.Generic.IEnumerable%7Bchia.dotnet.NftCoinInfo%7D%2CSystem.Nullable%7BSystem.Boolean%7D%2CSystem.UInt64%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/WalletProxy.cs/#L766">View Source</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-=======
     <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/WalletProxy.cs/#L750">View Source</a>
->>>>>>> main
   </span>
   <a id="chia_dotnet_WalletProxy_NftSetDidBulk_" data-uid="chia.dotnet.WalletProxy.NftSetDidBulk*"></a>
   <h4 id="chia_dotnet_WalletProxy_NftSetDidBulk_System_String_System_Collections_Generic_IEnumerable_chia_dotnet_NftCoinInfo__System_Nullable_System_Boolean__System_UInt64_System_Threading_CancellationToken_" data-uid="chia.dotnet.WalletProxy.NftSetDidBulk(System.String,System.Collections.Generic.IEnumerable{chia.dotnet.NftCoinInfo},System.Nullable{System.Boolean},System.UInt64,System.Threading.CancellationToken)">NftSetDidBulk(String, IEnumerable&lt;NftCoinInfo&gt;, Nullable&lt;Boolean&gt;, UInt64, CancellationToken)</h4>
@@ -3994,34 +2783,10 @@ <h5 class="returns">Returns</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_WalletProxy_NftTransferBulk_System_String_System_Collections_Generic_IEnumerable_chia_dotnet_NftCoinInfo__System_Nullable_System_Boolean__System_UInt64_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.WalletProxy.NftTransferBulk(System.String%2CSystem.Collections.Generic.IEnumerable%7Bchia.dotnet.NftCoinInfo%7D%2CSystem.Nullable%7BSystem.Boolean%7D%2CSystem.UInt64%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-<<<<<<< HEAD
-    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/WalletProxy.cs/#L786">View Source</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_WalletProxy_NftTransferBulk_System_String_System_Collections_Generic_IEnumerable_chia_dotnet_NftCoinInfo__System_Nullable_System_Boolean__System_UInt64_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.WalletProxy.NftTransferBulk(System.String%2CSystem.Collections.Generic.IEnumerable%7Bchia.dotnet.NftCoinInfo%7D%2CSystem.Nullable%7BSystem.Boolean%7D%2CSystem.UInt64%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/WalletProxy.cs/#L786">View Source</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_WalletProxy_NftTransferBulk_System_String_System_Collections_Generic_IEnumerable_chia_dotnet_NftCoinInfo__System_Nullable_System_Boolean__System_UInt64_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.WalletProxy.NftTransferBulk(System.String%2CSystem.Collections.Generic.IEnumerable%7Bchia.dotnet.NftCoinInfo%7D%2CSystem.Nullable%7BSystem.Boolean%7D%2CSystem.UInt64%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/WalletProxy.cs/#L786">View Source</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-=======
     <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/WalletProxy.cs/#L770">View Source</a>
->>>>>>> main
   </span>
   <a id="chia_dotnet_WalletProxy_NftTransferBulk_" data-uid="chia.dotnet.WalletProxy.NftTransferBulk*"></a>
   <h4 id="chia_dotnet_WalletProxy_NftTransferBulk_System_String_System_Collections_Generic_IEnumerable_chia_dotnet_NftCoinInfo__System_Nullable_System_Boolean__System_UInt64_System_Threading_CancellationToken_" data-uid="chia.dotnet.WalletProxy.NftTransferBulk(System.String,System.Collections.Generic.IEnumerable{chia.dotnet.NftCoinInfo},System.Nullable{System.Boolean},System.UInt64,System.Threading.CancellationToken)">NftTransferBulk(String, IEnumerable&lt;NftCoinInfo&gt;, Nullable&lt;Boolean&gt;, UInt64, CancellationToken)</h4>
@@ -4089,34 +2854,10 @@ <h5 class="returns">Returns</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_WalletProxy_PushTransactions_System_Collections_Generic_IEnumerable_chia_dotnet_TransactionRecord__System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.WalletProxy.PushTransactions(System.Collections.Generic.IEnumerable%7Bchia.dotnet.TransactionRecord%7D%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
   </span>
   <span class="small pull-right mobile-hide">
-<<<<<<< HEAD
-    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/WalletProxy.cs/#L216">View Source</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_WalletProxy_PushTransactions_System_Collections_Generic_IEnumerable_chia_dotnet_TransactionRecord__System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.WalletProxy.PushTransactions(System.Collections.Generic.IEnumerable%7Bchia.dotnet.TransactionRecord%7D%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/WalletProxy.cs/#L216">View Source</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_WalletProxy_PushTransactions_System_Collections_Generic_IEnumerable_chia_dotnet_TransactionRecord__System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.WalletProxy.PushTransactions(System.Collections.Generic.IEnumerable%7Bchia.dotnet.TransactionRecord%7D%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/WalletProxy.cs/#L216">View Source</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-=======
     <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/WalletProxy.cs/#L214">View Source</a>
->>>>>>> main
   </span>
   <a id="chia_dotnet_WalletProxy_PushTransactions_" data-uid="chia.dotnet.WalletProxy.PushTransactions*"></a>
   <h4 id="chia_dotnet_WalletProxy_PushTransactions_System_Collections_Generic_IEnumerable_chia_dotnet_TransactionRecord__System_Threading_CancellationToken_" data-uid="chia.dotnet.WalletProxy.PushTransactions(System.Collections.Generic.IEnumerable{chia.dotnet.TransactionRecord},System.Threading.CancellationToken)">PushTransactions(IEnumerable&lt;TransactionRecord&gt;, CancellationToken)</h4>
@@ -4168,34 +2909,10 @@ <h5 class="returns">Returns</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_WalletProxy_PushTx_chia_dotnet_SpendBundle_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.WalletProxy.PushTx(chia.dotnet.SpendBundle%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
   </span>
   <span class="small pull-right mobile-hide">
-<<<<<<< HEAD
-    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/WalletProxy.cs/#L195">View Source</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_WalletProxy_PushTx_chia_dotnet_SpendBundle_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.WalletProxy.PushTx(chia.dotnet.SpendBundle%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/WalletProxy.cs/#L195">View Source</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_WalletProxy_PushTx_chia_dotnet_SpendBundle_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.WalletProxy.PushTx(chia.dotnet.SpendBundle%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/WalletProxy.cs/#L195">View Source</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-=======
     <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/WalletProxy.cs/#L193">View Source</a>
->>>>>>> main
   </span>
   <a id="chia_dotnet_WalletProxy_PushTx_" data-uid="chia.dotnet.WalletProxy.PushTx*"></a>
   <h4 id="chia_dotnet_WalletProxy_PushTx_chia_dotnet_SpendBundle_System_Threading_CancellationToken_" data-uid="chia.dotnet.WalletProxy.PushTx(chia.dotnet.SpendBundle,System.Threading.CancellationToken)">PushTx(SpendBundle, CancellationToken)</h4>
@@ -4248,34 +2965,10 @@ <h5 class="returns">Returns</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_WalletProxy_RecoverDIDWallet_System_String_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.WalletProxy.RecoverDIDWallet(System.String%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-<<<<<<< HEAD
-    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/WalletProxy.cs/#L498">View Source</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_WalletProxy_RecoverDIDWallet_System_String_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.WalletProxy.RecoverDIDWallet(System.String%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/WalletProxy.cs/#L498">View Source</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_WalletProxy_RecoverDIDWallet_System_String_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.WalletProxy.RecoverDIDWallet(System.String%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/WalletProxy.cs/#L498">View Source</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-=======
     <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/WalletProxy.cs/#L490">View Source</a>
->>>>>>> main
   </span>
   <a id="chia_dotnet_WalletProxy_RecoverDIDWallet_" data-uid="chia.dotnet.WalletProxy.RecoverDIDWallet*"></a>
   <h4 id="chia_dotnet_WalletProxy_RecoverDIDWallet_System_String_System_Threading_CancellationToken_" data-uid="chia.dotnet.WalletProxy.RecoverDIDWallet(System.String,System.Threading.CancellationToken)">RecoverDIDWallet(String, CancellationToken)</h4>
@@ -4327,34 +3020,10 @@ <h5 class="returns">Returns</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_WalletProxy_SendNotification_System_UInt64_System_String_System_String_System_UInt64_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.WalletProxy.SendNotification(System.UInt64%2CSystem.String%2CSystem.String%2CSystem.UInt64%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
   </span>
   <span class="small pull-right mobile-hide">
-<<<<<<< HEAD
-    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/WalletProxy.cs/#L897">View Source</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_WalletProxy_SendNotification_System_UInt64_System_String_System_String_System_UInt64_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.WalletProxy.SendNotification(System.UInt64%2CSystem.String%2CSystem.String%2CSystem.UInt64%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/WalletProxy.cs/#L897">View Source</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_WalletProxy_SendNotification_System_UInt64_System_String_System_String_System_UInt64_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.WalletProxy.SendNotification(System.UInt64%2CSystem.String%2CSystem.String%2CSystem.UInt64%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/WalletProxy.cs/#L897">View Source</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-=======
     <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/WalletProxy.cs/#L881">View Source</a>
->>>>>>> main
   </span>
   <a id="chia_dotnet_WalletProxy_SendNotification_" data-uid="chia.dotnet.WalletProxy.SendNotification*"></a>
   <h4 id="chia_dotnet_WalletProxy_SendNotification_System_UInt64_System_String_System_String_System_UInt64_System_Threading_CancellationToken_" data-uid="chia.dotnet.WalletProxy.SendNotification(System.UInt64,System.String,System.String,System.UInt64,System.Threading.CancellationToken)">SendNotification(UInt64, String, String, UInt64, CancellationToken)</h4>
@@ -4423,37 +3092,10 @@ <h5 class="returns">Returns</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_WalletProxy_SetAutoClaim_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.WalletProxy.SetAutoClaim(System.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/WalletProxy.cs/#L1053">View Source</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_WalletProxy_SetAutoClaim_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.WalletProxy.SetAutoClaim(System.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/WalletProxy.cs/#L1053">View Source</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_WalletProxy_SetAutoClaim_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.WalletProxy.SetAutoClaim(System.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/WalletProxy.cs/#L1053">View Source</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_WalletProxy_SetAutoClaim_System_Boolean_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.WalletProxy.SetAutoClaim(System.Boolean%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
   </span>
   <span class="small pull-right mobile-hide">
     <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/WalletProxy.cs/#L1037">View Source</a>
->>>>>>> main
   </span>
   <a id="chia_dotnet_WalletProxy_SetAutoClaim_" data-uid="chia.dotnet.WalletProxy.SetAutoClaim*"></a>
   <h4 id="chia_dotnet_WalletProxy_SetAutoClaim_System_Boolean_System_Threading_CancellationToken_" data-uid="chia.dotnet.WalletProxy.SetAutoClaim(System.Boolean,System.Threading.CancellationToken)">SetAutoClaim(Boolean, CancellationToken)</h4>
@@ -4475,94 +3117,6 @@ <h5 class="parameters">Parameters</h5>
     </thead>
     <tbody>
       <tr>
-<<<<<<< HEAD
-        <td><a class="xref" href="https://learn.microsoft.com/dotnet/api/system.threading.cancellationtoken">CancellationToken</a></td>
-        <td><span class="parametername">cancellationToken</span></td>
-        <td><p>A token to allow the call to be cancelled</p>
-</td>
-      </tr>
-    </tbody>
-  </table>
-  <h5 class="returns">Returns</h5>
-  <table class="table table-bordered table-striped table-condensed">
-    <thead>
-      <tr>
-        <th>Type</th>
-        <th>Description</th>
-      </tr>
-    </thead>
-    <tbody>
-      <tr>
-        <td><a class="xref" href="https://learn.microsoft.com/dotnet/api/system.threading.tasks.task-1">Task</a>&lt;<a class="xref" href="chia.dotnet.AutoClaimSettings.html">AutoClaimSettings</a>&gt;</td>
-        <td><p><a class="xref" href="chia.dotnet.AutoClaimSettings.html">AutoClaimSettings</a></p>
-</td>
-      </tr>
-    </tbody>
-  </table>
-  <span class="small pull-right mobile-hide">
-    <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_WalletProxy_SetAutoClaim_System_UInt16_System_UInt64_System_UInt64_System_Boolean_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.WalletProxy.SetAutoClaim(System.UInt16%2CSystem.UInt64%2CSystem.UInt64%2CSystem.Boolean%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/WalletProxy.cs/#L1067">View Source</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_WalletProxy_SetAutoClaim_System_UInt16_System_UInt64_System_UInt64_System_Boolean_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.WalletProxy.SetAutoClaim(System.UInt16%2CSystem.UInt64%2CSystem.UInt64%2CSystem.Boolean%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/WalletProxy.cs/#L1067">View Source</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_WalletProxy_SetAutoClaim_System_UInt16_System_UInt64_System_UInt64_System_Boolean_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.WalletProxy.SetAutoClaim(System.UInt16%2CSystem.UInt64%2CSystem.UInt64%2CSystem.Boolean%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/WalletProxy.cs/#L1067">View Source</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-  </span>
-  <a id="chia_dotnet_WalletProxy_SetAutoClaim_" data-uid="chia.dotnet.WalletProxy.SetAutoClaim*"></a>
-  <h4 id="chia_dotnet_WalletProxy_SetAutoClaim_System_UInt16_System_UInt64_System_UInt64_System_Boolean_System_Threading_CancellationToken_" data-uid="chia.dotnet.WalletProxy.SetAutoClaim(System.UInt16,System.UInt64,System.UInt64,System.Boolean,System.Threading.CancellationToken)">SetAutoClaim(UInt16, UInt64, UInt64, Boolean, CancellationToken)</h4>
-  <div class="markdown level1 summary"><p>Set auto claim merkle coins config</p>
-</div>
-  <div class="markdown level1 conceptual"></div>
-  <h5 class="decalaration">Declaration</h5>
-  <div class="codewrapper">
-    <pre><code class="lang-csharp hljs">public async Task&lt;AutoClaimSettings&gt; SetAutoClaim(ushort batchSize = 50, ulong minAmount = 0UL, ulong txFee = 0UL, bool enabled = false, CancellationToken cancellationToken = default(CancellationToken))</code></pre>
-  </div>
-  <h5 class="parameters">Parameters</h5>
-  <table class="table table-bordered table-striped table-condensed">
-    <thead>
-      <tr>
-        <th>Type</th>
-        <th>Name</th>
-        <th>Description</th>
-      </tr>
-    </thead>
-    <tbody>
-      <tr>
-        <td><a class="xref" href="https://learn.microsoft.com/dotnet/api/system.uint16">UInt16</a></td>
-        <td><span class="parametername">batchSize</span></td>
-        <td></td>
-      </tr>
-      <tr>
-        <td><a class="xref" href="https://learn.microsoft.com/dotnet/api/system.uint64">UInt64</a></td>
-        <td><span class="parametername">minAmount</span></td>
-        <td></td>
-      </tr>
-      <tr>
-        <td><a class="xref" href="https://learn.microsoft.com/dotnet/api/system.uint64">UInt64</a></td>
-        <td><span class="parametername">txFee</span></td>
-        <td></td>
-      </tr>
-      <tr>
-=======
->>>>>>> main
         <td><a class="xref" href="https://learn.microsoft.com/dotnet/api/system.boolean">Boolean</a></td>
         <td><span class="parametername">enabled</span></td>
         <td></td>
@@ -4593,32 +3147,6 @@ <h5 class="returns">Returns</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_WalletProxy_SetWalletResyncOnStartup_System_Boolean_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.WalletProxy.SetWalletResyncOnStartup(System.Boolean%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/WalletProxy.cs/#L1040">View Source</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_WalletProxy_SetWalletResyncOnStartup_System_Boolean_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.WalletProxy.SetWalletResyncOnStartup(System.Boolean%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/WalletProxy.cs/#L1040">View Source</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_WalletProxy_SetWalletResyncOnStartup_System_Boolean_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.WalletProxy.SetWalletResyncOnStartup(System.Boolean%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/WalletProxy.cs/#L1040">View Source</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_WalletProxy_SetAutoClaim_System_Boolean_System_UInt16_System_UInt64_System_UInt64_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.WalletProxy.SetAutoClaim(System.Boolean%2CSystem.UInt16%2CSystem.UInt64%2CSystem.UInt64%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
   </span>
   <span class="small pull-right mobile-hide">
@@ -4693,7 +3221,6 @@ <h5 class="returns">Returns</h5>
   </span>
   <span class="small pull-right mobile-hide">
     <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/WalletProxy.cs/#L1024">View Source</a>
->>>>>>> main
   </span>
   <a id="chia_dotnet_WalletProxy_SetWalletResyncOnStartup_" data-uid="chia.dotnet.WalletProxy.SetWalletResyncOnStartup*"></a>
   <h4 id="chia_dotnet_WalletProxy_SetWalletResyncOnStartup_System_Boolean_System_Threading_CancellationToken_" data-uid="chia.dotnet.WalletProxy.SetWalletResyncOnStartup(System.Boolean,System.Threading.CancellationToken)">SetWalletResyncOnStartup(Boolean, CancellationToken)</h4>
@@ -4745,34 +3272,10 @@ <h5 class="returns">Returns</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_WalletProxy_SignMessageByAddress_System_String_System_String_System_Boolean_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.WalletProxy.SignMessageByAddress(System.String%2CSystem.String%2CSystem.Boolean%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
   </span>
   <span class="small pull-right mobile-hide">
-<<<<<<< HEAD
-    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/WalletProxy.cs/#L915">View Source</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_WalletProxy_SignMessageByAddress_System_String_System_String_System_Boolean_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.WalletProxy.SignMessageByAddress(System.String%2CSystem.String%2CSystem.Boolean%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/WalletProxy.cs/#L915">View Source</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_WalletProxy_SignMessageByAddress_System_String_System_String_System_Boolean_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.WalletProxy.SignMessageByAddress(System.String%2CSystem.String%2CSystem.Boolean%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/WalletProxy.cs/#L915">View Source</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-=======
     <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/WalletProxy.cs/#L899">View Source</a>
->>>>>>> main
   </span>
   <a id="chia_dotnet_WalletProxy_SignMessageByAddress_" data-uid="chia.dotnet.WalletProxy.SignMessageByAddress*"></a>
   <h4 id="chia_dotnet_WalletProxy_SignMessageByAddress_System_String_System_String_System_Boolean_System_Threading_CancellationToken_" data-uid="chia.dotnet.WalletProxy.SignMessageByAddress(System.String,System.String,System.Boolean,System.Threading.CancellationToken)">SignMessageByAddress(String, String, Boolean, CancellationToken)</h4>
@@ -4834,34 +3337,10 @@ <h5 class="returns">Returns</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_WalletProxy_SignMessageById_System_String_System_String_System_Boolean_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.WalletProxy.SignMessageById(System.String%2CSystem.String%2CSystem.Boolean%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-<<<<<<< HEAD
-    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/WalletProxy.cs/#L933">View Source</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_WalletProxy_SignMessageById_System_String_System_String_System_Boolean_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.WalletProxy.SignMessageById(System.String%2CSystem.String%2CSystem.Boolean%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/WalletProxy.cs/#L933">View Source</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_WalletProxy_SignMessageById_System_String_System_String_System_Boolean_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.WalletProxy.SignMessageById(System.String%2CSystem.String%2CSystem.Boolean%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/WalletProxy.cs/#L933">View Source</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-=======
     <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/WalletProxy.cs/#L917">View Source</a>
->>>>>>> main
   </span>
   <a id="chia_dotnet_WalletProxy_SignMessageById_" data-uid="chia.dotnet.WalletProxy.SignMessageById*"></a>
   <h4 id="chia_dotnet_WalletProxy_SignMessageById_System_String_System_String_System_Boolean_System_Threading_CancellationToken_" data-uid="chia.dotnet.WalletProxy.SignMessageById(System.String,System.String,System.Boolean,System.Threading.CancellationToken)">SignMessageById(String, String, Boolean, CancellationToken)</h4>
@@ -4923,34 +3402,10 @@ <h5 class="returns">Returns</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_WalletProxy_SpendClawbackCoins_System_Collections_Generic_IEnumerable_System_String__System_UInt16_System_UInt64_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.WalletProxy.SpendClawbackCoins(System.Collections.Generic.IEnumerable%7BSystem.String%7D%2CSystem.UInt16%2CSystem.UInt64%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
   </span>
   <span class="small pull-right mobile-hide">
-<<<<<<< HEAD
-    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/WalletProxy.cs/#L1095">View Source</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_WalletProxy_SpendClawbackCoins_System_Collections_Generic_IEnumerable_System_String__System_UInt16_System_UInt64_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.WalletProxy.SpendClawbackCoins(System.Collections.Generic.IEnumerable%7BSystem.String%7D%2CSystem.UInt16%2CSystem.UInt64%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/WalletProxy.cs/#L1095">View Source</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_WalletProxy_SpendClawbackCoins_System_Collections_Generic_IEnumerable_System_String__System_UInt16_System_UInt64_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.WalletProxy.SpendClawbackCoins(System.Collections.Generic.IEnumerable%7BSystem.String%7D%2CSystem.UInt16%2CSystem.UInt64%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/WalletProxy.cs/#L1095">View Source</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-=======
     <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/WalletProxy.cs/#L1082">View Source</a>
->>>>>>> main
   </span>
   <a id="chia_dotnet_WalletProxy_SpendClawbackCoins_" data-uid="chia.dotnet.WalletProxy.SpendClawbackCoins*"></a>
   <h4 id="chia_dotnet_WalletProxy_SpendClawbackCoins_System_Collections_Generic_IEnumerable_System_String__System_UInt16_System_UInt64_System_Threading_CancellationToken_" data-uid="chia.dotnet.WalletProxy.SpendClawbackCoins(System.Collections.Generic.IEnumerable{System.String},System.UInt16,System.UInt64,System.Threading.CancellationToken)">SpendClawbackCoins(IEnumerable&lt;String&gt;, UInt16, UInt64, CancellationToken)</h4>
@@ -5013,34 +3468,10 @@ <h5 class="returns">Returns</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_WalletProxy_VerifySignature_System_String_System_String_System_String_System_String_System_String_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.WalletProxy.VerifySignature(System.String%2CSystem.String%2CSystem.String%2CSystem.String%2CSystem.String%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
   </span>
   <span class="small pull-right mobile-hide">
-<<<<<<< HEAD
-    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/WalletProxy.cs/#L1008">View Source</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_WalletProxy_VerifySignature_System_String_System_String_System_String_System_String_System_String_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.WalletProxy.VerifySignature(System.String%2CSystem.String%2CSystem.String%2CSystem.String%2CSystem.String%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/WalletProxy.cs/#L1008">View Source</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_WalletProxy_VerifySignature_System_String_System_String_System_String_System_String_System_String_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.WalletProxy.VerifySignature(System.String%2CSystem.String%2CSystem.String%2CSystem.String%2CSystem.String%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/WalletProxy.cs/#L1008">View Source</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-=======
     <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/WalletProxy.cs/#L992">View Source</a>
->>>>>>> main
   </span>
   <a id="chia_dotnet_WalletProxy_VerifySignature_" data-uid="chia.dotnet.WalletProxy.VerifySignature*"></a>
   <h4 id="chia_dotnet_WalletProxy_VerifySignature_System_String_System_String_System_String_System_String_System_String_System_Threading_CancellationToken_" data-uid="chia.dotnet.WalletProxy.VerifySignature(System.String,System.String,System.String,System.String,System.String,System.Threading.CancellationToken)">VerifySignature(String, String, String, String, String, CancellationToken)</h4>
@@ -5118,24 +3549,10 @@ <h5 class="returns">Returns</h5>
               <div class="contribution">
                 <ul class="nav">
                   <li>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-                    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_WalletProxy.md&amp;value=---%0Auid%3A%20chia.dotnet.WalletProxy%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-                    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_WalletProxy.md&amp;value=---%0Auid%3A%20chia.dotnet.WalletProxy%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-=======
                     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_WalletProxy.md&amp;value=---%0Auid%3A%20chia.dotnet.WalletProxy%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
                   </li>
                   <li>
-                    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/WalletProxy.cs/#L14" class="contribution-link">View Source</a>
+                    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/WalletProxy.cs/#L14" class="contribution-link">View Source</a>
                   </li>
                 </ul>
               </div>
diff --git a/docs/api/chia.dotnet.WalletType.html b/docs/api/chia.dotnet.WalletType.html
index 842c9daf..0286da3c 100644
--- a/docs/api/chia.dotnet.WalletType.html
+++ b/docs/api/chia.dotnet.WalletType.html
@@ -154,24 +154,10 @@ <h3 id="fields">Fields
               <div class="contribution">
                 <ul class="nav">
                   <li>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
                     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_WalletType.md&amp;value=---%0Auid%3A%20chia.dotnet.WalletType%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-                    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_WalletType.md&amp;value=---%0Auid%3A%20chia.dotnet.WalletType%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-=======
-                    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_WalletType.md&amp;value=---%0Auid%3A%20chia.dotnet.WalletType%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
                   </li>
                   <li>
-                    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/ChiaTypes/WalletType.cs/#L6" class="contribution-link">View Source</a>
+                    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/ChiaTypes/WalletType.cs/#L6" class="contribution-link">View Source</a>
                   </li>
                 </ul>
               </div>
diff --git a/docs/api/chia.dotnet.WebSocketRpcClient.html b/docs/api/chia.dotnet.WebSocketRpcClient.html
index ec9ad4d0..c09acc06 100644
--- a/docs/api/chia.dotnet.WebSocketRpcClient.html
+++ b/docs/api/chia.dotnet.WebSocketRpcClient.html
@@ -94,21 +94,7 @@ <h5>Inherited Members</h5>
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object)">Object.Equals(Object)</a>
     </div>
     <div>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object-system-object)">Object.Equals(Object, Object)</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-      <span class="xref">System.Object.Equals(System.Object, System.Object)</span>
-=======
-      <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object-system-object)">Object.Equals(Object, Object)</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
     </div>
     <div>
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.gethashcode#system-object-gethashcode">Object.GetHashCode()</a>
@@ -136,24 +122,10 @@ <h3 id="constructors">Constructors
   </h3>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_WebSocketRpcClient__ctor_chia_dotnet_EndpointInfo_.md&amp;value=---%0Auid%3A%20chia.dotnet.WebSocketRpcClient.%23ctor(chia.dotnet.EndpointInfo)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_WebSocketRpcClient__ctor_chia_dotnet_EndpointInfo_.md&amp;value=---%0Auid%3A%20chia.dotnet.WebSocketRpcClient.%23ctor(chia.dotnet.EndpointInfo)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_WebSocketRpcClient__ctor_chia_dotnet_EndpointInfo_.md&amp;value=---%0Auid%3A%20chia.dotnet.WebSocketRpcClient.%23ctor(chia.dotnet.EndpointInfo)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/WebSocketRpcClient.cs/#L33">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/WebSocketRpcClient.cs/#L33">View Source</a>
   </span>
   <a id="chia_dotnet_WebSocketRpcClient__ctor_" data-uid="chia.dotnet.WebSocketRpcClient.#ctor*"></a>
   <h4 id="chia_dotnet_WebSocketRpcClient__ctor_chia_dotnet_EndpointInfo_" data-uid="chia.dotnet.WebSocketRpcClient.#ctor(chia.dotnet.EndpointInfo)">WebSocketRpcClient(EndpointInfo)</h4>
@@ -186,24 +158,10 @@ <h3 id="properties">Properties
   </h3>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_WebSocketRpcClient_Endpoint.md&amp;value=---%0Auid%3A%20chia.dotnet.WebSocketRpcClient.Endpoint%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_WebSocketRpcClient_Endpoint.md&amp;value=---%0Auid%3A%20chia.dotnet.WebSocketRpcClient.Endpoint%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_WebSocketRpcClient_Endpoint.md&amp;value=---%0Auid%3A%20chia.dotnet.WebSocketRpcClient.Endpoint%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/WebSocketRpcClient.cs/#L43">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/WebSocketRpcClient.cs/#L43">View Source</a>
   </span>
   <a id="chia_dotnet_WebSocketRpcClient_Endpoint_" data-uid="chia.dotnet.WebSocketRpcClient.Endpoint*"></a>
   <h4 id="chia_dotnet_WebSocketRpcClient_Endpoint" data-uid="chia.dotnet.WebSocketRpcClient.Endpoint">Endpoint</h4>
@@ -233,24 +191,10 @@ <h3 id="methods">Methods
   </h3>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_WebSocketRpcClient_Close_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.WebSocketRpcClient.Close(System.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_WebSocketRpcClient_Close_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.WebSocketRpcClient.Close(System.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_WebSocketRpcClient_Close_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.WebSocketRpcClient.Close(System.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/WebSocketRpcClient.cs/#L82">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/WebSocketRpcClient.cs/#L82">View Source</a>
   </span>
   <a id="chia_dotnet_WebSocketRpcClient_Close_" data-uid="chia.dotnet.WebSocketRpcClient.Close*"></a>
   <h4 id="chia_dotnet_WebSocketRpcClient_Close_System_Threading_CancellationToken_" data-uid="chia.dotnet.WebSocketRpcClient.Close(System.Threading.CancellationToken)">Close(CancellationToken)</h4>
@@ -297,24 +241,10 @@ <h5 class="returns">Returns</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_WebSocketRpcClient_Connect_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.WebSocketRpcClient.Connect(System.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_WebSocketRpcClient_Connect_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.WebSocketRpcClient.Connect(System.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_WebSocketRpcClient_Connect_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.WebSocketRpcClient.Connect(System.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/WebSocketRpcClient.cs/#L50">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/WebSocketRpcClient.cs/#L50">View Source</a>
   </span>
   <a id="chia_dotnet_WebSocketRpcClient_Connect_" data-uid="chia.dotnet.WebSocketRpcClient.Connect*"></a>
   <h4 id="chia_dotnet_WebSocketRpcClient_Connect_System_Threading_CancellationToken_" data-uid="chia.dotnet.WebSocketRpcClient.Connect(System.Threading.CancellationToken)">Connect(CancellationToken)</h4>
@@ -361,24 +291,10 @@ <h5 class="returns">Returns</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_WebSocketRpcClient_Dispose.md&amp;value=---%0Auid%3A%20chia.dotnet.WebSocketRpcClient.Dispose%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_WebSocketRpcClient_Dispose.md&amp;value=---%0Auid%3A%20chia.dotnet.WebSocketRpcClient.Dispose%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_WebSocketRpcClient_Dispose.md&amp;value=---%0Auid%3A%20chia.dotnet.WebSocketRpcClient.Dispose%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/WebSocketRpcClient.cs/#L264">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/WebSocketRpcClient.cs/#L264">View Source</a>
   </span>
   <a id="chia_dotnet_WebSocketRpcClient_Dispose_" data-uid="chia.dotnet.WebSocketRpcClient.Dispose*"></a>
   <h4 id="chia_dotnet_WebSocketRpcClient_Dispose" data-uid="chia.dotnet.WebSocketRpcClient.Dispose">Dispose()</h4>
@@ -391,24 +307,10 @@ <h5 class="decalaration">Declaration</h5>
   </div>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_WebSocketRpcClient_Dispose_System_Boolean_.md&amp;value=---%0Auid%3A%20chia.dotnet.WebSocketRpcClient.Dispose(System.Boolean)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_WebSocketRpcClient_Dispose_System_Boolean_.md&amp;value=---%0Auid%3A%20chia.dotnet.WebSocketRpcClient.Dispose(System.Boolean)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_WebSocketRpcClient_Dispose_System_Boolean_.md&amp;value=---%0Auid%3A%20chia.dotnet.WebSocketRpcClient.Dispose(System.Boolean)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/WebSocketRpcClient.cs/#L244">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/WebSocketRpcClient.cs/#L244">View Source</a>
   </span>
   <a id="chia_dotnet_WebSocketRpcClient_Dispose_" data-uid="chia.dotnet.WebSocketRpcClient.Dispose*"></a>
   <h4 id="chia_dotnet_WebSocketRpcClient_Dispose_System_Boolean_" data-uid="chia.dotnet.WebSocketRpcClient.Dispose(System.Boolean)">Dispose(Boolean)</h4>
@@ -439,24 +341,10 @@ <h5 class="parameters">Parameters</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_WebSocketRpcClient_OnBroadcastMessageReceived_chia_dotnet_Message_.md&amp;value=---%0Auid%3A%20chia.dotnet.WebSocketRpcClient.OnBroadcastMessageReceived(chia.dotnet.Message)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_WebSocketRpcClient_OnBroadcastMessageReceived_chia_dotnet_Message_.md&amp;value=---%0Auid%3A%20chia.dotnet.WebSocketRpcClient.OnBroadcastMessageReceived(chia.dotnet.Message)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_WebSocketRpcClient_OnBroadcastMessageReceived_chia_dotnet_Message_.md&amp;value=---%0Auid%3A%20chia.dotnet.WebSocketRpcClient.OnBroadcastMessageReceived(chia.dotnet.Message)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/WebSocketRpcClient.cs/#L174">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/WebSocketRpcClient.cs/#L174">View Source</a>
   </span>
   <a id="chia_dotnet_WebSocketRpcClient_OnBroadcastMessageReceived_" data-uid="chia.dotnet.WebSocketRpcClient.OnBroadcastMessageReceived*"></a>
   <h4 id="chia_dotnet_WebSocketRpcClient_OnBroadcastMessageReceived_chia_dotnet_Message_" data-uid="chia.dotnet.WebSocketRpcClient.OnBroadcastMessageReceived(chia.dotnet.Message)">OnBroadcastMessageReceived(Message)</h4>
@@ -487,24 +375,10 @@ <h5 class="parameters">Parameters</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_WebSocketRpcClient_OnConnected.md&amp;value=---%0Auid%3A%20chia.dotnet.WebSocketRpcClient.OnConnected%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_WebSocketRpcClient_OnConnected.md&amp;value=---%0Auid%3A%20chia.dotnet.WebSocketRpcClient.OnConnected%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_WebSocketRpcClient_OnConnected.md&amp;value=---%0Auid%3A%20chia.dotnet.WebSocketRpcClient.OnConnected%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/WebSocketRpcClient.cs/#L73">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/WebSocketRpcClient.cs/#L73">View Source</a>
   </span>
   <a id="chia_dotnet_WebSocketRpcClient_OnConnected_" data-uid="chia.dotnet.WebSocketRpcClient.OnConnected*"></a>
   <h4 id="chia_dotnet_WebSocketRpcClient_OnConnected" data-uid="chia.dotnet.WebSocketRpcClient.OnConnected">OnConnected()</h4>
@@ -518,24 +392,10 @@ <h5 class="decalaration">Declaration</h5>
   </div>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_WebSocketRpcClient_PostMessage_chia_dotnet_Message_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.WebSocketRpcClient.PostMessage(chia.dotnet.Message%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_WebSocketRpcClient_PostMessage_chia_dotnet_Message_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.WebSocketRpcClient.PostMessage(chia.dotnet.Message%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_WebSocketRpcClient_PostMessage_chia_dotnet_Message_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.WebSocketRpcClient.PostMessage(chia.dotnet.Message%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/WebSocketRpcClient.cs/#L100">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/WebSocketRpcClient.cs/#L100">View Source</a>
   </span>
   <a id="chia_dotnet_WebSocketRpcClient_PostMessage_" data-uid="chia.dotnet.WebSocketRpcClient.PostMessage*"></a>
   <h4 id="chia_dotnet_WebSocketRpcClient_PostMessage_chia_dotnet_Message_System_Threading_CancellationToken_" data-uid="chia.dotnet.WebSocketRpcClient.PostMessage(chia.dotnet.Message,System.Threading.CancellationToken)">PostMessage(Message, CancellationToken)</h4>
@@ -591,24 +451,10 @@ <h5 id="chia_dotnet_WebSocketRpcClient_PostMessage_chia_dotnet_Message_System_Th
 </div>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_WebSocketRpcClient_SendMessage_chia_dotnet_Message_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.WebSocketRpcClient.SendMessage(chia.dotnet.Message%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_WebSocketRpcClient_SendMessage_chia_dotnet_Message_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.WebSocketRpcClient.SendMessage(chia.dotnet.Message%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_WebSocketRpcClient_SendMessage_chia_dotnet_Message_System_Threading_CancellationToken_.md&amp;value=---%0Auid%3A%20chia.dotnet.WebSocketRpcClient.SendMessage(chia.dotnet.Message%2CSystem.Threading.CancellationToken)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/WebSocketRpcClient.cs/#L119">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/WebSocketRpcClient.cs/#L119">View Source</a>
   </span>
   <a id="chia_dotnet_WebSocketRpcClient_SendMessage_" data-uid="chia.dotnet.WebSocketRpcClient.SendMessage*"></a>
   <h4 id="chia_dotnet_WebSocketRpcClient_SendMessage_chia_dotnet_Message_System_Threading_CancellationToken_" data-uid="chia.dotnet.WebSocketRpcClient.SendMessage(chia.dotnet.Message,System.Threading.CancellationToken)">SendMessage(Message, CancellationToken)</h4>
@@ -682,24 +528,10 @@ <h3 id="events">Events
   </h3>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_WebSocketRpcClient_BroadcastMessageReceived.md&amp;value=---%0Auid%3A%20chia.dotnet.WebSocketRpcClient.BroadcastMessageReceived%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_WebSocketRpcClient_BroadcastMessageReceived.md&amp;value=---%0Auid%3A%20chia.dotnet.WebSocketRpcClient.BroadcastMessageReceived%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_WebSocketRpcClient_BroadcastMessageReceived.md&amp;value=---%0Auid%3A%20chia.dotnet.WebSocketRpcClient.BroadcastMessageReceived%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/WebSocketRpcClient.cs/#L168">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/WebSocketRpcClient.cs/#L168">View Source</a>
   </span>
   <h4 id="chia_dotnet_WebSocketRpcClient_BroadcastMessageReceived" data-uid="chia.dotnet.WebSocketRpcClient.BroadcastMessageReceived">BroadcastMessageReceived</h4>
   <div class="markdown level1 summary"><p>Event raised when a message is received from the endpoint that was either not in response to a request
@@ -741,24 +573,10 @@ <h3 id="implements">Implements</h3>
               <div class="contribution">
                 <ul class="nav">
                   <li>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-                    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_WebSocketRpcClient.md&amp;value=---%0Auid%3A%20chia.dotnet.WebSocketRpcClient%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-                    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_WebSocketRpcClient.md&amp;value=---%0Auid%3A%20chia.dotnet.WebSocketRpcClient%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-=======
                     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_WebSocketRpcClient.md&amp;value=---%0Auid%3A%20chia.dotnet.WebSocketRpcClient%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
                   </li>
                   <li>
-                    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/WebSocketRpcClient.cs/#L20" class="contribution-link">View Source</a>
+                    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/WebSocketRpcClient.cs/#L20" class="contribution-link">View Source</a>
                   </li>
                 </ul>
               </div>
diff --git a/docs/api/chia.dotnet.bech32.Bech32M.html b/docs/api/chia.dotnet.bech32.Bech32M.html
index d64184c0..fb4be92c 100644
--- a/docs/api/chia.dotnet.bech32.Bech32M.html
+++ b/docs/api/chia.dotnet.bech32.Bech32M.html
@@ -87,21 +87,7 @@ <h5>Inherited Members</h5>
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object)">Object.Equals(Object)</a>
     </div>
     <div>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object-system-object)">Object.Equals(Object, Object)</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-      <span class="xref">System.Object.Equals(System.Object, System.Object)</span>
-=======
-      <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object-system-object)">Object.Equals(Object, Object)</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
     </div>
     <div>
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.gethashcode#system-object-gethashcode">Object.GetHashCode()</a>
@@ -132,24 +118,10 @@ <h3 id="constructors">Constructors
   </h3>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_bech32_Bech32M__ctor_System_String_.md&amp;value=---%0Auid%3A%20chia.dotnet.bech32.Bech32M.%23ctor(System.String)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_bech32_Bech32M__ctor_System_String_.md&amp;value=---%0Auid%3A%20chia.dotnet.bech32.Bech32M.%23ctor(System.String)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_bech32_Bech32M__ctor_System_String_.md&amp;value=---%0Auid%3A%20chia.dotnet.bech32.Bech32M.%23ctor(System.String)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/bech32/Bech32M.cs/#L30">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/bech32/Bech32M.cs/#L30">View Source</a>
   </span>
   <a id="chia_dotnet_bech32_Bech32M__ctor_" data-uid="chia.dotnet.bech32.Bech32M.#ctor*"></a>
   <h4 id="chia_dotnet_bech32_Bech32M__ctor_System_String_" data-uid="chia.dotnet.bech32.Bech32M.#ctor(System.String)">Bech32M(String)</h4>
@@ -182,24 +154,10 @@ <h3 id="properties">Properties
   </h3>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_bech32_Bech32M_AddressPrefix.md&amp;value=---%0Auid%3A%20chia.dotnet.bech32.Bech32M.AddressPrefix%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_bech32_Bech32M_AddressPrefix.md&amp;value=---%0Auid%3A%20chia.dotnet.bech32.Bech32M.AddressPrefix%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_bech32_Bech32M_AddressPrefix.md&amp;value=---%0Auid%3A%20chia.dotnet.bech32.Bech32M.AddressPrefix%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/bech32/Bech32M.cs/#L21">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/bech32/Bech32M.cs/#L21">View Source</a>
   </span>
   <a id="chia_dotnet_bech32_Bech32M_AddressPrefix_" data-uid="chia.dotnet.bech32.Bech32M.AddressPrefix*"></a>
   <h4 id="chia_dotnet_bech32_Bech32M_AddressPrefix" data-uid="chia.dotnet.bech32.Bech32M.AddressPrefix">AddressPrefix</h4>
@@ -230,24 +188,10 @@ <h3 id="methods">Methods
   </h3>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_bech32_Bech32M_AddressToPuzzleHash_System_String_.md&amp;value=---%0Auid%3A%20chia.dotnet.bech32.Bech32M.AddressToPuzzleHash(System.String)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_bech32_Bech32M_AddressToPuzzleHash_System_String_.md&amp;value=---%0Auid%3A%20chia.dotnet.bech32.Bech32M.AddressToPuzzleHash(System.String)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_bech32_Bech32M_AddressToPuzzleHash_System_String_.md&amp;value=---%0Auid%3A%20chia.dotnet.bech32.Bech32M.AddressToPuzzleHash(System.String)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/bech32/Bech32M.cs/#L65">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/bech32/Bech32M.cs/#L65">View Source</a>
   </span>
   <a id="chia_dotnet_bech32_Bech32M_AddressToPuzzleHash_" data-uid="chia.dotnet.bech32.Bech32M.AddressToPuzzleHash*"></a>
   <h4 id="chia_dotnet_bech32_Bech32M_AddressToPuzzleHash_System_String_" data-uid="chia.dotnet.bech32.Bech32M.AddressToPuzzleHash(System.String)">AddressToPuzzleHash(String)</h4>
@@ -310,24 +254,10 @@ <h5 class="exceptions">Exceptions</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_bech32_Bech32M_AddressToPuzzleHashString_System_String_.md&amp;value=---%0Auid%3A%20chia.dotnet.bech32.Bech32M.AddressToPuzzleHashString(System.String)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_bech32_Bech32M_AddressToPuzzleHashString_System_String_.md&amp;value=---%0Auid%3A%20chia.dotnet.bech32.Bech32M.AddressToPuzzleHashString(System.String)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_bech32_Bech32M_AddressToPuzzleHashString_System_String_.md&amp;value=---%0Auid%3A%20chia.dotnet.bech32.Bech32M.AddressToPuzzleHashString(System.String)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/bech32/Bech32M.cs/#L86">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/bech32/Bech32M.cs/#L86">View Source</a>
   </span>
   <a id="chia_dotnet_bech32_Bech32M_AddressToPuzzleHashString_" data-uid="chia.dotnet.bech32.Bech32M.AddressToPuzzleHashString*"></a>
   <h4 id="chia_dotnet_bech32_Bech32M_AddressToPuzzleHashString_System_String_" data-uid="chia.dotnet.bech32.Bech32M.AddressToPuzzleHashString(System.String)">AddressToPuzzleHashString(String)</h4>
@@ -390,26 +320,10 @@ <h5 class="exceptions">Exceptions</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_bech32_Bech32M_PuzzleHashToAddress_chia_dotnet_bech32_HexBytes_.md&amp;value=---%0Auid%3A%20chia.dotnet.bech32.Bech32M.PuzzleHashToAddress(chia.dotnet.bech32.HexBytes)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/bech32/Bech32M.cs/#L50">View Source</a>
-=======
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_bech32_Bech32M_PuzzleHashToAddress_chia_dotnet_bech32_HexBytes_.md&amp;value=---%0Auid%3A%20chia.dotnet.bech32.Bech32M.PuzzleHashToAddress(chia.dotnet.bech32.HexBytes)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
   </span>
   <span class="small pull-right mobile-hide">
     <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/bech32/Bech32M.cs/#L50">View Source</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
   </span>
   <a id="chia_dotnet_bech32_Bech32M_PuzzleHashToAddress_" data-uid="chia.dotnet.bech32.Bech32M.PuzzleHashToAddress*"></a>
   <h4 id="chia_dotnet_bech32_Bech32M_PuzzleHashToAddress_chia_dotnet_bech32_HexBytes_" data-uid="chia.dotnet.bech32.Bech32M.PuzzleHashToAddress(chia.dotnet.bech32.HexBytes)">PuzzleHashToAddress(HexBytes)</h4>
@@ -455,33 +369,10 @@ <h5 class="returns">Returns</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_bech32_Bech32M_PuzzleHashToAddress_System_String_.md&amp;value=---%0Auid%3A%20chia.dotnet.bech32.Bech32M.PuzzleHashToAddress(System.String)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/bech32/Bech32M.cs/#L40">View Source</a>
-=======
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_bech32_Bech32M_PuzzleHashToAddress_System_String_.md&amp;value=---%0Auid%3A%20chia.dotnet.bech32.Bech32M.PuzzleHashToAddress(System.String)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
   </span>
   <span class="small pull-right mobile-hide">
     <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/bech32/Bech32M.cs/#L40">View Source</a>
-<<<<<<< HEAD
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-=======
-<<<<<<< HEAD
-=======
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <a id="chia_dotnet_bech32_Bech32M_PuzzleHashToAddress_" data-uid="chia.dotnet.bech32.Bech32M.PuzzleHashToAddress*"></a>
   <h4 id="chia_dotnet_bech32_Bech32M_PuzzleHashToAddress_System_String_" data-uid="chia.dotnet.bech32.Bech32M.PuzzleHashToAddress(System.String)">PuzzleHashToAddress(String)</h4>
@@ -533,24 +424,10 @@ <h5 class="returns">Returns</h5>
               <div class="contribution">
                 <ul class="nav">
                   <li>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-                    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_bech32_Bech32M.md&amp;value=---%0Auid%3A%20chia.dotnet.bech32.Bech32M%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-                    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_bech32_Bech32M.md&amp;value=---%0Auid%3A%20chia.dotnet.bech32.Bech32M%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-=======
                     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_bech32_Bech32M.md&amp;value=---%0Auid%3A%20chia.dotnet.bech32.Bech32M%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
                   </li>
                   <li>
-                    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/bech32/Bech32M.cs/#L15" class="contribution-link">View Source</a>
+                    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/bech32/Bech32M.cs/#L15" class="contribution-link">View Source</a>
                   </li>
                 </ul>
               </div>
diff --git a/docs/api/chia.dotnet.bech32.HexBytes.html b/docs/api/chia.dotnet.bech32.HexBytes.html
index d93c4581..af74dc3e 100644
--- a/docs/api/chia.dotnet.bech32.HexBytes.html
+++ b/docs/api/chia.dotnet.bech32.HexBytes.html
@@ -79,21 +79,7 @@ <h1 id="chia_dotnet_bech32_HexBytes" data-uid="chia.dotnet.bech32.HexBytes" clas
   <div class="inheritedMembers">
     <h5>Inherited Members</h5>
     <div>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object-system-object)">Object.Equals(Object, Object)</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-      <span class="xref">System.Object.Equals(System.Object, System.Object)</span>
-=======
-      <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.equals#system-object-equals(system-object-system-object)">Object.Equals(Object, Object)</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
     </div>
     <div>
       <a class="xref" href="https://learn.microsoft.com/dotnet/api/system.object.gettype#system-object-gettype">Object.GetType()</a>
@@ -115,24 +101,10 @@ <h3 id="constructors">Constructors
   </h3>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_bech32_HexBytes__ctor_System_String_System_Byte___.md&amp;value=---%0Auid%3A%20chia.dotnet.bech32.HexBytes.%23ctor(System.String%2CSystem.Byte%5B%5D)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_bech32_HexBytes__ctor_System_String_System_Byte___.md&amp;value=---%0Auid%3A%20chia.dotnet.bech32.HexBytes.%23ctor(System.String%2CSystem.Byte%5B%5D)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_bech32_HexBytes__ctor_System_String_System_Byte___.md&amp;value=---%0Auid%3A%20chia.dotnet.bech32.HexBytes.%23ctor(System.String%2CSystem.Byte%5B%5D)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/bech32/HexBytes.cs/#L33">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/bech32/HexBytes.cs/#L33">View Source</a>
   </span>
   <a id="chia_dotnet_bech32_HexBytes__ctor_" data-uid="chia.dotnet.bech32.HexBytes.#ctor*"></a>
   <h4 id="chia_dotnet_bech32_HexBytes__ctor_System_String_System_Byte___" data-uid="chia.dotnet.bech32.HexBytes.#ctor(System.String,System.Byte[])">HexBytes(String, Byte[])</h4>
@@ -169,24 +141,10 @@ <h3 id="properties">Properties
   </h3>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_bech32_HexBytes_Bytes.md&amp;value=---%0Auid%3A%20chia.dotnet.bech32.HexBytes.Bytes%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_bech32_HexBytes_Bytes.md&amp;value=---%0Auid%3A%20chia.dotnet.bech32.HexBytes.Bytes%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_bech32_HexBytes_Bytes.md&amp;value=---%0Auid%3A%20chia.dotnet.bech32.HexBytes.Bytes%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/bech32/HexBytes.cs/#L21">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/bech32/HexBytes.cs/#L21">View Source</a>
   </span>
   <a id="chia_dotnet_bech32_HexBytes_Bytes_" data-uid="chia.dotnet.bech32.HexBytes.Bytes*"></a>
   <h4 id="chia_dotnet_bech32_HexBytes_Bytes" data-uid="chia.dotnet.bech32.HexBytes.Bytes">Bytes</h4>
@@ -214,24 +172,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_bech32_HexBytes_Empty.md&amp;value=---%0Auid%3A%20chia.dotnet.bech32.HexBytes.Empty%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_bech32_HexBytes_Empty.md&amp;value=---%0Auid%3A%20chia.dotnet.bech32.HexBytes.Empty%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_bech32_HexBytes_Empty.md&amp;value=---%0Auid%3A%20chia.dotnet.bech32.HexBytes.Empty%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/bech32/HexBytes.cs/#L139">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/bech32/HexBytes.cs/#L139">View Source</a>
   </span>
   <a id="chia_dotnet_bech32_HexBytes_Empty_" data-uid="chia.dotnet.bech32.HexBytes.Empty*"></a>
   <h4 id="chia_dotnet_bech32_HexBytes_Empty" data-uid="chia.dotnet.bech32.HexBytes.Empty">Empty</h4>
@@ -258,24 +202,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_bech32_HexBytes_Hex.md&amp;value=---%0Auid%3A%20chia.dotnet.bech32.HexBytes.Hex%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_bech32_HexBytes_Hex.md&amp;value=---%0Auid%3A%20chia.dotnet.bech32.HexBytes.Hex%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_bech32_HexBytes_Hex.md&amp;value=---%0Auid%3A%20chia.dotnet.bech32.HexBytes.Hex%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/bech32/HexBytes.cs/#L16">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/bech32/HexBytes.cs/#L16">View Source</a>
   </span>
   <a id="chia_dotnet_bech32_HexBytes_Hex_" data-uid="chia.dotnet.bech32.HexBytes.Hex*"></a>
   <h4 id="chia_dotnet_bech32_HexBytes_Hex" data-uid="chia.dotnet.bech32.HexBytes.Hex">Hex</h4>
@@ -303,24 +233,10 @@ <h5 class="propertyValue">Property Value</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_bech32_HexBytes_IsEmpty.md&amp;value=---%0Auid%3A%20chia.dotnet.bech32.HexBytes.IsEmpty%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_bech32_HexBytes_IsEmpty.md&amp;value=---%0Auid%3A%20chia.dotnet.bech32.HexBytes.IsEmpty%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_bech32_HexBytes_IsEmpty.md&amp;value=---%0Auid%3A%20chia.dotnet.bech32.HexBytes.IsEmpty%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/bech32/HexBytes.cs/#L26">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/bech32/HexBytes.cs/#L26">View Source</a>
   </span>
   <a id="chia_dotnet_bech32_HexBytes_IsEmpty_" data-uid="chia.dotnet.bech32.HexBytes.IsEmpty*"></a>
   <h4 id="chia_dotnet_bech32_HexBytes_IsEmpty" data-uid="chia.dotnet.bech32.HexBytes.IsEmpty">IsEmpty</h4>
@@ -350,24 +266,10 @@ <h3 id="methods">Methods
   </h3>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_bech32_HexBytes_Equals_System_Object_.md&amp;value=---%0Auid%3A%20chia.dotnet.bech32.HexBytes.Equals(System.Object)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_bech32_HexBytes_Equals_System_Object_.md&amp;value=---%0Auid%3A%20chia.dotnet.bech32.HexBytes.Equals(System.Object)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_bech32_HexBytes_Equals_System_Object_.md&amp;value=---%0Auid%3A%20chia.dotnet.bech32.HexBytes.Equals(System.Object)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/bech32/HexBytes.cs/#L51">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/bech32/HexBytes.cs/#L51">View Source</a>
   </span>
   <a id="chia_dotnet_bech32_HexBytes_Equals_" data-uid="chia.dotnet.bech32.HexBytes.Equals*"></a>
   <h4 id="chia_dotnet_bech32_HexBytes_Equals_System_Object_" data-uid="chia.dotnet.bech32.HexBytes.Equals(System.Object)">Equals(Object)</h4>
@@ -413,24 +315,10 @@ <h5 class="overrides">Overrides</h5>
   <div><a class="xref" href="https://learn.microsoft.com/dotnet/api/system.valuetype.equals#system-valuetype-equals(system-object)">ValueType.Equals(Object)</a></div>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_bech32_HexBytes_FromBytes_System_Byte___.md&amp;value=---%0Auid%3A%20chia.dotnet.bech32.HexBytes.FromBytes(System.Byte%5B%5D)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_bech32_HexBytes_FromBytes_System_Byte___.md&amp;value=---%0Auid%3A%20chia.dotnet.bech32.HexBytes.FromBytes(System.Byte%5B%5D)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_bech32_HexBytes_FromBytes_System_Byte___.md&amp;value=---%0Auid%3A%20chia.dotnet.bech32.HexBytes.FromBytes(System.Byte%5B%5D)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/bech32/HexBytes.cs/#L131">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/bech32/HexBytes.cs/#L131">View Source</a>
   </span>
   <a id="chia_dotnet_bech32_HexBytes_FromBytes_" data-uid="chia.dotnet.bech32.HexBytes.FromBytes*"></a>
   <h4 id="chia_dotnet_bech32_HexBytes_FromBytes_System_Byte___" data-uid="chia.dotnet.bech32.HexBytes.FromBytes(System.Byte[])">FromBytes(Byte[])</h4>
@@ -474,24 +362,10 @@ <h5 class="returns">Returns</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_bech32_HexBytes_FromHex_System_String_.md&amp;value=---%0Auid%3A%20chia.dotnet.bech32.HexBytes.FromHex(System.String)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_bech32_HexBytes_FromHex_System_String_.md&amp;value=---%0Auid%3A%20chia.dotnet.bech32.HexBytes.FromHex(System.String)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_bech32_HexBytes_FromHex_System_String_.md&amp;value=---%0Auid%3A%20chia.dotnet.bech32.HexBytes.FromHex(System.String)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/bech32/HexBytes.cs/#L102">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/bech32/HexBytes.cs/#L102">View Source</a>
   </span>
   <a id="chia_dotnet_bech32_HexBytes_FromHex_" data-uid="chia.dotnet.bech32.HexBytes.FromHex*"></a>
   <h4 id="chia_dotnet_bech32_HexBytes_FromHex_System_String_" data-uid="chia.dotnet.bech32.HexBytes.FromHex(System.String)">FromHex(String)</h4>
@@ -535,24 +409,10 @@ <h5 class="returns">Returns</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_bech32_HexBytes_GetHashCode.md&amp;value=---%0Auid%3A%20chia.dotnet.bech32.HexBytes.GetHashCode%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_bech32_HexBytes_GetHashCode.md&amp;value=---%0Auid%3A%20chia.dotnet.bech32.HexBytes.GetHashCode%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_bech32_HexBytes_GetHashCode.md&amp;value=---%0Auid%3A%20chia.dotnet.bech32.HexBytes.GetHashCode%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/bech32/HexBytes.cs/#L56">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/bech32/HexBytes.cs/#L56">View Source</a>
   </span>
   <a id="chia_dotnet_bech32_HexBytes_GetHashCode_" data-uid="chia.dotnet.bech32.HexBytes.GetHashCode*"></a>
   <h4 id="chia_dotnet_bech32_HexBytes_GetHashCode" data-uid="chia.dotnet.bech32.HexBytes.GetHashCode">GetHashCode()</h4>
@@ -581,24 +441,10 @@ <h5 class="overrides">Overrides</h5>
   <div><a class="xref" href="https://learn.microsoft.com/dotnet/api/system.valuetype.gethashcode#system-valuetype-gethashcode">ValueType.GetHashCode()</a></div>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_bech32_HexBytes_Sha256.md&amp;value=---%0Auid%3A%20chia.dotnet.bech32.HexBytes.Sha256%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_bech32_HexBytes_Sha256.md&amp;value=---%0Auid%3A%20chia.dotnet.bech32.HexBytes.Sha256%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_bech32_HexBytes_Sha256.md&amp;value=---%0Auid%3A%20chia.dotnet.bech32.HexBytes.Sha256%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/bech32/HexBytes.cs/#L43">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/bech32/HexBytes.cs/#L43">View Source</a>
   </span>
   <a id="chia_dotnet_bech32_HexBytes_Sha256_" data-uid="chia.dotnet.bech32.HexBytes.Sha256*"></a>
   <h4 id="chia_dotnet_bech32_HexBytes_Sha256" data-uid="chia.dotnet.bech32.HexBytes.Sha256">Sha256()</h4>
@@ -627,24 +473,10 @@ <h5 class="returns">Returns</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_bech32_HexBytes_ToString.md&amp;value=---%0Auid%3A%20chia.dotnet.bech32.HexBytes.ToString%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_bech32_HexBytes_ToString.md&amp;value=---%0Auid%3A%20chia.dotnet.bech32.HexBytes.ToString%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_bech32_HexBytes_ToString.md&amp;value=---%0Auid%3A%20chia.dotnet.bech32.HexBytes.ToString%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/bech32/HexBytes.cs/#L61">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/bech32/HexBytes.cs/#L61">View Source</a>
   </span>
   <a id="chia_dotnet_bech32_HexBytes_ToString_" data-uid="chia.dotnet.bech32.HexBytes.ToString*"></a>
   <h4 id="chia_dotnet_bech32_HexBytes_ToString" data-uid="chia.dotnet.bech32.HexBytes.ToString">ToString()</h4>
@@ -673,24 +505,10 @@ <h5 class="overrides">Overrides</h5>
   <div><a class="xref" href="https://learn.microsoft.com/dotnet/api/system.valuetype.tostring#system-valuetype-tostring">ValueType.ToString()</a></div>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_bech32_HexBytes_TryFromHex_System_String_chia_dotnet_bech32_HexBytes__.md&amp;value=---%0Auid%3A%20chia.dotnet.bech32.HexBytes.TryFromHex(System.String%2Cchia.dotnet.bech32.HexBytes%40)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_bech32_HexBytes_TryFromHex_System_String_chia_dotnet_bech32_HexBytes__.md&amp;value=---%0Auid%3A%20chia.dotnet.bech32.HexBytes.TryFromHex(System.String%2Cchia.dotnet.bech32.HexBytes%40)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_bech32_HexBytes_TryFromHex_System_String_chia_dotnet_bech32_HexBytes__.md&amp;value=---%0Auid%3A%20chia.dotnet.bech32.HexBytes.TryFromHex(System.String%2Cchia.dotnet.bech32.HexBytes%40)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/bech32/HexBytes.cs/#L111">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/bech32/HexBytes.cs/#L111">View Source</a>
   </span>
   <a id="chia_dotnet_bech32_HexBytes_TryFromHex_" data-uid="chia.dotnet.bech32.HexBytes.TryFromHex*"></a>
   <h4 id="chia_dotnet_bech32_HexBytes_TryFromHex_System_String_chia_dotnet_bech32_HexBytes__" data-uid="chia.dotnet.bech32.HexBytes.TryFromHex(System.String,chia.dotnet.bech32.HexBytes@)">TryFromHex(String, out HexBytes)</h4>
@@ -741,23 +559,10 @@ <h3 id="operators">Operators
   </h3>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_bech32_HexBytes_op_Addition_chia_dotnet_bech32_HexBytes_chia_dotnet_bech32_HexBytes_.md&amp;value=---%0Auid%3A%20chia.dotnet.bech32.HexBytes.op_Addition(chia.dotnet.bech32.HexBytes%2Cchia.dotnet.bech32.HexBytes)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_bech32_HexBytes_op_Addition_chia_dotnet_bech32_HexBytes_chia_dotnet_bech32_HexBytes_.md&amp;value=---%0Auid%3A%20chia.dotnet.bech32.HexBytes.op_Addition(chia.dotnet.bech32.HexBytes%2Cchia.dotnet.bech32.HexBytes)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/bech32/HexBytes.cs/#L66">View Source</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_bech32_HexBytes_op_Addition_chia_dotnet_bech32_HexBytes_chia_dotnet_bech32_HexBytes_.md&amp;value=---%0Auid%3A%20chia.dotnet.bech32.HexBytes.op_Addition(chia.dotnet.bech32.HexBytes%2Cchia.dotnet.bech32.HexBytes)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
   </span>
   <span class="small pull-right mobile-hide">
     <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/bech32/HexBytes.cs/#L66">View Source</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
   </span>
   <a id="chia_dotnet_bech32_HexBytes_op_Addition_" data-uid="chia.dotnet.bech32.HexBytes.op_Addition*"></a>
   <h4 id="chia_dotnet_bech32_HexBytes_op_Addition_chia_dotnet_bech32_HexBytes_chia_dotnet_bech32_HexBytes_" data-uid="chia.dotnet.bech32.HexBytes.op_Addition(chia.dotnet.bech32.HexBytes,chia.dotnet.bech32.HexBytes)">Addition(HexBytes, HexBytes)</h4>
@@ -806,184 +611,11 @@ <h5 class="returns">Returns</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_bech32_HexBytes_op_Addition_chia_dotnet_bech32_HexBytes_System_Byte___.md&amp;value=---%0Auid%3A%20chia.dotnet.bech32.HexBytes.op_Addition(chia.dotnet.bech32.HexBytes%2CSystem.Byte%5B%5D)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_bech32_HexBytes_op_Addition_chia_dotnet_bech32_HexBytes_System_Byte___.md&amp;value=---%0Auid%3A%20chia.dotnet.bech32.HexBytes.op_Addition(chia.dotnet.bech32.HexBytes%2CSystem.Byte%5B%5D)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/bech32/HexBytes.cs/#L74">View Source</a>
-  </span>
-  <a id="chia_dotnet_bech32_HexBytes_op_Addition_" data-uid="chia.dotnet.bech32.HexBytes.op_Addition*"></a>
-  <h4 id="chia_dotnet_bech32_HexBytes_op_Addition_chia_dotnet_bech32_HexBytes_System_Byte___" data-uid="chia.dotnet.bech32.HexBytes.op_Addition(chia.dotnet.bech32.HexBytes,System.Byte[])">Addition(HexBytes, Byte[])</h4>
-  <div class="markdown level1 summary"></div>
-  <div class="markdown level1 conceptual"></div>
-  <h5 class="decalaration">Declaration</h5>
-  <div class="codewrapper">
-    <pre><code class="lang-csharp hljs">public static HexBytes operator +(HexBytes a, byte[] b)</code></pre>
-  </div>
-  <h5 class="parameters">Parameters</h5>
-  <table class="table table-bordered table-striped table-condensed">
-    <thead>
-      <tr>
-        <th>Type</th>
-        <th>Name</th>
-        <th>Description</th>
-      </tr>
-    </thead>
-    <tbody>
-      <tr>
-        <td><a class="xref" href="chia.dotnet.bech32.HexBytes.html">HexBytes</a></td>
-        <td><span class="parametername">a</span></td>
-        <td></td>
-      </tr>
-      <tr>
-        <td><a class="xref" href="https://learn.microsoft.com/dotnet/api/system.byte">Byte</a>[]</td>
-        <td><span class="parametername">b</span></td>
-        <td></td>
-      </tr>
-    </tbody>
-  </table>
-  <h5 class="returns">Returns</h5>
-  <table class="table table-bordered table-striped table-condensed">
-    <thead>
-      <tr>
-        <th>Type</th>
-        <th>Description</th>
-      </tr>
-    </thead>
-    <tbody>
-      <tr>
-        <td><a class="xref" href="chia.dotnet.bech32.HexBytes.html">HexBytes</a></td>
-        <td></td>
-      </tr>
-    </tbody>
-  </table>
-  <span class="small pull-right mobile-hide">
-    <span class="divider">|</span>
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_bech32_HexBytes_op_Addition_chia_dotnet_bech32_HexBytes_System_String_.md&amp;value=---%0Auid%3A%20chia.dotnet.bech32.HexBytes.op_Addition(chia.dotnet.bech32.HexBytes%2CSystem.String)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/bech32/HexBytes.cs/#L83">View Source</a>
-  </span>
-  <a id="chia_dotnet_bech32_HexBytes_op_Addition_" data-uid="chia.dotnet.bech32.HexBytes.op_Addition*"></a>
-  <h4 id="chia_dotnet_bech32_HexBytes_op_Addition_chia_dotnet_bech32_HexBytes_System_String_" data-uid="chia.dotnet.bech32.HexBytes.op_Addition(chia.dotnet.bech32.HexBytes,System.String)">Addition(HexBytes, String)</h4>
-  <div class="markdown level1 summary"></div>
-  <div class="markdown level1 conceptual"></div>
-  <h5 class="decalaration">Declaration</h5>
-  <div class="codewrapper">
-    <pre><code class="lang-csharp hljs">public static HexBytes operator +(HexBytes a, string b)</code></pre>
-  </div>
-  <h5 class="parameters">Parameters</h5>
-  <table class="table table-bordered table-striped table-condensed">
-    <thead>
-      <tr>
-        <th>Type</th>
-        <th>Name</th>
-        <th>Description</th>
-      </tr>
-    </thead>
-    <tbody>
-      <tr>
-        <td><a class="xref" href="chia.dotnet.bech32.HexBytes.html">HexBytes</a></td>
-        <td><span class="parametername">a</span></td>
-        <td></td>
-      </tr>
-      <tr>
-        <td><a class="xref" href="https://learn.microsoft.com/dotnet/api/system.string">String</a></td>
-        <td><span class="parametername">b</span></td>
-        <td></td>
-      </tr>
-    </tbody>
-  </table>
-  <h5 class="returns">Returns</h5>
-  <table class="table table-bordered table-striped table-condensed">
-    <thead>
-      <tr>
-        <th>Type</th>
-        <th>Description</th>
-      </tr>
-    </thead>
-    <tbody>
-      <tr>
-        <td><a class="xref" href="chia.dotnet.bech32.HexBytes.html">HexBytes</a></td>
-        <td></td>
-      </tr>
-    </tbody>
-  </table>
-  <span class="small pull-right mobile-hide">
-    <span class="divider">|</span>
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_bech32_HexBytes_op_Equality_chia_dotnet_bech32_HexBytes_chia_dotnet_bech32_HexBytes_.md&amp;value=---%0Auid%3A%20chia.dotnet.bech32.HexBytes.op_Equality(chia.dotnet.bech32.HexBytes%2Cchia.dotnet.bech32.HexBytes)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/bech32/HexBytes.cs/#L74">View Source</a>
-  </span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-  <a id="chia_dotnet_bech32_HexBytes_op_Addition_" data-uid="chia.dotnet.bech32.HexBytes.op_Addition*"></a>
-<<<<<<< HEAD
-  <h4 id="chia_dotnet_bech32_HexBytes_op_Addition_chia_dotnet_bech32_HexBytes_chia_dotnet_bech32_HexBytes_" data-uid="chia.dotnet.bech32.HexBytes.op_Addition(chia.dotnet.bech32.HexBytes,chia.dotnet.bech32.HexBytes)">Addition(HexBytes, HexBytes)</h4>
-=======
-  <h4 id="chia_dotnet_bech32_HexBytes_op_Addition_chia_dotnet_bech32_HexBytes_System_Byte___" data-uid="chia.dotnet.bech32.HexBytes.op_Addition(chia.dotnet.bech32.HexBytes,System.Byte[])">Addition(HexBytes, Byte[])</h4>
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
-  <div class="markdown level1 summary"></div>
-  <div class="markdown level1 conceptual"></div>
-  <h5 class="decalaration">Declaration</h5>
-  <div class="codewrapper">
-    <pre><code class="lang-csharp hljs">public static HexBytes operator +(HexBytes a, byte[] b)</code></pre>
-  </div>
-  <h5 class="parameters">Parameters</h5>
-  <table class="table table-bordered table-striped table-condensed">
-    <thead>
-      <tr>
-        <th>Type</th>
-        <th>Name</th>
-        <th>Description</th>
-      </tr>
-    </thead>
-    <tbody>
-      <tr>
-        <td><a class="xref" href="chia.dotnet.bech32.HexBytes.html">HexBytes</a></td>
-        <td><span class="parametername">a</span></td>
-        <td></td>
-      </tr>
-      <tr>
-        <td><a class="xref" href="https://learn.microsoft.com/dotnet/api/system.byte">Byte</a>[]</td>
-        <td><span class="parametername">b</span></td>
-        <td></td>
-      </tr>
-    </tbody>
-  </table>
-  <h5 class="returns">Returns</h5>
-  <table class="table table-bordered table-striped table-condensed">
-    <thead>
-      <tr>
-        <th>Type</th>
-        <th>Description</th>
-      </tr>
-    </thead>
-    <tbody>
-      <tr>
-        <td><a class="xref" href="chia.dotnet.bech32.HexBytes.html">HexBytes</a></td>
-        <td></td>
-      </tr>
-    </tbody>
-  </table>
-  <span class="small pull-right mobile-hide">
-    <span class="divider">|</span>
-<<<<<<< HEAD
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_bech32_HexBytes_op_Addition_chia_dotnet_bech32_HexBytes_System_Byte___.md&amp;value=---%0Auid%3A%20chia.dotnet.bech32.HexBytes.op_Addition(chia.dotnet.bech32.HexBytes%2CSystem.Byte%5B%5D)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
   </span>
   <span class="small pull-right mobile-hide">
     <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/bech32/HexBytes.cs/#L74">View Source</a>
   </span>
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   <a id="chia_dotnet_bech32_HexBytes_op_Addition_" data-uid="chia.dotnet.bech32.HexBytes.op_Addition*"></a>
   <h4 id="chia_dotnet_bech32_HexBytes_op_Addition_chia_dotnet_bech32_HexBytes_System_Byte___" data-uid="chia.dotnet.bech32.HexBytes.op_Addition(chia.dotnet.bech32.HexBytes,System.Byte[])">Addition(HexBytes, Byte[])</h4>
   <div class="markdown level1 summary"></div>
@@ -1084,88 +716,15 @@ <h5 class="returns">Returns</h5>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_bech32_HexBytes_op_Equality_chia_dotnet_bech32_HexBytes_chia_dotnet_bech32_HexBytes_.md&amp;value=---%0Auid%3A%20chia.dotnet.bech32.HexBytes.op_Equality(chia.dotnet.bech32.HexBytes%2Cchia.dotnet.bech32.HexBytes)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_bech32_HexBytes_op_Addition_chia_dotnet_bech32_HexBytes_System_String_.md&amp;value=---%0Auid%3A%20chia.dotnet.bech32.HexBytes.op_Addition(chia.dotnet.bech32.HexBytes%2CSystem.String)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/bech32/HexBytes.cs/#L83">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/bech32/HexBytes.cs/#L92">View Source</a>
   </span>
-<<<<<<< HEAD
   <a id="chia_dotnet_bech32_HexBytes_op_Equality_" data-uid="chia.dotnet.bech32.HexBytes.op_Equality*"></a>
   <h4 id="chia_dotnet_bech32_HexBytes_op_Equality_chia_dotnet_bech32_HexBytes_chia_dotnet_bech32_HexBytes_" data-uid="chia.dotnet.bech32.HexBytes.op_Equality(chia.dotnet.bech32.HexBytes,chia.dotnet.bech32.HexBytes)">Equality(HexBytes, HexBytes)</h4>
   <div class="markdown level1 summary"></div>
   <div class="markdown level1 conceptual"></div>
   <h5 class="decalaration">Declaration</h5>
-=======
-  <a id="chia_dotnet_bech32_HexBytes_op_Addition_" data-uid="chia.dotnet.bech32.HexBytes.op_Addition*"></a>
-  <h4 id="chia_dotnet_bech32_HexBytes_op_Addition_chia_dotnet_bech32_HexBytes_System_String_" data-uid="chia.dotnet.bech32.HexBytes.op_Addition(chia.dotnet.bech32.HexBytes,System.String)">Addition(HexBytes, String)</h4>
-  <div class="markdown level1 summary"></div>
-  <div class="markdown level1 conceptual"></div>
-  <h5 class="decalaration">Declaration</h5>
-  <div class="codewrapper">
-    <pre><code class="lang-csharp hljs">public static HexBytes operator +(HexBytes a, string b)</code></pre>
-  </div>
-  <h5 class="parameters">Parameters</h5>
-  <table class="table table-bordered table-striped table-condensed">
-    <thead>
-      <tr>
-        <th>Type</th>
-        <th>Name</th>
-        <th>Description</th>
-      </tr>
-    </thead>
-    <tbody>
-      <tr>
-        <td><a class="xref" href="chia.dotnet.bech32.HexBytes.html">HexBytes</a></td>
-        <td><span class="parametername">a</span></td>
-        <td></td>
-      </tr>
-      <tr>
-        <td><a class="xref" href="https://learn.microsoft.com/dotnet/api/system.string">String</a></td>
-        <td><span class="parametername">b</span></td>
-        <td></td>
-      </tr>
-    </tbody>
-  </table>
-  <h5 class="returns">Returns</h5>
-  <table class="table table-bordered table-striped table-condensed">
-    <thead>
-      <tr>
-        <th>Type</th>
-        <th>Description</th>
-      </tr>
-    </thead>
-    <tbody>
-      <tr>
-        <td><a class="xref" href="chia.dotnet.bech32.HexBytes.html">HexBytes</a></td>
-        <td></td>
-      </tr>
-    </tbody>
-  </table>
-  <span class="small pull-right mobile-hide">
-    <span class="divider">|</span>
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_bech32_HexBytes_op_Equality_chia_dotnet_bech32_HexBytes_chia_dotnet_bech32_HexBytes_.md&amp;value=---%0Auid%3A%20chia.dotnet.bech32.HexBytes.op_Equality(chia.dotnet.bech32.HexBytes%2Cchia.dotnet.bech32.HexBytes)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-  </span>
-  <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/bech32/HexBytes.cs/#L92">View Source</a>
-  </span>
-  <a id="chia_dotnet_bech32_HexBytes_op_Equality_" data-uid="chia.dotnet.bech32.HexBytes.op_Equality*"></a>
-  <h4 id="chia_dotnet_bech32_HexBytes_op_Equality_chia_dotnet_bech32_HexBytes_chia_dotnet_bech32_HexBytes_" data-uid="chia.dotnet.bech32.HexBytes.op_Equality(chia.dotnet.bech32.HexBytes,chia.dotnet.bech32.HexBytes)">Equality(HexBytes, HexBytes)</h4>
-  <div class="markdown level1 summary"></div>
-  <div class="markdown level1 conceptual"></div>
-  <h5 class="decalaration">Declaration</h5>
-=======
-  <a id="chia_dotnet_bech32_HexBytes_op_Equality_" data-uid="chia.dotnet.bech32.HexBytes.op_Equality*"></a>
-  <h4 id="chia_dotnet_bech32_HexBytes_op_Equality_chia_dotnet_bech32_HexBytes_chia_dotnet_bech32_HexBytes_" data-uid="chia.dotnet.bech32.HexBytes.op_Equality(chia.dotnet.bech32.HexBytes,chia.dotnet.bech32.HexBytes)">Equality(HexBytes, HexBytes)</h4>
-  <div class="markdown level1 summary"></div>
-  <div class="markdown level1 conceptual"></div>
-  <h5 class="decalaration">Declaration</h5>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   <div class="codewrapper">
     <pre><code class="lang-csharp hljs">public static bool operator ==(HexBytes a, HexBytes b)</code></pre>
   </div>
@@ -1208,24 +767,10 @@ <h5 class="returns">Returns</h5>
   </table>
   <span class="small pull-right mobile-hide">
     <span class="divider">|</span>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_bech32_HexBytes_op_Inequality_chia_dotnet_bech32_HexBytes_chia_dotnet_bech32_HexBytes_.md&amp;value=---%0Auid%3A%20chia.dotnet.bech32.HexBytes.op_Inequality(chia.dotnet.bech32.HexBytes%2Cchia.dotnet.bech32.HexBytes)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_bech32_HexBytes_op_Inequality_chia_dotnet_bech32_HexBytes_chia_dotnet_bech32_HexBytes_.md&amp;value=---%0Auid%3A%20chia.dotnet.bech32.HexBytes.op_Inequality(chia.dotnet.bech32.HexBytes%2Cchia.dotnet.bech32.HexBytes)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
-=======
     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_bech32_HexBytes_op_Inequality_chia_dotnet_bech32_HexBytes_chia_dotnet_bech32_HexBytes_.md&amp;value=---%0Auid%3A%20chia.dotnet.bech32.HexBytes.op_Inequality(chia.dotnet.bech32.HexBytes%2Cchia.dotnet.bech32.HexBytes)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
   </span>
   <span class="small pull-right mobile-hide">
-    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/bech32/HexBytes.cs/#L97">View Source</a>
+    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/bech32/HexBytes.cs/#L97">View Source</a>
   </span>
   <a id="chia_dotnet_bech32_HexBytes_op_Inequality_" data-uid="chia.dotnet.bech32.HexBytes.op_Inequality*"></a>
   <h4 id="chia_dotnet_bech32_HexBytes_op_Inequality_chia_dotnet_bech32_HexBytes_chia_dotnet_bech32_HexBytes_" data-uid="chia.dotnet.bech32.HexBytes.op_Inequality(chia.dotnet.bech32.HexBytes,chia.dotnet.bech32.HexBytes)">Inequality(HexBytes, HexBytes)</h4>
@@ -1280,24 +825,10 @@ <h5 class="returns">Returns</h5>
               <div class="contribution">
                 <ul class="nav">
                   <li>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-                    <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_bech32_HexBytes.md&amp;value=---%0Auid%3A%20chia.dotnet.bech32.HexBytes%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-                    <a href="https://github.com/dkackman/chia-dotnet/new/test-refactor-don/apiSpec/new?filename=chia_dotnet_bech32_HexBytes.md&amp;value=---%0Auid%3A%20chia.dotnet.bech32.HexBytes%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
-=======
                     <a href="https://github.com/dkackman/chia-dotnet/new/main/apiSpec/new?filename=chia_dotnet_bech32_HexBytes.md&amp;value=---%0Auid%3A%20chia.dotnet.bech32.HexBytes%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
                   </li>
                   <li>
-                    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/chia-dotnet/bech32/HexBytes.cs/#L11" class="contribution-link">View Source</a>
+                    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/chia-dotnet/bech32/HexBytes.cs/#L11" class="contribution-link">View Source</a>
                   </li>
                 </ul>
               </div>
diff --git a/docs/api/index.html b/docs/api/index.html
index 646d3a39..071ec1f7 100644
--- a/docs/api/index.html
+++ b/docs/api/index.html
@@ -77,7 +77,7 @@ <h1 id="chia-dotnet">chia-dotnet</h1>
               <div class="contribution">
                 <ul class="nav">
                   <li>
-                    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/docfx/api/index.md/#L1" class="contribution-link">Improve this Doc</a>
+                    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/docfx/api/index.md/#L1" class="contribution-link">Improve this Doc</a>
                   </li>
                 </ul>
               </div>
diff --git a/docs/articles/intro.html b/docs/articles/intro.html
index 86058b25..152ebff6 100644
--- a/docs/articles/intro.html
+++ b/docs/articles/intro.html
@@ -77,7 +77,7 @@ <h1 id="chia-dotnet">chia-dotnet</h1>
               <div class="contribution">
                 <ul class="nav">
                   <li>
-                    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/docfx/articles/intro.md/#L1" class="contribution-link">Improve this Doc</a>
+                    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/docfx/articles/intro.md/#L1" class="contribution-link">Improve this Doc</a>
                   </li>
                 </ul>
               </div>
diff --git a/docs/index.html b/docs/index.html
index 7f68e8d0..12ea9ac7 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -87,7 +87,7 @@ <h3 id="main-types-and-relationships">Main Types and Relationships</h3>
               <div class="contribution">
                 <ul class="nav">
                   <li>
-                    <a href="https://github.com/dkackman/chia-dotnet/blob/test-refactor-don/src/docfx/index.md/#L1" class="contribution-link">Improve this Doc</a>
+                    <a href="https://github.com/dkackman/chia-dotnet/blob/main/src/docfx/index.md/#L1" class="contribution-link">Improve this Doc</a>
                   </li>
                 </ul>
               </div>
diff --git a/docs/manifest.json b/docs/manifest.json
index 5289e2fa..c3c2610c 100644
--- a/docs/manifest.json
+++ b/docs/manifest.json
@@ -9,30 +9,10 @@
       "output": {
         ".html": {
           "relative_path": "api/chia.dotnet.AmountFilter.html",
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
           "hash": "vQcYk8uY4ZTt/tu/TwtOF7K0AWAJpVfVn4yDIU0xrPA="
         }
       },
       "is_incremental": false,
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-          "hash": "x+fmFM03wQYX0xLdRcgZnRqJQosttgkPGwXiWzLxbOc="
-        }
-      },
-      "is_incremental": true,
-=======
-          "hash": "vQcYk8uY4ZTt/tu/TwtOF7K0AWAJpVfVn4yDIU0xrPA="
-        }
-      },
-      "is_incremental": false,
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
       "version": ""
     },
     {
@@ -41,30 +21,10 @@
       "output": {
         ".html": {
           "relative_path": "api/chia.dotnet.AmountWithPuzzlehash.html",
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-          "hash": "SyWGOOMeejw+e9MjUncYD2OoFDl8m7ppUDbHhNrTrbo="
-        }
-      },
-      "is_incremental": false,
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-          "hash": "j3icArLElUcRWpgVK0cUYIHs7CKwgE9T8tFUn7cCfvk="
-        }
-      },
-      "is_incremental": true,
-=======
           "hash": "SyWGOOMeejw+e9MjUncYD2OoFDl8m7ppUDbHhNrTrbo="
         }
       },
       "is_incremental": false,
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
       "version": ""
     },
     {
@@ -73,30 +33,10 @@
       "output": {
         ".html": {
           "relative_path": "api/chia.dotnet.Announcement.html",
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-          "hash": "TV9jlryUQDcKwdQOZFfi1VuTNyJjZ2QqPGkMURu6fDE="
-        }
-      },
-      "is_incremental": false,
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-          "hash": "NoLn8rIIDcY0+DyK06OIuwZj2VDYC7reHfqdfgIXOWU="
-        }
-      },
-      "is_incremental": true,
-=======
           "hash": "TV9jlryUQDcKwdQOZFfi1VuTNyJjZ2QqPGkMURu6fDE="
         }
       },
       "is_incremental": false,
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
       "version": ""
     },
     {
@@ -105,30 +45,10 @@
       "output": {
         ".html": {
           "relative_path": "api/chia.dotnet.AssetInfo.html",
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-          "hash": "ov7x1YCwOrzLTU4Sp9uW/L/wKjolqarNuBVGYFCpZJc="
-        }
-      },
-      "is_incremental": false,
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-          "hash": "AMoqwhkrgemJcbPZJ3XKzmN3WReot3WjHP9xQknvqD0="
-        }
-      },
-      "is_incremental": true,
-=======
           "hash": "ov7x1YCwOrzLTU4Sp9uW/L/wKjolqarNuBVGYFCpZJc="
         }
       },
       "is_incremental": false,
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
       "version": ""
     },
     {
@@ -137,30 +57,10 @@
       "output": {
         ".html": {
           "relative_path": "api/chia.dotnet.AutoClaimSettings.html",
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
           "hash": "mwgIZQVDUjuRpZgwxgd1Fou4p9D2MYCaR5QajjyMPdk="
         }
       },
       "is_incremental": false,
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-          "hash": "ib4KmEJTgf+Vs/SXIVcR/NfNHMN4ID2F5Lr8TC6h/h0="
-        }
-      },
-      "is_incremental": true,
-=======
-          "hash": "mwgIZQVDUjuRpZgwxgd1Fou4p9D2MYCaR5QajjyMPdk="
-        }
-      },
-      "is_incremental": false,
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
       "version": ""
     },
     {
@@ -169,30 +69,10 @@
       "output": {
         ".html": {
           "relative_path": "api/chia.dotnet.BlockCountMetrics.html",
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-          "hash": "AkBDWEUOELH34v/dykQunuLeTEDyTZkD0wm6LYHk76U="
-        }
-      },
-      "is_incremental": false,
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-          "hash": "xJBeRbEONL75RNaB0UwE3uInB0D3WrkC5oZE1ftpY9M="
-        }
-      },
-      "is_incremental": true,
-=======
           "hash": "AkBDWEUOELH34v/dykQunuLeTEDyTZkD0wm6LYHk76U="
         }
       },
       "is_incremental": false,
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
       "version": ""
     },
     {
@@ -201,30 +81,10 @@
       "output": {
         ".html": {
           "relative_path": "api/chia.dotnet.BlockRecord.html",
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-          "hash": "J6q6MB5/O7Alp4whk3CtjZ1bx/meRIe88LLFfLKx+Eo="
-        }
-      },
-      "is_incremental": false,
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-          "hash": "6f58jWunp7dapczc90VwdSpwhGuiHgw2ciSSbJiRMRA="
-        }
-      },
-      "is_incremental": true,
-=======
           "hash": "J6q6MB5/O7Alp4whk3CtjZ1bx/meRIe88LLFfLKx+Eo="
         }
       },
       "is_incremental": false,
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
       "version": ""
     },
     {
@@ -233,30 +93,10 @@
       "output": {
         ".html": {
           "relative_path": "api/chia.dotnet.BlockchainState.html",
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-          "hash": "aKZWhO03wn/nS9WgwRRw87BfuukqfPjdS4Xw1NDqkY4="
-        }
-      },
-      "is_incremental": false,
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-          "hash": "Y8H6rQA1c5qbNFmz1J4EbMACvi9yXAQIhXBXY0ZTEJs="
-        }
-      },
-      "is_incremental": true,
-=======
           "hash": "aKZWhO03wn/nS9WgwRRw87BfuukqfPjdS4Xw1NDqkY4="
         }
       },
       "is_incremental": false,
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
       "version": ""
     },
     {
@@ -265,30 +105,10 @@
       "output": {
         ".html": {
           "relative_path": "api/chia.dotnet.CATInfo.html",
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
           "hash": "noPJM/ag/FTgGODi+lBAlZtJwEYTYGX+oxSlrz50eQs="
         }
       },
       "is_incremental": false,
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-          "hash": "dY9649ZdM3vjgIu3n/AhRCUiy1P1v8dHePesqtK2Tbs="
-        }
-      },
-      "is_incremental": true,
-=======
-          "hash": "noPJM/ag/FTgGODi+lBAlZtJwEYTYGX+oxSlrz50eQs="
-        }
-      },
-      "is_incremental": false,
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
       "version": ""
     },
     {
@@ -297,25 +117,7 @@
       "output": {
         ".html": {
           "relative_path": "api/chia.dotnet.CATWallet.html",
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-          "hash": "Cg5xW7vjYXRA8J32ZLLI+wxjEHY+t1MHqf6AqrZqrnk="
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-          "hash": "OIqmYKq+ZL24ls919Jozm/CMEnOa0x8Z3X3Jg2l9rkU="
-=======
-          "hash": "Cg5xW7vjYXRA8J32ZLLI+wxjEHY+t1MHqf6AqrZqrnk="
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-=======
           "hash": "0m3tHDRrH6KHY2qycJGsGDPYoKXzH5gKUkf4Y5je0/I="
->>>>>>> main
         }
       },
       "is_incremental": false,
@@ -327,30 +129,10 @@
       "output": {
         ".html": {
           "relative_path": "api/chia.dotnet.ChallengeChainSubSlot.html",
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-          "hash": "JggedTWi6GQRB86341AmbfeVSXAcSrsxcgq9BE39gf4="
-        }
-      },
-      "is_incremental": false,
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-          "hash": "rRKwbvhzAJA1AzGSMYp4IzF5tMuCCvDiQxLp9f2Ae5s="
-        }
-      },
-      "is_incremental": true,
-=======
           "hash": "JggedTWi6GQRB86341AmbfeVSXAcSrsxcgq9BE39gf4="
         }
       },
       "is_incremental": false,
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
       "version": ""
     },
     {
@@ -359,30 +141,10 @@
       "output": {
         ".html": {
           "relative_path": "api/chia.dotnet.ClassgroupElement.html",
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-          "hash": "9B9/CqKY7C4K8T5HkASJc8cI92+VYbixO6EZK8K7nCM="
-        }
-      },
-      "is_incremental": false,
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-          "hash": "zUlISEgLR5Dxsns9/j8NX/8NI64y7rn85V54zBEPtbI="
-        }
-      },
-      "is_incremental": true,
-=======
           "hash": "9B9/CqKY7C4K8T5HkASJc8cI92+VYbixO6EZK8K7nCM="
         }
       },
       "is_incremental": false,
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
       "version": ""
     },
     {
@@ -391,30 +153,10 @@
       "output": {
         ".html": {
           "relative_path": "api/chia.dotnet.Coin.html",
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-          "hash": "EsmhErk5gs+NNF5EYJ3ED09FdaQSsoPDGhq8GdEnW04="
-        }
-      },
-      "is_incremental": false,
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-          "hash": "62n4l92tSqbUEqDYrZbg0kl5B7WKr9wNMxkuKSULdNI="
-        }
-      },
-      "is_incremental": true,
-=======
           "hash": "EsmhErk5gs+NNF5EYJ3ED09FdaQSsoPDGhq8GdEnW04="
         }
       },
       "is_incremental": false,
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
       "version": ""
     },
     {
@@ -423,30 +165,10 @@
       "output": {
         ".html": {
           "relative_path": "api/chia.dotnet.CoinAnnouncement.html",
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
           "hash": "o7pIBJvpnbiq/WI2XcwUhae/YnnZ15B55mZtaf71mzg="
         }
       },
       "is_incremental": false,
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-          "hash": "QPT+pB5m/E96DI24OSVSO0H1WCYbVuq1gxmaZWoeQLs="
-        }
-      },
-      "is_incremental": true,
-=======
-          "hash": "o7pIBJvpnbiq/WI2XcwUhae/YnnZ15B55mZtaf71mzg="
-        }
-      },
-      "is_incremental": false,
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
       "version": ""
     },
     {
@@ -455,30 +177,10 @@
       "output": {
         ".html": {
           "relative_path": "api/chia.dotnet.CoinRecord.html",
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-          "hash": "EhGtpiaUTi5aIEpXnF93+wXn6Sp7NCZdHTqeVzJL/ik="
-        }
-      },
-      "is_incremental": false,
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-          "hash": "QUNoMiZefMSuyLTXUmnhjcIK34ffj2LAL4mI+yd2ymM="
-        }
-      },
-      "is_incremental": true,
-=======
           "hash": "EhGtpiaUTi5aIEpXnF93+wXn6Sp7NCZdHTqeVzJL/ik="
         }
       },
       "is_incremental": false,
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
       "version": ""
     },
     {
@@ -487,30 +189,10 @@
       "output": {
         ".html": {
           "relative_path": "api/chia.dotnet.CoinRecordOrder.html",
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-          "hash": "rhEWx4Yage7KGOqIqegH5xANjNz5xZg492umLTp4ius="
-        }
-      },
-      "is_incremental": false,
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-          "hash": "ri/fkhACWkQNWhnXUjpXvIFep4ryxnBq5GTKX7IOD+Q="
-        }
-      },
-      "is_incremental": true,
-=======
           "hash": "rhEWx4Yage7KGOqIqegH5xANjNz5xZg492umLTp4ius="
         }
       },
       "is_incremental": false,
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
       "version": ""
     },
     {
@@ -519,30 +201,10 @@
       "output": {
         ".html": {
           "relative_path": "api/chia.dotnet.CoinSpend.html",
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-          "hash": "tI91+Rjo52oKBFcyvkVcB/w84LqD8JpaNwTljS7lJCU="
-        }
-      },
-      "is_incremental": false,
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-          "hash": "j7UBmrJB7RWMuHwaPSojGvZ3aswmM6DcvubEq8Pad2o="
-        }
-      },
-      "is_incremental": true,
-=======
           "hash": "tI91+Rjo52oKBFcyvkVcB/w84LqD8JpaNwTljS7lJCU="
         }
       },
       "is_incremental": false,
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
       "version": ""
     },
     {
@@ -551,30 +213,10 @@
       "output": {
         ".html": {
           "relative_path": "api/chia.dotnet.CoinType.html",
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
           "hash": "d4ri8DT4+s1UxNIq6VfuU2boJgKfXWaWwmXEz4K20mY="
         }
       },
       "is_incremental": false,
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-          "hash": "WuumLqylTvfMK3D97bEFM/L1ZC9LalLfKqZA09kOwow="
-        }
-      },
-      "is_incremental": true,
-=======
-          "hash": "d4ri8DT4+s1UxNIq6VfuU2boJgKfXWaWwmXEz4K20mY="
-        }
-      },
-      "is_incremental": false,
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
       "version": ""
     },
     {
@@ -583,30 +225,10 @@
       "output": {
         ".html": {
           "relative_path": "api/chia.dotnet.Condition.html",
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-          "hash": "KfvYnTpvRj2K5ZeHaQjIMqYAxRO5zyn+l3gFcqaS5y4="
-        }
-      },
-      "is_incremental": false,
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-          "hash": "dYcqYlWllHPg2gFzuu0FP3DJSnHDssq9LS5lJ+q/wH4="
-        }
-      },
-      "is_incremental": true,
-=======
           "hash": "KfvYnTpvRj2K5ZeHaQjIMqYAxRO5zyn+l3gFcqaS5y4="
         }
       },
       "is_incremental": false,
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
       "version": ""
     },
     {
@@ -615,30 +237,10 @@
       "output": {
         ".html": {
           "relative_path": "api/chia.dotnet.ConditionWithArgs.html",
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-          "hash": "63Ron0jpjTqIpzEGTNxfsuyg8mpU4x565g8Pc1LUK+U="
-        }
-      },
-      "is_incremental": false,
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-          "hash": "cOIvgYX1qBLz/hw9PeoYmiXCHFtN1ppUcQWRa3RWmUU="
-        }
-      },
-      "is_incremental": true,
-=======
           "hash": "63Ron0jpjTqIpzEGTNxfsuyg8mpU4x565g8Pc1LUK+U="
         }
       },
       "is_incremental": false,
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
       "version": ""
     },
     {
@@ -647,30 +249,10 @@
       "output": {
         ".html": {
           "relative_path": "api/chia.dotnet.Config.html",
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-          "hash": "MMDQS424a3o0Qi+as5ot34dNLulH18wpChu/OixQ5kI="
-        }
-      },
-      "is_incremental": false,
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-          "hash": "lYTE7VkznzpTSbSW8X4dk0jFLM+NJyjptt1yzWXThoo="
-        }
-      },
-      "is_incremental": true,
-=======
           "hash": "MMDQS424a3o0Qi+as5ot34dNLulH18wpChu/OixQ5kI="
         }
       },
       "is_incremental": false,
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
       "version": ""
     },
     {
@@ -679,30 +261,10 @@
       "output": {
         ".html": {
           "relative_path": "api/chia.dotnet.ConnectionInfo.html",
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
           "hash": "6WScLgDeNUMbq2zXzKawNxGD0XEce1acmgd94U7HShE="
         }
       },
       "is_incremental": false,
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-          "hash": "LLARMHG3M1mXBy8aK/hLwTQSp62R8e7TB8QB3AyXJSY="
-        }
-      },
-      "is_incremental": true,
-=======
-          "hash": "6WScLgDeNUMbq2zXzKawNxGD0XEce1acmgd94U7HShE="
-        }
-      },
-      "is_incremental": false,
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
       "version": ""
     },
     {
@@ -711,21 +273,7 @@
       "output": {
         ".html": {
           "relative_path": "api/chia.dotnet.CrawlerProxy.html",
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
           "hash": "M2+iDTVnkD0poRNet2TDmjfrIKivWqw2NFXmZvUS0Ws="
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-          "hash": "CyHaeFZWxZfhCjtRGTkvba77Pa6bcfH2k2LNT8HuNKk="
-=======
-          "hash": "M2+iDTVnkD0poRNet2TDmjfrIKivWqw2NFXmZvUS0Ws="
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
         }
       },
       "is_incremental": false,
@@ -737,25 +285,7 @@
       "output": {
         ".html": {
           "relative_path": "api/chia.dotnet.DIDWallet.html",
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-          "hash": "JrulDjxheSvizTc1ml189zf2vd9QaFgOtv81wUihr9c="
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-          "hash": "2157omCMsMfuVIO2N30tkr0wS3BlfTU+JVTGHdavnDg="
-=======
-          "hash": "JrulDjxheSvizTc1ml189zf2vd9QaFgOtv81wUihr9c="
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-=======
           "hash": "B1AP3wGYBXaPJvFZIcXH3ZQppwBnblM8glpqNSQp8Eg="
->>>>>>> main
         }
       },
       "is_incremental": false,
@@ -767,21 +297,7 @@
       "output": {
         ".html": {
           "relative_path": "api/chia.dotnet.DaemonProxy.html",
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-          "hash": "5rfcud00Fqckc4o74Dr/o2rPy/4TFFiWIdJ2ejNd0QE="
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-          "hash": "L6vJPhYtKnpzLWIBKDwwYK7Iyj6SuA0VwqVvSgHclUU="
-=======
           "hash": "5rfcud00Fqckc4o74Dr/o2rPy/4TFFiWIdJ2ejNd0QE="
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
         }
       },
       "is_incremental": false,
@@ -793,30 +309,10 @@
       "output": {
         ".html": {
           "relative_path": "api/chia.dotnet.DataLayerOffer.html",
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
           "hash": "PRYvKV/2x7qHoAN1i2dzhSrlQbcb6G8Aqtxc644Zprc="
         }
       },
       "is_incremental": false,
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-          "hash": "/nf566yffvPuK2L9ZuuFPXF2iHikRfjmF2uPt+xYqqQ="
-        }
-      },
-      "is_incremental": true,
-=======
-          "hash": "PRYvKV/2x7qHoAN1i2dzhSrlQbcb6G8Aqtxc644Zprc="
-        }
-      },
-      "is_incremental": false,
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
       "version": ""
     },
     {
@@ -825,25 +321,7 @@
       "output": {
         ".html": {
           "relative_path": "api/chia.dotnet.DataLayerProxy.html",
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-          "hash": "m/p4n6ID0IuhvqboeZJb2nboWf7p+4eIScLskfuUwz8="
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-          "hash": "gBaQ6fGq3BJutfAy0eYgHFHX2GCAKgjPNf+UD5HqIjM="
-=======
-          "hash": "m/p4n6ID0IuhvqboeZJb2nboWf7p+4eIScLskfuUwz8="
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-=======
           "hash": "ERkmJ3DYE8dTdkNnKeldxxhIe1NlJ2RxtwjHcQr234I="
->>>>>>> main
         }
       },
       "is_incremental": false,
@@ -855,30 +333,10 @@
       "output": {
         ".html": {
           "relative_path": "api/chia.dotnet.DataLayerSyncStatus.html",
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-          "hash": "KEBju/MLxiCyWotvAQH3FXtOvwgDA0lfQQz5n4CSIKI="
-        }
-      },
-      "is_incremental": false,
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-          "hash": "RkUVQ5NQnuB2okSRvEGJWrRjgs0gSjbR2Sil61faKh0="
-        }
-      },
-      "is_incremental": true,
-=======
           "hash": "KEBju/MLxiCyWotvAQH3FXtOvwgDA0lfQQz5n4CSIKI="
         }
       },
       "is_incremental": false,
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
       "version": ""
     },
     {
@@ -887,25 +345,7 @@
       "output": {
         ".html": {
           "relative_path": "api/chia.dotnet.DataLayerWallet.html",
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-          "hash": "P/lpt4IFa5gg8y+4vSDv1+LsFqYceXCO/7ZYaehKP3s="
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-          "hash": "HpjyNU2U1Bb9bOmpzbep42mQ21bGN18dOPL6BVb+u/k="
-=======
-          "hash": "P/lpt4IFa5gg8y+4vSDv1+LsFqYceXCO/7ZYaehKP3s="
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-=======
           "hash": "lxfx+6Tlo5Je1aqgVybwSWyImt+Mi2qrycOdGl58x9s="
->>>>>>> main
         }
       },
       "is_incremental": false,
@@ -917,30 +357,10 @@
       "output": {
         ".html": {
           "relative_path": "api/chia.dotnet.DidInfo.html",
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-          "hash": "83xO/8DbBAAbl1+jIyj5OOhHYQBzljtqqQh+ySJJH44="
-        }
-      },
-      "is_incremental": false,
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-          "hash": "eCEqj4IjHFpIgXQ3yFBGUWQ7znPfBdIy2v5NrdSPWDg="
-        }
-      },
-      "is_incremental": true,
-=======
           "hash": "83xO/8DbBAAbl1+jIyj5OOhHYQBzljtqqQh+ySJJH44="
         }
       },
       "is_incremental": false,
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
       "version": ""
     },
     {
@@ -949,30 +369,10 @@
       "output": {
         ".html": {
           "relative_path": "api/chia.dotnet.EndOfSubSlotBundle.html",
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-          "hash": "2fWJ+Fh+iH6ujaRlJp3heJE7UyZs/4S0tCayySeX2a4="
-        }
-      },
-      "is_incremental": false,
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-          "hash": "BK2DwqsdMiY6FR3RjCjpTeNM0l8it+5KgHLpnjWbiss="
-        }
-      },
-      "is_incremental": true,
-=======
           "hash": "2fWJ+Fh+iH6ujaRlJp3heJE7UyZs/4S0tCayySeX2a4="
         }
       },
       "is_incremental": false,
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
       "version": ""
     },
     {
@@ -981,30 +381,10 @@
       "output": {
         ".html": {
           "relative_path": "api/chia.dotnet.EndpointInfo.html",
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
           "hash": "5AhXixWICYwsNBsoQOLemYeIN1ypL63wLlp4CMz9YaY="
         }
       },
       "is_incremental": false,
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-          "hash": "Cf4JDhHV90UFtOF5g/tlDtQDeUw2ag/PvHKSC4gRIrY="
-        }
-      },
-      "is_incremental": true,
-=======
-          "hash": "5AhXixWICYwsNBsoQOLemYeIN1ypL63wLlp4CMz9YaY="
-        }
-      },
-      "is_incremental": false,
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
       "version": ""
     },
     {
@@ -1013,30 +393,10 @@
       "output": {
         ".html": {
           "relative_path": "api/chia.dotnet.ErrorResponse.html",
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-          "hash": "TK63S5JiiJILUqWGCIBEPOQsx1+6LBY3MyjFbGBnVPs="
-        }
-      },
-      "is_incremental": false,
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-          "hash": "sVhlRXamAEdg7SjJPfLCsy/sSeJ2si6T9zkKkcL+4X0="
-        }
-      },
-      "is_incremental": true,
-=======
           "hash": "TK63S5JiiJILUqWGCIBEPOQsx1+6LBY3MyjFbGBnVPs="
         }
       },
       "is_incremental": false,
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
       "version": ""
     },
     {
@@ -1045,30 +405,10 @@
       "output": {
         ".html": {
           "relative_path": "api/chia.dotnet.Extensions.html",
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-          "hash": "QowzH+aug+h6/ujRbkgoNZyToaD/vXlUEQ+KUbTVTtU="
-        }
-      },
-      "is_incremental": false,
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-          "hash": "MpdyjCGJoDL+ei6rt5wPdsJk/Mhr4uUotdOU2GcPTPw="
-        }
-      },
-      "is_incremental": true,
-=======
           "hash": "QowzH+aug+h6/ujRbkgoNZyToaD/vXlUEQ+KUbTVTtU="
         }
       },
       "is_incremental": false,
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
       "version": ""
     },
     {
@@ -1077,21 +417,7 @@
       "output": {
         ".html": {
           "relative_path": "api/chia.dotnet.FarmerProxy.html",
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
           "hash": "T67MFB2XWA87Ls3MiMe/kJVl47JnjtG9CtWdqbeyJzo="
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-          "hash": "EPw2eQ1z7jEoe76FtQCP2U0Rng8UOQ6cQKPp1sya2F0="
-=======
-          "hash": "T67MFB2XWA87Ls3MiMe/kJVl47JnjtG9CtWdqbeyJzo="
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
         }
       },
       "is_incremental": false,
@@ -1103,30 +429,10 @@
       "output": {
         ".html": {
           "relative_path": "api/chia.dotnet.FarmerRewards.html",
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-          "hash": "5qHWWhJIhyEb2K3XpIdctsGhUoSqwtE4LtNWJI65FdA="
-        }
-      },
-      "is_incremental": false,
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-          "hash": "jbQ/njK8MEWklEMh42BF55tm2WvL/e0IncPFY+KrQ50="
-        }
-      },
-      "is_incremental": true,
-=======
           "hash": "5qHWWhJIhyEb2K3XpIdctsGhUoSqwtE4LtNWJI65FdA="
         }
       },
       "is_incremental": false,
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
       "version": ""
     },
     {
@@ -1135,30 +441,10 @@
       "output": {
         ".html": {
           "relative_path": "api/chia.dotnet.FarmerSignagePoint.html",
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-          "hash": "1ibMlbaCHnbNp+Gq/V89rQCtLPPr8ZedDgSSu7YXqlw="
-        }
-      },
-      "is_incremental": false,
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-          "hash": "E8iiPklLPvSuGeFEQhxz5Ld7wMUy6QQ68n/DPCFWK6I="
-        }
-      },
-      "is_incremental": true,
-=======
           "hash": "1ibMlbaCHnbNp+Gq/V89rQCtLPPr8ZedDgSSu7YXqlw="
         }
       },
       "is_incremental": false,
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
       "version": ""
     },
     {
@@ -1167,30 +453,10 @@
       "output": {
         ".html": {
           "relative_path": "api/chia.dotnet.FilterItem.html",
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-          "hash": "HhZweEr/5wrQFxeAeajRn60226MN8odEEpDxYq0MIkE="
-        }
-      },
-      "is_incremental": false,
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-          "hash": "i5Z9tfRLuCHY5Pp2ygCTs47TVCFc+PmyRmrgz8BQPV4="
-        }
-      },
-      "is_incremental": true,
-=======
           "hash": "HhZweEr/5wrQFxeAeajRn60226MN8odEEpDxYq0MIkE="
         }
       },
       "is_incremental": false,
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
       "version": ""
     },
     {
@@ -1199,30 +465,10 @@
       "output": {
         ".html": {
           "relative_path": "api/chia.dotnet.FilterMode.html",
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-          "hash": "+m0D66esbJJsLpLoDE35fMAkEAtR3rufmOUXjPeF/2o="
-        }
-      },
-      "is_incremental": false,
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-          "hash": "PjBLAp1kwlQrznML6kUnR0GVAHuhIFqvdAohYj71gCU="
-        }
-      },
-      "is_incremental": true,
-=======
           "hash": "+m0D66esbJJsLpLoDE35fMAkEAtR3rufmOUXjPeF/2o="
         }
       },
       "is_incremental": false,
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
       "version": ""
     },
     {
@@ -1231,30 +477,10 @@
       "output": {
         ".html": {
           "relative_path": "api/chia.dotnet.Foliage.html",
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-          "hash": "a6dP6aD+8PyHZGETH1NtGJX/7FrqMAg5HzZ6nk9cANg="
-        }
-      },
-      "is_incremental": false,
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-          "hash": "s/Go7L7QKNlm/ojQtaIo/Klh9bdUZKEH18J15kvzpOs="
-        }
-      },
-      "is_incremental": true,
-=======
           "hash": "a6dP6aD+8PyHZGETH1NtGJX/7FrqMAg5HzZ6nk9cANg="
         }
       },
       "is_incremental": false,
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
       "version": ""
     },
     {
@@ -1263,30 +489,10 @@
       "output": {
         ".html": {
           "relative_path": "api/chia.dotnet.FoliageBlockData.html",
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-          "hash": "bVORp947/ruXB03EGfAxCuuZUwPVBqcxbQqhxwK8T8I="
-        }
-      },
-      "is_incremental": false,
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-          "hash": "hds68yVOog383qYPkvpwEnGrX+HigCWUUazckCK9X/g="
-        }
-      },
-      "is_incremental": true,
-=======
           "hash": "bVORp947/ruXB03EGfAxCuuZUwPVBqcxbQqhxwK8T8I="
         }
       },
       "is_incremental": false,
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
       "version": ""
     },
     {
@@ -1295,30 +501,10 @@
       "output": {
         ".html": {
           "relative_path": "api/chia.dotnet.FoliageTransactionBlock.html",
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-          "hash": "iPf/r16Dzf7kzPOpVwlWH7YdO8zrADr4+94EWNUrvm4="
-        }
-      },
-      "is_incremental": false,
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-          "hash": "jKZfs5xv7qwg3R7yxoOqFQhzFsDp05HueVH2+f9gK34="
-        }
-      },
-      "is_incremental": true,
-=======
           "hash": "iPf/r16Dzf7kzPOpVwlWH7YdO8zrADr4+94EWNUrvm4="
         }
       },
       "is_incremental": false,
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
       "version": ""
     },
     {
@@ -1327,30 +513,10 @@
       "output": {
         ".html": {
           "relative_path": "api/chia.dotnet.FullBlock.html",
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-          "hash": "WRyWGLa6TBL+T6S3svaoUhnd1SKaYaq1dSgojLYKTrY="
-        }
-      },
-      "is_incremental": false,
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-          "hash": "Eqz1PSODPj+ZDH7RqpL4+NhZqSHlKmh8ZayiqwQDYp0="
-        }
-      },
-      "is_incremental": true,
-=======
           "hash": "WRyWGLa6TBL+T6S3svaoUhnd1SKaYaq1dSgojLYKTrY="
         }
       },
       "is_incremental": false,
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
       "version": ""
     },
     {
@@ -1359,25 +525,7 @@
       "output": {
         ".html": {
           "relative_path": "api/chia.dotnet.FullNodeProxy.html",
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-          "hash": "Pq+05UADsgahtBMKMMLgOic4rwvaM2GbR0HbAEPCYuw="
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-          "hash": "p4loojFzFR3RwIpdWhDH+AmFLOV+01o8VwL5sI/jel4="
-=======
-          "hash": "Pq+05UADsgahtBMKMMLgOic4rwvaM2GbR0HbAEPCYuw="
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-=======
           "hash": "/60pw38/1t1E4mNVSpVuvgbZuAt9d3ABc8x2LGncx+4="
->>>>>>> main
         }
       },
       "is_incremental": false,
@@ -1389,30 +537,10 @@
       "output": {
         ".html": {
           "relative_path": "api/chia.dotnet.FungibleAsset.html",
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-          "hash": "paPusVM+RgZVgzHImCOlOh9okV4vkelBOJ7W7a/8yAU="
-        }
-      },
-      "is_incremental": false,
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-          "hash": "1ZYsHixGevAXQqMstWGxkvEVhaWdoRoGUfLlVYDYhbI="
-        }
-      },
-      "is_incremental": true,
-=======
           "hash": "paPusVM+RgZVgzHImCOlOh9okV4vkelBOJ7W7a/8yAU="
         }
       },
       "is_incremental": false,
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
       "version": ""
     },
     {
@@ -1421,30 +549,10 @@
       "output": {
         ".html": {
           "relative_path": "api/chia.dotnet.HarvesterConnection.html",
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-          "hash": "AlkjssLogKkyLMBdXz26FRR1iCH+5wjhuK0AO5m8tTY="
-        }
-      },
-      "is_incremental": false,
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-          "hash": "hKLVKbJz64ofpwZqJcMjCx+eiDDciOJ+qs+OhsAt9BI="
-        }
-      },
-      "is_incremental": true,
-=======
           "hash": "AlkjssLogKkyLMBdXz26FRR1iCH+5wjhuK0AO5m8tTY="
         }
       },
       "is_incremental": false,
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
       "version": ""
     },
     {
@@ -1453,30 +561,10 @@
       "output": {
         ".html": {
           "relative_path": "api/chia.dotnet.HarvesterInfo.html",
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-          "hash": "d14HAwbQe95dDupmHQ/m2tTeRuYdKpAogebzzBYeDy0="
-        }
-      },
-      "is_incremental": false,
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-          "hash": "/jq5qkTD1xSsOe/FtugpDwpYLsZEbgZVYHmd/PdLQwE="
-        }
-      },
-      "is_incremental": true,
-=======
           "hash": "d14HAwbQe95dDupmHQ/m2tTeRuYdKpAogebzzBYeDy0="
         }
       },
       "is_incremental": false,
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
       "version": ""
     },
     {
@@ -1485,25 +573,7 @@
       "output": {
         ".html": {
           "relative_path": "api/chia.dotnet.HarvesterProxy.html",
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-          "hash": "xUzJQ1ly0DBdMpYPpPH38O9Tfp8Og3ahfZnQHivaBVY="
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-          "hash": "57HDL1Q9hI+gDCJI1FsQCMsRmEvTSeImSKOrT+Fo/bc="
-=======
-          "hash": "xUzJQ1ly0DBdMpYPpPH38O9Tfp8Og3ahfZnQHivaBVY="
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-=======
           "hash": "LTR/nWSqdrL3HR85DpbTa2wja6cL35Cl/nFn+tSSmOY="
->>>>>>> main
         }
       },
       "is_incremental": false,
@@ -1515,30 +585,10 @@
       "output": {
         ".html": {
           "relative_path": "api/chia.dotnet.HarvesterSummary.html",
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-          "hash": "C815+zycs9IMN3KcLQuw2t1of0EgYr2a7D5EyskgLL0="
-        }
-      },
-      "is_incremental": false,
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-          "hash": "TepkErVKz7jbliPUiCtg636U+VjjHiAtuWKbKn3DF30="
-        }
-      },
-      "is_incremental": true,
-=======
           "hash": "C815+zycs9IMN3KcLQuw2t1of0EgYr2a7D5EyskgLL0="
         }
       },
       "is_incremental": false,
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
       "version": ""
     },
     {
@@ -1547,30 +597,10 @@
       "output": {
         ".html": {
           "relative_path": "api/chia.dotnet.HarvesterSync.html",
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-          "hash": "RNWpHv/wEdEezvd2LU4ANM9kRoKD0XcFT2CTXMZhPLI="
-        }
-      },
-      "is_incremental": false,
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-          "hash": "xUyLqWpKGS/ZB/Tz3+G9f8HZKG5hKYqbKzmJYbwcpAk="
-        }
-      },
-      "is_incremental": true,
-=======
           "hash": "RNWpHv/wEdEezvd2LU4ANM9kRoKD0XcFT2CTXMZhPLI="
         }
       },
       "is_incremental": false,
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
       "version": ""
     },
     {
@@ -1579,30 +609,10 @@
       "output": {
         ".html": {
           "relative_path": "api/chia.dotnet.HashFilter.html",
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-          "hash": "Z7/2vkBMTjqCEbDZsWCnIdSlsJaVgcuJFcFTaW1+xOY="
-        }
-      },
-      "is_incremental": false,
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-          "hash": "4gqzGjvgHACRzZSnqojwVFTgFCmR5GrCAqHRkjndTjI="
-        }
-      },
-      "is_incremental": true,
-=======
           "hash": "Z7/2vkBMTjqCEbDZsWCnIdSlsJaVgcuJFcFTaW1+xOY="
         }
       },
       "is_incremental": false,
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
       "version": ""
     },
     {
@@ -1611,30 +621,10 @@
       "output": {
         ".html": {
           "relative_path": "api/chia.dotnet.HttpRpcClient.html",
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
           "hash": "tl601tKgS5vnj0RW9FKsf5JalMfH68ESQzdzkhVsl1Q="
         }
       },
       "is_incremental": false,
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-          "hash": "zhaPQGd3zX+P+Om0qgr8kiMfB2U0DKV2oDf0iVrhJ30="
-        }
-      },
-      "is_incremental": true,
-=======
-          "hash": "tl601tKgS5vnj0RW9FKsf5JalMfH68ESQzdzkhVsl1Q="
-        }
-      },
-      "is_incremental": false,
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
       "version": ""
     },
     {
@@ -1643,30 +633,10 @@
       "output": {
         ".html": {
           "relative_path": "api/chia.dotnet.IRpcClient.html",
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-          "hash": "KctS1kT0LgkKfJ9fBK4Uh0fDEOVR+1YrH7mZKAbrzRA="
-        }
-      },
-      "is_incremental": false,
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-          "hash": "wZbwvzXontYit5PcTja2UnvFy8to+SatCKP2WGq5Rt8="
-        }
-      },
-      "is_incremental": true,
-=======
           "hash": "KctS1kT0LgkKfJ9fBK4Uh0fDEOVR+1YrH7mZKAbrzRA="
         }
       },
       "is_incremental": false,
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
       "version": ""
     },
     {
@@ -1675,30 +645,10 @@
       "output": {
         ".html": {
           "relative_path": "api/chia.dotnet.InfusedChallengeChainSubSlot.html",
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
           "hash": "s3phy6Uv0k1fhQ6G76LmJyWZ1J/amX+r6sXv6T+Bh7E="
         }
       },
       "is_incremental": false,
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-          "hash": "3eR0udLlEidcF9Koxp9ZbRhlW6ZBpjC6MtMqJGgYyBI="
-        }
-      },
-      "is_incremental": true,
-=======
-          "hash": "s3phy6Uv0k1fhQ6G76LmJyWZ1J/amX+r6sXv6T+Bh7E="
-        }
-      },
-      "is_incremental": false,
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
       "version": ""
     },
     {
@@ -1707,30 +657,10 @@
       "output": {
         ".html": {
           "relative_path": "api/chia.dotnet.InternalNode.html",
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
           "hash": "D4VHmYOZnz3+fy3tWLi387aYaspzErjd5cu4SCW13g0="
         }
       },
       "is_incremental": false,
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-          "hash": "n6Yhlkt33USmYi+GUOgkHUitg2zht1qDiDkyJCxmxgE="
-        }
-      },
-      "is_incremental": true,
-=======
-          "hash": "D4VHmYOZnz3+fy3tWLi387aYaspzErjd5cu4SCW13g0="
-        }
-      },
-      "is_incremental": false,
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
       "version": ""
     },
     {
@@ -1739,30 +669,10 @@
       "output": {
         ".html": {
           "relative_path": "api/chia.dotnet.KSize.html",
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
           "hash": "vxklFwDyTNxls8VhqJ+YRpVxw3zkIDHOnTjGcfYn7nw="
         }
       },
       "is_incremental": false,
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-          "hash": "6GsdB/I5LxGJ1uNfMVwc0q6UwclAkmEMnUUbG3eq10U="
-        }
-      },
-      "is_incremental": true,
-=======
-          "hash": "vxklFwDyTNxls8VhqJ+YRpVxw3zkIDHOnTjGcfYn7nw="
-        }
-      },
-      "is_incremental": false,
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
       "version": ""
     },
     {
@@ -1771,30 +681,10 @@
       "output": {
         ".html": {
           "relative_path": "api/chia.dotnet.KVDiff.html",
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
           "hash": "sXhJpCFBrW7ZOjC7ql4L+WAXXBkJJQ7ZSH1VdcOwAaM="
         }
       },
       "is_incremental": false,
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-          "hash": "8n8htoU93csZbsP1nDfiPNeNLu/BFWr0mqkLxMIRR2o="
-        }
-      },
-      "is_incremental": true,
-=======
-          "hash": "sXhJpCFBrW7ZOjC7ql4L+WAXXBkJJQ7ZSH1VdcOwAaM="
-        }
-      },
-      "is_incremental": false,
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
       "version": ""
     },
     {
@@ -1803,30 +693,10 @@
       "output": {
         ".html": {
           "relative_path": "api/chia.dotnet.KeyData.html",
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-          "hash": "kEYQHChSC6Q20x13RRovMneDiUeaXIYB/nIIgOiF+kQ="
-        }
-      },
-      "is_incremental": false,
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-          "hash": "iLLZKHniI9xJfCqOEPZMo9+u0n3x0XWz54sv+rGjlEc="
-        }
-      },
-      "is_incremental": true,
-=======
           "hash": "kEYQHChSC6Q20x13RRovMneDiUeaXIYB/nIIgOiF+kQ="
         }
       },
       "is_incremental": false,
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
       "version": ""
     },
     {
@@ -1835,30 +705,10 @@
       "output": {
         ".html": {
           "relative_path": "api/chia.dotnet.KeyDataSecrets.html",
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
           "hash": "nmvESSHhE/F8KlwSyoIM7fmW+QUbZ74iUQmi6ItM7MM="
         }
       },
       "is_incremental": false,
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-          "hash": "2pMiZi/Fvd1RFzyEfw0qAHkZgvqacesfNwn0EcWRWN4="
-        }
-      },
-      "is_incremental": true,
-=======
-          "hash": "nmvESSHhE/F8KlwSyoIM7fmW+QUbZ74iUQmi6ItM7MM="
-        }
-      },
-      "is_incremental": false,
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
       "version": ""
     },
     {
@@ -1867,30 +717,10 @@
       "output": {
         ".html": {
           "relative_path": "api/chia.dotnet.KeyringStatus.html",
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
           "hash": "g8padf/HpY2e9u6saxpmD9FET6R+aJJ1oeQedh8l+1s="
         }
       },
       "is_incremental": false,
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-          "hash": "WYi8DSzs9onMOAsxvbg6jB6a5WqEVza3lpTGBIV+n/M="
-        }
-      },
-      "is_incremental": true,
-=======
-          "hash": "g8padf/HpY2e9u6saxpmD9FET6R+aJJ1oeQedh8l+1s="
-        }
-      },
-      "is_incremental": false,
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
       "version": ""
     },
     {
@@ -1899,30 +729,10 @@
       "output": {
         ".html": {
           "relative_path": "api/chia.dotnet.Layer.html",
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
           "hash": "VYlCMYG6AvbWwvrE5LbRixp5lV/hE6gVnvYMAybVZ3s="
         }
       },
       "is_incremental": false,
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-          "hash": "4g6PSsz8ua9m3S/VrOSasgDt5kL0htwyFMjnUD6N39Q="
-        }
-      },
-      "is_incremental": true,
-=======
-          "hash": "VYlCMYG6AvbWwvrE5LbRixp5lV/hE6gVnvYMAybVZ3s="
-        }
-      },
-      "is_incremental": false,
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
       "version": ""
     },
     {
@@ -1931,30 +741,10 @@
       "output": {
         ".html": {
           "relative_path": "api/chia.dotnet.LineageProof.html",
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-          "hash": "hILlstSh/mZuDikBVKM1qNXMQ7FBJ5Rli2p4xqtiiug="
-        }
-      },
-      "is_incremental": false,
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-          "hash": "fnnOn9VGEl7i3L9xfqXskchW+zeG5Gs4R4BLZqB0FeI="
-        }
-      },
-      "is_incremental": true,
-=======
           "hash": "hILlstSh/mZuDikBVKM1qNXMQ7FBJ5Rli2p4xqtiiug="
         }
       },
       "is_incremental": false,
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
       "version": ""
     },
     {
@@ -1963,30 +753,10 @@
       "output": {
         ".html": {
           "relative_path": "api/chia.dotnet.MempoolInclusionStatus.html",
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
           "hash": "gbuJufvlojVEDcF4JkzzFVJ7PLYkpnMgpdJ/vj5Y4pM="
         }
       },
       "is_incremental": false,
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-          "hash": "jw1mbL4DgJI/11wbXMBwdcF8iI2sEU+k1spTgKhyzQ8="
-        }
-      },
-      "is_incremental": true,
-=======
-          "hash": "gbuJufvlojVEDcF4JkzzFVJ7PLYkpnMgpdJ/vj5Y4pM="
-        }
-      },
-      "is_incremental": false,
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
       "version": ""
     },
     {
@@ -1995,30 +765,10 @@
       "output": {
         ".html": {
           "relative_path": "api/chia.dotnet.MempoolItem.html",
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
           "hash": "tY8shGzHHoegKV6knuql81xYYlfCaUMvgmhq8XJJrcU="
         }
       },
       "is_incremental": false,
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-          "hash": "sl16V0nBxHpBa5YbtFcXKYwU/wDcg/f4+9f/ueazVFc="
-        }
-      },
-      "is_incremental": true,
-=======
-          "hash": "tY8shGzHHoegKV6knuql81xYYlfCaUMvgmhq8XJJrcU="
-        }
-      },
-      "is_incremental": false,
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
       "version": ""
     },
     {
@@ -2027,30 +777,10 @@
       "output": {
         ".html": {
           "relative_path": "api/chia.dotnet.MempoolMinFees.html",
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-          "hash": "cPTYo6lJoVpqwko5xrRR2eJjpRJJgaKXLKDbwYwQVok="
-        }
-      },
-      "is_incremental": false,
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-          "hash": "fq17/zztvbQkJat1DwWRbcnnqml0OHfeE9Y/daEirPs="
-        }
-      },
-      "is_incremental": true,
-=======
           "hash": "cPTYo6lJoVpqwko5xrRR2eJjpRJJgaKXLKDbwYwQVok="
         }
       },
       "is_incremental": false,
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
       "version": ""
     },
     {
@@ -2059,34 +789,10 @@
       "output": {
         ".html": {
           "relative_path": "api/chia.dotnet.Message.html",
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-          "hash": "fG43BgVOgvXioEDtWYhjCa3sKpOfJMHbvL7sIxEB7WQ="
-=======
           "hash": "rM0/qAADwqFuWjeg3AfoB9T+/7JeOk8s15tmf8MU/wA="
->>>>>>> main
         }
       },
       "is_incremental": false,
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-          "hash": "ih0W5UfLSFomnOrjzgRqjw9daWsJABL6KU4TKMAeerQ="
-        }
-      },
-      "is_incremental": true,
-=======
-          "hash": "fG43BgVOgvXioEDtWYhjCa3sKpOfJMHbvL7sIxEB7WQ="
-        }
-      },
-      "is_incremental": false,
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
       "version": ""
     },
     {
@@ -2095,30 +801,10 @@
       "output": {
         ".html": {
           "relative_path": "api/chia.dotnet.Mirror.html",
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
           "hash": "TfzcQNZZ1C70MJSgEGjzVgOzXszJsDFwlcFj3IvEqVU="
         }
       },
       "is_incremental": false,
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-          "hash": "2vzj0+kpYB0fC6i2D3stu4MKU+iWPAWKpxVhj0JACns="
-        }
-      },
-      "is_incremental": true,
-=======
-          "hash": "TfzcQNZZ1C70MJSgEGjzVgOzXszJsDFwlcFj3IvEqVU="
-        }
-      },
-      "is_incremental": false,
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
       "version": ""
     },
     {
@@ -2127,30 +813,10 @@
       "output": {
         ".html": {
           "relative_path": "api/chia.dotnet.NFTBulkMintingInfo.html",
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
           "hash": "mKv1mCwwhwJd0B1Zqc6Nq2639TYPqLIGPAyqVf4IM8g="
         }
       },
       "is_incremental": false,
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-          "hash": "M5VBtOzsgoJFy22+GqyeWiQzhi/nbKPwqpRYOJtj9tk="
-        }
-      },
-      "is_incremental": true,
-=======
-          "hash": "mKv1mCwwhwJd0B1Zqc6Nq2639TYPqLIGPAyqVf4IM8g="
-        }
-      },
-      "is_incremental": false,
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
       "version": ""
     },
     {
@@ -2159,30 +825,10 @@
       "output": {
         ".html": {
           "relative_path": "api/chia.dotnet.NFTInfo.html",
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-          "hash": "m2sVbK6Mcm1AscL0B+jpCJF8jzNxvewQno552w3M5nI="
-        }
-      },
-      "is_incremental": false,
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-          "hash": "P3yKJ3EE76RrkkhnmWvzyo8TjqNCcwRUranLPWj54sc="
-        }
-      },
-      "is_incremental": true,
-=======
           "hash": "m2sVbK6Mcm1AscL0B+jpCJF8jzNxvewQno552w3M5nI="
         }
       },
       "is_incremental": false,
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
       "version": ""
     },
     {
@@ -2191,30 +837,10 @@
       "output": {
         ".html": {
           "relative_path": "api/chia.dotnet.NFTMintingInfo.html",
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
           "hash": "TvgGb7Zf2nd+K+IADnYvoBYXoWo7FHUOxIOh+p2LCUM="
         }
       },
       "is_incremental": false,
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-          "hash": "izXooz2WDltpnm8CcLz2iq7Da+tVC9gTZXElgZy+lAk="
-        }
-      },
-      "is_incremental": true,
-=======
-          "hash": "TvgGb7Zf2nd+K+IADnYvoBYXoWo7FHUOxIOh+p2LCUM="
-        }
-      },
-      "is_incremental": false,
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
       "version": ""
     },
     {
@@ -2223,25 +849,7 @@
       "output": {
         ".html": {
           "relative_path": "api/chia.dotnet.NFTWallet.html",
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-          "hash": "VJtYOMaps9LP/3VGfVkC571m5HnpLnYbs61N/3Jj0cE="
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-          "hash": "NTyiTLnLU6X+xXECkduEzjuioZ1LuXs/5aQx5byacMc="
-=======
-          "hash": "VJtYOMaps9LP/3VGfVkC571m5HnpLnYbs61N/3Jj0cE="
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-=======
           "hash": "LWrXLMAsxq9D6jX5MfSgcUbuj8wxulxxEn7Wq/PqzII="
->>>>>>> main
         }
       },
       "is_incremental": false,
@@ -2253,30 +861,10 @@
       "output": {
         ".html": {
           "relative_path": "api/chia.dotnet.NPC.html",
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
           "hash": "TVG5E0gxCYSDXsSMhGcKuicWWyVK0KHpJYpR9czURE0="
         }
       },
       "is_incremental": false,
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-          "hash": "i0Pfd24k54W6rG5zrNOmHxOtfFDc4TVyokn19InzFkU="
-        }
-      },
-      "is_incremental": true,
-=======
-          "hash": "TVG5E0gxCYSDXsSMhGcKuicWWyVK0KHpJYpR9czURE0="
-        }
-      },
-      "is_incremental": false,
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
       "version": ""
     },
     {
@@ -2285,30 +873,10 @@
       "output": {
         ".html": {
           "relative_path": "api/chia.dotnet.NPCResult.html",
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-          "hash": "ZDJxATGneCtm810rVgrQOwmRdtOuTbKXEzsxTCvwIPk="
-        }
-      },
-      "is_incremental": false,
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-          "hash": "jkC9SMRCDIMsNF7rYlsdKmn2kkf5kYq+CyjrupTfuw0="
-        }
-      },
-      "is_incremental": true,
-=======
           "hash": "ZDJxATGneCtm810rVgrQOwmRdtOuTbKXEzsxTCvwIPk="
         }
       },
       "is_incremental": false,
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
       "version": ""
     },
     {
@@ -2317,30 +885,10 @@
       "output": {
         ".html": {
           "relative_path": "api/chia.dotnet.NftCoinInfo.html",
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-          "hash": "7wEWtj9yjeQKqxTyfMKqORRofUSTnwHRkeTSIfBOD5c="
-        }
-      },
-      "is_incremental": false,
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-          "hash": "tC/RJ96gNpVfT/FbySC8rwhtIvA72K0hSnUwIWGFVb4="
-        }
-      },
-      "is_incremental": true,
-=======
           "hash": "7wEWtj9yjeQKqxTyfMKqORRofUSTnwHRkeTSIfBOD5c="
         }
       },
       "is_incremental": false,
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
       "version": ""
     },
     {
@@ -2349,30 +897,10 @@
       "output": {
         ".html": {
           "relative_path": "api/chia.dotnet.NftMintEntry.html",
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
           "hash": "k412T6cfLPFFpxAqa2b5ybZbQMoBoiCiGTBVCLcKh28="
         }
       },
       "is_incremental": false,
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-          "hash": "iivaOiyW3Kyzjrh+zvlduLPcqWMWey/mxWdQZ4a4AuI="
-        }
-      },
-      "is_incremental": true,
-=======
-          "hash": "k412T6cfLPFFpxAqa2b5ybZbQMoBoiCiGTBVCLcKh28="
-        }
-      },
-      "is_incremental": false,
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
       "version": ""
     },
     {
@@ -2381,30 +909,10 @@
       "output": {
         ".html": {
           "relative_path": "api/chia.dotnet.NodeType.html",
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
           "hash": "KdK84Gygl1wXh/EXXDKru3MdFZwNWwikRDWvzSb5950="
         }
       },
       "is_incremental": false,
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-          "hash": "Ru1Ksg/+7CRp7RK+ZrGg8+iSVzZ1qt2GosXKHJuH9jQ="
-        }
-      },
-      "is_incremental": true,
-=======
-          "hash": "KdK84Gygl1wXh/EXXDKru3MdFZwNWwikRDWvzSb5950="
-        }
-      },
-      "is_incremental": false,
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
       "version": ""
     },
     {
@@ -2413,30 +921,10 @@
       "output": {
         ".html": {
           "relative_path": "api/chia.dotnet.OfferRecord.html",
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-          "hash": "5LDyQglcD/TBdB+Enj9ced2TfHeICpPg/775H8j+8G4="
-        }
-      },
-      "is_incremental": false,
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-          "hash": "cErpTMMDrlmgjrBSbDSz5JDhjPhFsEZ2Hafjkx2i+vM="
-        }
-      },
-      "is_incremental": true,
-=======
           "hash": "5LDyQglcD/TBdB+Enj9ced2TfHeICpPg/775H8j+8G4="
         }
       },
       "is_incremental": false,
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
       "version": ""
     },
     {
@@ -2445,30 +933,10 @@
       "output": {
         ".html": {
           "relative_path": "api/chia.dotnet.OfferStore.html",
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
           "hash": "elyAb3l3iznBXqEW5698PIOjVlNPRrh7Vyxpm5JhX7g="
         }
       },
       "is_incremental": false,
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-          "hash": "98bL+Qiwnjwdr8Fj5CtnVUdzgMUQr39cuDCbetkerRQ="
-        }
-      },
-      "is_incremental": true,
-=======
-          "hash": "elyAb3l3iznBXqEW5698PIOjVlNPRrh7Vyxpm5JhX7g="
-        }
-      },
-      "is_incremental": false,
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
       "version": ""
     },
     {
@@ -2477,30 +945,10 @@
       "output": {
         ".html": {
           "relative_path": "api/chia.dotnet.OfferSummary.html",
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
           "hash": "1/hhH46o2SOLB8xbyEeurPkXmB+4ETIFI6A9xxzzCpE="
         }
       },
       "is_incremental": false,
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-          "hash": "YaVDNrEs6qBQbXWSOTBHjrgFpugTb81eaJJrxT5ccq4="
-        }
-      },
-      "is_incremental": true,
-=======
-          "hash": "1/hhH46o2SOLB8xbyEeurPkXmB+4ETIFI6A9xxzzCpE="
-        }
-      },
-      "is_incremental": false,
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
       "version": ""
     },
     {
@@ -2509,30 +957,10 @@
       "output": {
         ".html": {
           "relative_path": "api/chia.dotnet.PaginatedPlotRequest.html",
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-          "hash": "9JGF+L4eWwmOtAb3CS+RIpWuVhO/C7898Y5AyvFZ9mg="
-        }
-      },
-      "is_incremental": false,
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-          "hash": "rjCdSA/4OhAI+3MmHwWiA6orSzIcZDk9wznWqGUUg0U="
-        }
-      },
-      "is_incremental": true,
-=======
           "hash": "9JGF+L4eWwmOtAb3CS+RIpWuVhO/C7898Y5AyvFZ9mg="
         }
       },
       "is_incremental": false,
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
       "version": ""
     },
     {
@@ -2541,30 +969,10 @@
       "output": {
         ".html": {
           "relative_path": "api/chia.dotnet.PassphraseRequirements.html",
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
           "hash": "BKtQZ6HoTyvUZJoft8uj5vrIrULGE9EzdY+rB6pQbdk="
         }
       },
       "is_incremental": false,
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-          "hash": "UOVYi4c5jx3dtZnu85HMB05hFLWctLA8FGJjptzxPqc="
-        }
-      },
-      "is_incremental": true,
-=======
-          "hash": "BKtQZ6HoTyvUZJoft8uj5vrIrULGE9EzdY+rB6pQbdk="
-        }
-      },
-      "is_incremental": false,
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
       "version": ""
     },
     {
@@ -2573,30 +981,10 @@
       "output": {
         ".html": {
           "relative_path": "api/chia.dotnet.PeerCounts.html",
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
           "hash": "8Xld0GZ1lfJA9qYjrGtr81l/F9yermIJeCkNi/skVKo="
         }
       },
       "is_incremental": false,
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-          "hash": "D96XuqwXhjHlqiVDarNXdCPWK4EamAt+1Lb6Bp7WkKw="
-        }
-      },
-      "is_incremental": true,
-=======
-          "hash": "8Xld0GZ1lfJA9qYjrGtr81l/F9yermIJeCkNi/skVKo="
-        }
-      },
-      "is_incremental": false,
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
       "version": ""
     },
     {
@@ -2605,30 +993,10 @@
       "output": {
         ".html": {
           "relative_path": "api/chia.dotnet.PlotInfo.html",
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
           "hash": "CNV6EPHZxxySwnzipfWHIR44k2VuVQjgP4ZYtxH3/fw="
         }
       },
       "is_incremental": false,
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-          "hash": "Lc68v0w8xgi/kzR+x2XR9aTn7aFC1rfGKzK0/wLL9eY="
-        }
-      },
-      "is_incremental": true,
-=======
-          "hash": "CNV6EPHZxxySwnzipfWHIR44k2VuVQjgP4ZYtxH3/fw="
-        }
-      },
-      "is_incremental": false,
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
       "version": ""
     },
     {
@@ -2637,30 +1005,10 @@
       "output": {
         ".html": {
           "relative_path": "api/chia.dotnet.PlotInfoRequestData.html",
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-          "hash": "Q0+ff6yvBWB4wQTtNOTE547nZMgPnoScK6VtBup/NUo="
-        }
-      },
-      "is_incremental": false,
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-          "hash": "09VJeedbi5n4KMqPIeghKADHKBCGKlDwFPQAuNXFgvs="
-        }
-      },
-      "is_incremental": true,
-=======
           "hash": "Q0+ff6yvBWB4wQTtNOTE547nZMgPnoScK6VtBup/NUo="
         }
       },
       "is_incremental": false,
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
       "version": ""
     },
     {
@@ -2669,30 +1017,10 @@
       "output": {
         ".html": {
           "relative_path": "api/chia.dotnet.PlotPathRequestData.html",
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
           "hash": "dyjEKD26HBOZzBxdhJt0s5GsPead4ECM2wivBkXt9eU="
         }
       },
       "is_incremental": false,
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-          "hash": "xsAU/2SWIjlO6vfJtbFPJqdeemWL4M+Af5dXGydeP7s="
-        }
-      },
-      "is_incremental": true,
-=======
-          "hash": "dyjEKD26HBOZzBxdhJt0s5GsPead4ECM2wivBkXt9eU="
-        }
-      },
-      "is_incremental": false,
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
       "version": ""
     },
     {
@@ -2701,30 +1029,10 @@
       "output": {
         ".html": {
           "relative_path": "api/chia.dotnet.PlotState.html",
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
           "hash": "TVggLxKinQVEERKzeNLU/7gNZxLOE5d8OV4dTCE+Y8I="
         }
       },
       "is_incremental": false,
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-          "hash": "S92PT7Y4kci+44lKRgOWVOrDHhgzHrFI11a8lBn+Un0="
-        }
-      },
-      "is_incremental": true,
-=======
-          "hash": "TVggLxKinQVEERKzeNLU/7gNZxLOE5d8OV4dTCE+Y8I="
-        }
-      },
-      "is_incremental": false,
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
       "version": ""
     },
     {
@@ -2733,30 +1041,10 @@
       "output": {
         ".html": {
           "relative_path": "api/chia.dotnet.PlotterConfig.html",
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-          "hash": "QWNdeGAeLar1sxvDrOvX9+izQ7qPvltw2JVGUUYyU54="
-        }
-      },
-      "is_incremental": false,
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-          "hash": "vHP1PckGCsbP3Q9so1mtIGVx2Jp1fjDE7lHq7nTLBi4="
-        }
-      },
-      "is_incremental": true,
-=======
           "hash": "QWNdeGAeLar1sxvDrOvX9+izQ7qPvltw2JVGUUYyU54="
         }
       },
       "is_incremental": false,
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
       "version": ""
     },
     {
@@ -2765,30 +1053,10 @@
       "output": {
         ".html": {
           "relative_path": "api/chia.dotnet.PlotterInfo.html",
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-          "hash": "PUF9M3dfvBaysA1vns78SVooTX0m5yoE09Z0aQ3gh+Q="
-        }
-      },
-      "is_incremental": false,
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-          "hash": "ORZfI6nOZdC82jdVVPBgqchB3kiO+DraQmK/twmfl8s="
-        }
-      },
-      "is_incremental": true,
-=======
           "hash": "PUF9M3dfvBaysA1vns78SVooTX0m5yoE09Z0aQ3gh+Q="
         }
       },
       "is_incremental": false,
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
       "version": ""
     },
     {
@@ -2797,21 +1065,7 @@
       "output": {
         ".html": {
           "relative_path": "api/chia.dotnet.PlotterProxy.html",
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
           "hash": "VSHsNFmpwveNNytBv+thTqOMwdRurt6L3Rv2ihFXITU="
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-          "hash": "hbTx5P1SEIG6kQT5L63CxDYjPfyL4bk3eNvHR1AwFsM="
-=======
-          "hash": "VSHsNFmpwveNNytBv+thTqOMwdRurt6L3Rv2ihFXITU="
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
         }
       },
       "is_incremental": false,
@@ -2823,30 +1077,10 @@
       "output": {
         ".html": {
           "relative_path": "api/chia.dotnet.PluginStatus.html",
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
           "hash": "DFTYqrpTvJvKqgrnCe0Nq7/OY5KPxrhT1KAuelYn48s="
         }
       },
       "is_incremental": false,
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-          "hash": "3UkktxB4JMVL6sZBPjAB/16gOx1gHx9UuLg0xTVTqAI="
-        }
-      },
-      "is_incremental": true,
-=======
-          "hash": "DFTYqrpTvJvKqgrnCe0Nq7/OY5KPxrhT1KAuelYn48s="
-        }
-      },
-      "is_incremental": false,
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
       "version": ""
     },
     {
@@ -2855,30 +1089,10 @@
       "output": {
         ".html": {
           "relative_path": "api/chia.dotnet.PoolInfo.html",
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
           "hash": "0Ps6c9J9qFRTkPBOtHVzamSD7ujTdTzbn2zVUcInaxU="
         }
       },
       "is_incremental": false,
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-          "hash": "q4qiAHXbJ/7iDO6MZM39OfPnhVgp3hxHJG4jeYtMVXs="
-        }
-      },
-      "is_incremental": true,
-=======
-          "hash": "0Ps6c9J9qFRTkPBOtHVzamSD7ujTdTzbn2zVUcInaxU="
-        }
-      },
-      "is_incremental": false,
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
       "version": ""
     },
     {
@@ -2887,30 +1101,10 @@
       "output": {
         ".html": {
           "relative_path": "api/chia.dotnet.PoolPoint.html",
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-          "hash": "M73+Eg6VVqexudhJhaS/QnFRiOyb9unijj5N3060PW8="
-        }
-      },
-      "is_incremental": false,
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-          "hash": "MvS4DPIC9oZFIfaNBiIMQkhXFe19si0CvyCIh+BHAl0="
-        }
-      },
-      "is_incremental": true,
-=======
           "hash": "M73+Eg6VVqexudhJhaS/QnFRiOyb9unijj5N3060PW8="
         }
       },
       "is_incremental": false,
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
       "version": ""
     },
     {
@@ -2919,30 +1113,10 @@
       "output": {
         ".html": {
           "relative_path": "api/chia.dotnet.PoolSingletonState.html",
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
           "hash": "8sIgkw3Ir8nV9X+c0Q6BpEMoC661iw7rOCTunGsxQq4="
         }
       },
       "is_incremental": false,
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-          "hash": "NG6+lk4ESWNMabZ0FYsyQBxmzYs6i5mlgrX5vRB4gB4="
-        }
-      },
-      "is_incremental": true,
-=======
-          "hash": "8sIgkw3Ir8nV9X+c0Q6BpEMoC661iw7rOCTunGsxQq4="
-        }
-      },
-      "is_incremental": false,
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
       "version": ""
     },
     {
@@ -2951,30 +1125,10 @@
       "output": {
         ".html": {
           "relative_path": "api/chia.dotnet.PoolState.html",
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
           "hash": "dAQqifPAO6lHT1hKbMiBN1JMcOLKcGsvRtjukv1st3Y="
         }
       },
       "is_incremental": false,
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-          "hash": "8fxLN+SQU94CxFacPEEUPqe9xPBWcGuhhYka1huzk7s="
-        }
-      },
-      "is_incremental": true,
-=======
-          "hash": "dAQqifPAO6lHT1hKbMiBN1JMcOLKcGsvRtjukv1st3Y="
-        }
-      },
-      "is_incremental": false,
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
       "version": ""
     },
     {
@@ -2983,30 +1137,10 @@
       "output": {
         ".html": {
           "relative_path": "api/chia.dotnet.PoolStateInfo.html",
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-          "hash": "HFFxQOZ6pb7SHYkQiIj4Fxj8Df9c2p3YauWsgYXQhSY="
-        }
-      },
-      "is_incremental": false,
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-          "hash": "+kLv5FpJ0gF3HPlj33qev5VByL9KN478SC6YZVoPog0="
-        }
-      },
-      "is_incremental": true,
-=======
           "hash": "HFFxQOZ6pb7SHYkQiIj4Fxj8Df9c2p3YauWsgYXQhSY="
         }
       },
       "is_incremental": false,
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
       "version": ""
     },
     {
@@ -3015,30 +1149,10 @@
       "output": {
         ".html": {
           "relative_path": "api/chia.dotnet.PoolTarget.html",
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-          "hash": "zsvz9Ftjk0TrLjiO7yvxYSE7t9SiW5CxONO3cZdfA8Y="
-        }
-      },
-      "is_incremental": false,
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-          "hash": "ZLIa4DKxvf2oQ4jwqXzQtwzp4z9/D9gB+g/ROk4dgsQ="
-        }
-      },
-      "is_incremental": true,
-=======
           "hash": "zsvz9Ftjk0TrLjiO7yvxYSE7t9SiW5CxONO3cZdfA8Y="
         }
       },
       "is_incremental": false,
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
       "version": ""
     },
     {
@@ -3047,25 +1161,7 @@
       "output": {
         ".html": {
           "relative_path": "api/chia.dotnet.PoolWallet.html",
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-          "hash": "Yyqv/4CpxqGrljc396Ei5Bo6nGjXmbDg7zsDdKWcipw="
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-          "hash": "+6jZiOGi0QESUJY5JCpkLw3OGgyKhb/Ff1Ey9KLM6GM="
-=======
-          "hash": "Yyqv/4CpxqGrljc396Ei5Bo6nGjXmbDg7zsDdKWcipw="
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-=======
           "hash": "Z5li2a0diatb2MjHYdW72QYCH5tSRpUvVu7S4lN+eAU="
->>>>>>> main
         }
       },
       "is_incremental": false,
@@ -3077,30 +1173,10 @@
       "output": {
         ".html": {
           "relative_path": "api/chia.dotnet.PoolWalletConfig.html",
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
           "hash": "kCjScxLCXOCkcoHHfkqPQ0IOT2U0MtdZRq6G6xAMdC8="
         }
       },
       "is_incremental": false,
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-          "hash": "0c7is5XD9GXY+TJJglTHeUrmOlhNo01uJ3FozaE9F08="
-        }
-      },
-      "is_incremental": true,
-=======
-          "hash": "kCjScxLCXOCkcoHHfkqPQ0IOT2U0MtdZRq6G6xAMdC8="
-        }
-      },
-      "is_incremental": false,
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
       "version": ""
     },
     {
@@ -3109,30 +1185,10 @@
       "output": {
         ".html": {
           "relative_path": "api/chia.dotnet.PoolWalletInfo.html",
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
           "hash": "UqQYNs/j3fW3KSv73mV8GvVfsqZ/L8ohFGgo6IGMtkE="
         }
       },
       "is_incremental": false,
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-          "hash": "b+EYQFa/DLzSrPnJ90R3+hGBqLYmI75TSxgKV0R/x68="
-        }
-      },
-      "is_incremental": true,
-=======
-          "hash": "UqQYNs/j3fW3KSv73mV8GvVfsqZ/L8ohFGgo6IGMtkE="
-        }
-      },
-      "is_incremental": false,
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
       "version": ""
     },
     {
@@ -3141,30 +1197,10 @@
       "output": {
         ".html": {
           "relative_path": "api/chia.dotnet.PrivateKey.html",
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-          "hash": "XQsiBJhrRO4Vgm0uVW5TrnTY3hQEaZ9X6Bf4ztJIytE="
-        }
-      },
-      "is_incremental": false,
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-          "hash": "SnU2ptkEHJ1PRvlDO/LJ18Vvzk7pVX3HmKOaZ30Frzw="
-        }
-      },
-      "is_incremental": true,
-=======
           "hash": "XQsiBJhrRO4Vgm0uVW5TrnTY3hQEaZ9X6Bf4ztJIytE="
         }
       },
       "is_incremental": false,
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
       "version": ""
     },
     {
@@ -3173,30 +1209,10 @@
       "output": {
         ".html": {
           "relative_path": "api/chia.dotnet.PrivateKeyData.html",
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
           "hash": "ZZVFsKhJXAioXWUZ3Y6JqYlSHyjTlphgC0F/5gfAnuQ="
         }
       },
       "is_incremental": false,
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-          "hash": "ICzCUrTaeP9SSSgiWyigD0y41lV/gEK5J3NvkmKATaE="
-        }
-      },
-      "is_incremental": true,
-=======
-          "hash": "ZZVFsKhJXAioXWUZ3Y6JqYlSHyjTlphgC0F/5gfAnuQ="
-        }
-      },
-      "is_incremental": false,
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
       "version": ""
     },
     {
@@ -3205,30 +1221,10 @@
       "output": {
         ".html": {
           "relative_path": "api/chia.dotnet.Proof.html",
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
           "hash": "IJpkFIP/0Qk7+BPH8Gl73aZ+wM0jGkrRYaspzxOguXE="
         }
       },
       "is_incremental": false,
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-          "hash": "Puuho1ueryObDORNm6iXYHDjakJYHj4LvWpsecc9Tsc="
-        }
-      },
-      "is_incremental": true,
-=======
-          "hash": "IJpkFIP/0Qk7+BPH8Gl73aZ+wM0jGkrRYaspzxOguXE="
-        }
-      },
-      "is_incremental": false,
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
       "version": ""
     },
     {
@@ -3237,30 +1233,10 @@
       "output": {
         ".html": {
           "relative_path": "api/chia.dotnet.ProofOfSpace.html",
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-          "hash": "d3Ibbjt/hN56SI7hEV3HTSjsA1M1Iwd4NCY+hD9Nzj0="
-        }
-      },
-      "is_incremental": false,
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-          "hash": "oxElSDdaU/oDrbovfWbGnFGysRDfDavOeFZLOlgHV9g="
-        }
-      },
-      "is_incremental": true,
-=======
           "hash": "d3Ibbjt/hN56SI7hEV3HTSjsA1M1Iwd4NCY+hD9Nzj0="
         }
       },
       "is_incremental": false,
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
       "version": ""
     },
     {
@@ -3269,30 +1245,10 @@
       "output": {
         ".html": {
           "relative_path": "api/chia.dotnet.PuzzleAnnouncement.html",
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-          "hash": "YRhjZz4I834GH2kmmZMRDfrOUVn4aNjEv/oDPwl50vI="
-        }
-      },
-      "is_incremental": false,
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-          "hash": "mmN151HqKkTNJWt/dPOjyjUbMlA+juf4OzctBPrZjjo="
-        }
-      },
-      "is_incremental": true,
-=======
           "hash": "YRhjZz4I834GH2kmmZMRDfrOUVn4aNjEv/oDPwl50vI="
         }
       },
       "is_incremental": false,
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
       "version": ""
     },
     {
@@ -3301,30 +1257,10 @@
       "output": {
         ".html": {
           "relative_path": "api/chia.dotnet.QueuedPlotInfo.html",
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
           "hash": "kanD/0S0ursGexO14nZ++ZsYm2Sdym6ZhefoKP9KjmA="
         }
       },
       "is_incremental": false,
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-          "hash": "p8VuMTwfxLyc/rvRFI4j73rQYjy1WaD9rpoEw8bAt0c="
-        }
-      },
-      "is_incremental": true,
-=======
-          "hash": "kanD/0S0ursGexO14nZ++ZsYm2Sdym6ZhefoKP9KjmA="
-        }
-      },
-      "is_incremental": false,
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
       "version": ""
     },
     {
@@ -3333,30 +1269,10 @@
       "output": {
         ".html": {
           "relative_path": "api/chia.dotnet.ResponseException.html",
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
           "hash": "8EJ4Ve1Am6Rp6r0EUAfhCRD/hJDxmGYbZXzqodg5Z0E="
         }
       },
       "is_incremental": false,
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-          "hash": "Vz3Gh/GN72flMRgCtleaw9tedArXWfObvXd7euNvQ0Q="
-        }
-      },
-      "is_incremental": true,
-=======
-          "hash": "8EJ4Ve1Am6Rp6r0EUAfhCRD/hJDxmGYbZXzqodg5Z0E="
-        }
-      },
-      "is_incremental": false,
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
       "version": ""
     },
     {
@@ -3365,30 +1281,10 @@
       "output": {
         ".html": {
           "relative_path": "api/chia.dotnet.RewardChainBlock.html",
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-          "hash": "pJqIm7QgqOxUoYpOByQlxMOPfZkNCFielGT8V6SaJS4="
-        }
-      },
-      "is_incremental": false,
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-          "hash": "I71kGZGKpzxzE01NJKnPnHn7/OFW/BcHZi47K+9u0eU="
-        }
-      },
-      "is_incremental": true,
-=======
           "hash": "pJqIm7QgqOxUoYpOByQlxMOPfZkNCFielGT8V6SaJS4="
         }
       },
       "is_incremental": false,
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
       "version": ""
     },
     {
@@ -3397,30 +1293,10 @@
       "output": {
         ".html": {
           "relative_path": "api/chia.dotnet.RewardChainBlockUnfinished.html",
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
           "hash": "f5pZ0J1Rp9292cAFdZCnCahhWpO/Jwr2p14cDLMKzYA="
         }
       },
       "is_incremental": false,
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-          "hash": "t26VACI+6f45dR6CvTBfARi71MPFYANqbSk38ooNwOM="
-        }
-      },
-      "is_incremental": true,
-=======
-          "hash": "f5pZ0J1Rp9292cAFdZCnCahhWpO/Jwr2p14cDLMKzYA="
-        }
-      },
-      "is_incremental": false,
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
       "version": ""
     },
     {
@@ -3429,62 +1305,22 @@
       "output": {
         ".html": {
           "relative_path": "api/chia.dotnet.RewardChainSubSlot.html",
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
           "hash": "TCbb4Vc+5IL23d1mxXYBMkOKlfvfv4JUmu1WVgxYCC8="
         }
       },
       "is_incremental": false,
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-          "hash": "LNLtfKKJ8lNSO2vXcrmUoR65WqpEc3J1BbP64lejsEY="
-        }
-      },
-      "is_incremental": true,
-=======
-          "hash": "TCbb4Vc+5IL23d1mxXYBMkOKlfvfv4JUmu1WVgxYCC8="
-        }
-      },
-      "is_incremental": false,
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
       "version": ""
     },
     {
       "type": "ManagedReference",
       "source_relative_path": "api/chia.dotnet.Root.yml",
       "output": {
-        ".html": {
-          "relative_path": "api/chia.dotnet.Root.html",
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-          "hash": "VOd5xOTot1FnUo2Q5L/81zBCnPSqwuPlvNaoV8hRQD4="
-        }
-      },
-      "is_incremental": false,
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-          "hash": "P8ahWW482HkFblvtkA/0JgXLw1EPtotsSydDMlp2T0g="
-        }
-      },
-      "is_incremental": true,
-=======
+        ".html": {
+          "relative_path": "api/chia.dotnet.Root.html",
           "hash": "VOd5xOTot1FnUo2Q5L/81zBCnPSqwuPlvNaoV8hRQD4="
         }
       },
       "is_incremental": false,
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
       "version": ""
     },
     {
@@ -3493,30 +1329,10 @@
       "output": {
         ".html": {
           "relative_path": "api/chia.dotnet.RootHash.html",
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-          "hash": "zPj/ugxsdnUaMu82zs5ldmXrrbA4QmBcOvkreuxww4k="
-        }
-      },
-      "is_incremental": false,
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-          "hash": "NR5JkW7ZA+evT2IaOJSl7++j6I/r2GAKvSh4lRnJskQ="
-        }
-      },
-      "is_incremental": true,
-=======
           "hash": "zPj/ugxsdnUaMu82zs5ldmXrrbA4QmBcOvkreuxww4k="
         }
       },
       "is_incremental": false,
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
       "version": ""
     },
     {
@@ -3525,30 +1341,10 @@
       "output": {
         ".html": {
           "relative_path": "api/chia.dotnet.RootHistory.html",
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
           "hash": "NTmD9cWBYkk8JEaHgdc8p+xzFZHfXFFs4fbKq28Ep40="
         }
       },
       "is_incremental": false,
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-          "hash": "y0AXRqRT8dG8mKD6O2X9RsteakkmQYZ/nPsadeToX0A="
-        }
-      },
-      "is_incremental": true,
-=======
-          "hash": "NTmD9cWBYkk8JEaHgdc8p+xzFZHfXFFs4fbKq28Ep40="
-        }
-      },
-      "is_incremental": false,
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
       "version": ""
     },
     {
@@ -3557,30 +1353,10 @@
       "output": {
         ".html": {
           "relative_path": "api/chia.dotnet.RoyaltyAsset.html",
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-          "hash": "Ns8jwtv/XD0Dwu+U7br81MrMMn/TttMhNjxlESvlW1k="
-        }
-      },
-      "is_incremental": false,
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-          "hash": "H+BlS6nJSw1I5zq8uK3kxYBmV+lOIzhf4p9IENWESwo="
-        }
-      },
-      "is_incremental": true,
-=======
           "hash": "Ns8jwtv/XD0Dwu+U7br81MrMMn/TttMhNjxlESvlW1k="
         }
       },
       "is_incremental": false,
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
       "version": ""
     },
     {
@@ -3589,30 +1365,10 @@
       "output": {
         ".html": {
           "relative_path": "api/chia.dotnet.SendPeer.html",
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-          "hash": "g4/h6ysjKTdl0cw0GAortp27tqqDrQ6Xd9PhtFvsVdM="
-        }
-      },
-      "is_incremental": false,
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-          "hash": "l+r0d+FhL/HVB0rjXqkryFc29DIsl/3/VEeNhjjB54M="
-        }
-      },
-      "is_incremental": true,
-=======
           "hash": "g4/h6ysjKTdl0cw0GAortp27tqqDrQ6Xd9PhtFvsVdM="
         }
       },
       "is_incremental": false,
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
       "version": ""
     },
     {
@@ -3621,30 +1377,10 @@
       "output": {
         ".html": {
           "relative_path": "api/chia.dotnet.ServiceNames.html",
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-          "hash": "ys1/5ZOoVV1nohYwVS5RpuwQ9L9mpFegFsjg4xVnUXo="
-        }
-      },
-      "is_incremental": false,
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-          "hash": "LpkznHHmke+Pm7gt62y1tSJpOEQjP2eMWBOiU/uzCyI="
-        }
-      },
-      "is_incremental": true,
-=======
           "hash": "ys1/5ZOoVV1nohYwVS5RpuwQ9L9mpFegFsjg4xVnUXo="
         }
       },
       "is_incremental": false,
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
       "version": ""
     },
     {
@@ -3653,21 +1389,7 @@
       "output": {
         ".html": {
           "relative_path": "api/chia.dotnet.ServiceProxy.html",
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
           "hash": "uLwG53x5mzwTT+kAaCGIB7e109NxJaRLBMvfH97jJC0="
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-          "hash": "sCRiGvT5hGL4SmTW78w3dCxd81Eo9NrcC2ydXqp5CSs="
-=======
-          "hash": "uLwG53x5mzwTT+kAaCGIB7e109NxJaRLBMvfH97jJC0="
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
         }
       },
       "is_incremental": false,
@@ -3679,30 +1401,10 @@
       "output": {
         ".html": {
           "relative_path": "api/chia.dotnet.Side.html",
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-          "hash": "MRDwxXoxYakWs3j1pePY/oVlj92+o0tt82va7ICZEQE="
-        }
-      },
-      "is_incremental": false,
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-          "hash": "whupwTPpS7roZ9Ut/KMn3YwPLMNJleaL4NQ7PqL+HaA="
-        }
-      },
-      "is_incremental": true,
-=======
           "hash": "MRDwxXoxYakWs3j1pePY/oVlj92+o0tt82va7ICZEQE="
         }
       },
       "is_incremental": false,
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
       "version": ""
     },
     {
@@ -3711,30 +1413,10 @@
       "output": {
         ".html": {
           "relative_path": "api/chia.dotnet.SignagePoint.html",
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-          "hash": "p192D2gxerMIpvAXmYLkIUeJBCY/eevEtFVISd9bAmg="
-        }
-      },
-      "is_incremental": false,
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-          "hash": "q0lTlQUDySIfzMR2NXD7HpqRNTagHmv13wPCJGAQ3zA="
-        }
-      },
-      "is_incremental": true,
-=======
           "hash": "p192D2gxerMIpvAXmYLkIUeJBCY/eevEtFVISd9bAmg="
         }
       },
       "is_incremental": false,
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
       "version": ""
     },
     {
@@ -3743,34 +1425,10 @@
       "output": {
         ".html": {
           "relative_path": "api/chia.dotnet.SingletonInfo.html",
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-          "hash": "YlXiKieTnGPDrlo2ip91wGb9FoBbkYdLyxPQeySc6ew="
-=======
           "hash": "V4lFRRYwWrdyRXcprWje94lC4PumGO9Vf/GQsbD5Eb0="
->>>>>>> main
-        }
-      },
-      "is_incremental": false,
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-          "hash": "cunO8WtU41yjBJe0OouQTkcGjG3b4Mq8KU6WB3xqfLU="
-        }
-      },
-      "is_incremental": true,
-=======
-          "hash": "YlXiKieTnGPDrlo2ip91wGb9FoBbkYdLyxPQeySc6ew="
         }
       },
       "is_incremental": false,
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
       "version": ""
     },
     {
@@ -3779,34 +1437,10 @@
       "output": {
         ".html": {
           "relative_path": "api/chia.dotnet.SingletonRecord.html",
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-          "hash": "32DTlJYBQLXacUkiRA3LVXGDodIt7fvttTgi2C0IGWU="
-=======
           "hash": "BsL0OpXJMkKlQXkizXHOjcP26TWLpTT1pX6FwyRKfk0="
->>>>>>> main
-        }
-      },
-      "is_incremental": false,
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-          "hash": "kmG1Jw9cgc2P8NSepGLIcOXF2jmfwYuahXc+/dSjbjg="
-        }
-      },
-      "is_incremental": true,
-=======
-          "hash": "32DTlJYBQLXacUkiRA3LVXGDodIt7fvttTgi2C0IGWU="
         }
       },
       "is_incremental": false,
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
       "version": ""
     },
     {
@@ -3815,30 +1449,10 @@
       "output": {
         ".html": {
           "relative_path": "api/chia.dotnet.SpendBundle.html",
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-          "hash": "uZdQ8JoidEzDlnADoCgRXAWgH3qnH9/7RIcQjwmK2wQ="
-        }
-      },
-      "is_incremental": false,
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-          "hash": "OxmMREGrjbMklFhgdmRQiYbFrKoMbdQDrCs64ohY/oQ="
-        }
-      },
-      "is_incremental": true,
-=======
           "hash": "uZdQ8JoidEzDlnADoCgRXAWgH3qnH9/7RIcQjwmK2wQ="
         }
       },
       "is_incremental": false,
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
       "version": ""
     },
     {
@@ -3847,30 +1461,10 @@
       "output": {
         ".html": {
           "relative_path": "api/chia.dotnet.StoreProofs.html",
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-          "hash": "CF8UtB8oZIhwh7YfKk3zK9lHGe48MD2TBT3p5CuMAYI="
-        }
-      },
-      "is_incremental": false,
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-          "hash": "RJhiHFSP7hqIXsSJm3DquBwjEkJFtKrb/PUyoQ+5ZLo="
-        }
-      },
-      "is_incremental": true,
-=======
           "hash": "CF8UtB8oZIhwh7YfKk3zK9lHGe48MD2TBT3p5CuMAYI="
         }
       },
       "is_incremental": false,
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
       "version": ""
     },
     {
@@ -3879,30 +1473,10 @@
       "output": {
         ".html": {
           "relative_path": "api/chia.dotnet.SubEpochSummary.html",
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-          "hash": "Z92pB0App2w3LLWCH3FD+hOCB0V+ZtCk8XU4S2JcYAk="
-        }
-      },
-      "is_incremental": false,
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-          "hash": "1LXYoxzxM8iwm8YjwQYOAjPqjewN2Iy9VKEitxwEjMY="
-        }
-      },
-      "is_incremental": true,
-=======
           "hash": "Z92pB0App2w3LLWCH3FD+hOCB0V+ZtCk8XU4S2JcYAk="
         }
       },
       "is_incremental": false,
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
       "version": ""
     },
     {
@@ -3911,30 +1485,10 @@
       "output": {
         ".html": {
           "relative_path": "api/chia.dotnet.SubSlotProofs.html",
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-          "hash": "4hPkn8qyCkdgUYkj9Y+QNI+9/UZndHPWqnZdg61pjqM="
-        }
-      },
-      "is_incremental": false,
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-          "hash": "hz/BngRn6oy/Ug7IYQOYcFQW1w1QBo5jwvQMkfG08/g="
-        }
-      },
-      "is_incremental": true,
-=======
           "hash": "4hPkn8qyCkdgUYkj9Y+QNI+9/UZndHPWqnZdg61pjqM="
         }
       },
       "is_incremental": false,
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
       "version": ""
     },
     {
@@ -3943,30 +1497,10 @@
       "output": {
         ".html": {
           "relative_path": "api/chia.dotnet.SyncState.html",
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-          "hash": "Cq0KkpKOAS7LmDmcGXmcnhcndjEmAIQNrjt3WETEcnU="
-        }
-      },
-      "is_incremental": false,
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-          "hash": "ZQKDuKqygAcSKuhnQVcltR71xVOKYxcOy5ynPE3sBX0="
-        }
-      },
-      "is_incremental": true,
-=======
           "hash": "Cq0KkpKOAS7LmDmcGXmcnhcndjEmAIQNrjt3WETEcnU="
         }
       },
       "is_incremental": false,
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
       "version": ""
     },
     {
@@ -3975,30 +1509,10 @@
       "output": {
         ".html": {
           "relative_path": "api/chia.dotnet.TerminalNode.html",
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-          "hash": "LJQu5t3To6Zayd2pWdASNSgsxax0i5/+p60qOosW8SY="
-        }
-      },
-      "is_incremental": false,
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-          "hash": "zAeavMRX/+cGOfFsqwEkf0n1t/kQMA7oNebX12WCmXo="
-        }
-      },
-      "is_incremental": true,
-=======
           "hash": "LJQu5t3To6Zayd2pWdASNSgsxax0i5/+p60qOosW8SY="
         }
       },
       "is_incremental": false,
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
       "version": ""
     },
     {
@@ -4007,30 +1521,10 @@
       "output": {
         ".html": {
           "relative_path": "api/chia.dotnet.Token.html",
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-          "hash": "iLBQtVAo1yFs/KPzhuuAzmW8WZj1A5QhEM0mDthdviM="
-        }
-      },
-      "is_incremental": false,
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-          "hash": "BcoVeBIppnnRCBw4baH2MVs6bLSOnkhW6CtUniA474o="
-        }
-      },
-      "is_incremental": true,
-=======
           "hash": "iLBQtVAo1yFs/KPzhuuAzmW8WZj1A5QhEM0mDthdviM="
         }
       },
       "is_incremental": false,
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
       "version": ""
     },
     {
@@ -4039,25 +1533,7 @@
       "output": {
         ".html": {
           "relative_path": "api/chia.dotnet.TradeManager.html",
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-          "hash": "EIwbLXy3JdvqJIIz7OH0chovo1PZcX8sLpUZYVVygsY="
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-          "hash": "D4oHWsNlYnpdB7TBQOScUHG9NtNG99QWpKWWN+0j7Bs="
-=======
-          "hash": "EIwbLXy3JdvqJIIz7OH0chovo1PZcX8sLpUZYVVygsY="
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-=======
           "hash": "8XGD9Q7mQ0rbDMZ6i/9rYTvsFwAPgY4pC0M6FvwyZVw="
->>>>>>> main
         }
       },
       "is_incremental": false,
@@ -4069,30 +1545,10 @@
       "output": {
         ".html": {
           "relative_path": "api/chia.dotnet.TradeRecord.html",
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-          "hash": "+n/qKtz0OKNGxXeLw8yrT2flFh+POHNuNkE11NWW7oU="
-        }
-      },
-      "is_incremental": false,
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-          "hash": "fNGjsde9M553zfrPcTilqSXH65qfoSvW3NWsvcLpz9U="
-        }
-      },
-      "is_incremental": true,
-=======
           "hash": "+n/qKtz0OKNGxXeLw8yrT2flFh+POHNuNkE11NWW7oU="
         }
       },
       "is_incremental": false,
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
       "version": ""
     },
     {
@@ -4101,30 +1557,10 @@
       "output": {
         ".html": {
           "relative_path": "api/chia.dotnet.TradeStatus.html",
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-          "hash": "ctIiEQwFTSyM+H3tDRrLzoCG8EoAPYnYYU0Fa26bsmY="
-        }
-      },
-      "is_incremental": false,
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-          "hash": "8c2b3ArrRPJlVDgxR7miFXvidaS+Vl4QD02ORVlz6J8="
-        }
-      },
-      "is_incremental": true,
-=======
           "hash": "ctIiEQwFTSyM+H3tDRrLzoCG8EoAPYnYYU0Fa26bsmY="
         }
       },
       "is_incremental": false,
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
       "version": ""
     },
     {
@@ -4133,30 +1569,10 @@
       "output": {
         ".html": {
           "relative_path": "api/chia.dotnet.TransactionRecord.html",
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-          "hash": "DP8Dn0vQuh7QBz7PmyYCMJhYRDlxzcxhj78qjUqF28c="
-        }
-      },
-      "is_incremental": false,
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-          "hash": "qtTyqfrdXNZaKPSUEk5mUiZSrRBBI+sPaGaN9mWeyrk="
-        }
-      },
-      "is_incremental": true,
-=======
           "hash": "DP8Dn0vQuh7QBz7PmyYCMJhYRDlxzcxhj78qjUqF28c="
         }
       },
       "is_incremental": false,
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
       "version": ""
     },
     {
@@ -4165,30 +1581,10 @@
       "output": {
         ".html": {
           "relative_path": "api/chia.dotnet.TransactionType.html",
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-          "hash": "3D3JzYUgN2hjasd8HKkYon4LvupTdOaJ0AaqMlNpZCw="
-        }
-      },
-      "is_incremental": false,
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-          "hash": "oxuIpgwfWIBt8fAdKV6enNng9+c8/kNCs5KlfHMSSNI="
-        }
-      },
-      "is_incremental": true,
-=======
           "hash": "3D3JzYUgN2hjasd8HKkYon4LvupTdOaJ0AaqMlNpZCw="
         }
       },
       "is_incremental": false,
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
       "version": ""
     },
     {
@@ -4197,30 +1593,10 @@
       "output": {
         ".html": {
           "relative_path": "api/chia.dotnet.TransactionTypeFilter.html",
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-          "hash": "Q88wVX6E/jtV1MH1LcGEjh976yfI+kbCo+JpkaEHVao="
-        }
-      },
-      "is_incremental": false,
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-          "hash": "rSocl5w6HQbP+FNGM1X/foAhnCSgZIeUP1K/HMBYuyw="
-        }
-      },
-      "is_incremental": true,
-=======
           "hash": "Q88wVX6E/jtV1MH1LcGEjh976yfI+kbCo+JpkaEHVao="
         }
       },
       "is_incremental": false,
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
       "version": ""
     },
     {
@@ -4229,30 +1605,10 @@
       "output": {
         ".html": {
           "relative_path": "api/chia.dotnet.TransactionsInfo.html",
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-          "hash": "IntXiJ5C9HZ0a3txtEyJdr/IZF7Ru7c+3OOahEhOWdM="
-        }
-      },
-      "is_incremental": false,
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-          "hash": "6CZiLlweBuyJuXguqFGaCR2b9nX6Qa7dKVVmjh7MzKE="
-        }
-      },
-      "is_incremental": true,
-=======
           "hash": "IntXiJ5C9HZ0a3txtEyJdr/IZF7Ru7c+3OOahEhOWdM="
         }
       },
       "is_incremental": false,
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
       "version": ""
     },
     {
@@ -4261,30 +1617,10 @@
       "output": {
         ".html": {
           "relative_path": "api/chia.dotnet.UInt32Range.html",
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-          "hash": "8ft3jK5gB6tFB5Mecxq/ZCgneIxhntaFtZb7wlUTtSg="
-        }
-      },
-      "is_incremental": false,
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-          "hash": "q/BItJhMv6kmpEeFUtAklqRA8rObMsXhZIb9fFZLW+8="
-        }
-      },
-      "is_incremental": true,
-=======
           "hash": "8ft3jK5gB6tFB5Mecxq/ZCgneIxhntaFtZb7wlUTtSg="
         }
       },
       "is_incremental": false,
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
       "version": ""
     },
     {
@@ -4293,30 +1629,10 @@
       "output": {
         ".html": {
           "relative_path": "api/chia.dotnet.UInt64Range.html",
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-          "hash": "8dv1xO/1N2D1V9KxFTdNEF2HtCKkmJBZQBMIweFbPk4="
-        }
-      },
-      "is_incremental": false,
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-          "hash": "8lJd2kOhYFEaQiltNNYxV5UfxzduuzdCLi6l3TdBEgY="
-        }
-      },
-      "is_incremental": true,
-=======
           "hash": "8dv1xO/1N2D1V9KxFTdNEF2HtCKkmJBZQBMIweFbPk4="
         }
       },
       "is_incremental": false,
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
       "version": ""
     },
     {
@@ -4325,30 +1641,10 @@
       "output": {
         ".html": {
           "relative_path": "api/chia.dotnet.UnfinishedHeaderBlock.html",
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-          "hash": "B4kl4d5t0oLxJLuAsrsqI4z7ql8/AV6Kc3e4ajyRIDA="
-        }
-      },
-      "is_incremental": false,
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-          "hash": "PBJ23R3/aZAv2bAGgFGAOCK6HGcesqEp9gMvCVJh4N0="
-        }
-      },
-      "is_incremental": true,
-=======
           "hash": "B4kl4d5t0oLxJLuAsrsqI4z7ql8/AV6Kc3e4ajyRIDA="
         }
       },
       "is_incremental": false,
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
       "version": ""
     },
     {
@@ -4357,30 +1653,10 @@
       "output": {
         ".html": {
           "relative_path": "api/chia.dotnet.VCLineageProof.html",
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-          "hash": "pSDMjPXU3dJD9xl/oWZyC8u1M6WUwpRuFYRW6mBF6X8="
-        }
-      },
-      "is_incremental": false,
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-          "hash": "MmB2gKlnLpW5a0KDrr+DAujv1iWYTOJn8890ZxAwXW8="
-        }
-      },
-      "is_incremental": true,
-=======
           "hash": "pSDMjPXU3dJD9xl/oWZyC8u1M6WUwpRuFYRW6mBF6X8="
         }
       },
       "is_incremental": false,
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
       "version": ""
     },
     {
@@ -4389,30 +1665,10 @@
       "output": {
         ".html": {
           "relative_path": "api/chia.dotnet.VCProofs.html",
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-          "hash": "Sa7d+l0TbroxxtYunHwXtiOQd4HgIAplNkGPeCINZgI="
-        }
-      },
-      "is_incremental": false,
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-          "hash": "YYzyLl6Lek7uMIUIA42qg6UbG4tc1mgTC06X3VD8QXY="
-        }
-      },
-      "is_incremental": true,
-=======
           "hash": "Sa7d+l0TbroxxtYunHwXtiOQd4HgIAplNkGPeCINZgI="
         }
       },
       "is_incremental": false,
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
       "version": ""
     },
     {
@@ -4421,30 +1677,10 @@
       "output": {
         ".html": {
           "relative_path": "api/chia.dotnet.VCRecord.html",
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-          "hash": "xgNfNao9wuBUdaktDA7jcd3pNwkvwH7JzE6NN5If6uY="
-        }
-      },
-      "is_incremental": false,
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-          "hash": "zTAHStoeVjbit6p5/GIGO1UhJYlWRaF8LQ0jthMtVAU="
-        }
-      },
-      "is_incremental": true,
-=======
           "hash": "xgNfNao9wuBUdaktDA7jcd3pNwkvwH7JzE6NN5If6uY="
         }
       },
       "is_incremental": false,
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
       "version": ""
     },
     {
@@ -4453,30 +1689,10 @@
       "output": {
         ".html": {
           "relative_path": "api/chia.dotnet.VDFInfo.html",
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-          "hash": "+hGy43NpvuPiw8iArsqvpoqY6bm9kxZuuqsJY+jpdLg="
-        }
-      },
-      "is_incremental": false,
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-          "hash": "2BOzPXa2lGExonANiuCZvr0AMEHzgClrTD4Z7mSLSDs="
-        }
-      },
-      "is_incremental": true,
-=======
           "hash": "+hGy43NpvuPiw8iArsqvpoqY6bm9kxZuuqsJY+jpdLg="
         }
       },
       "is_incremental": false,
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
       "version": ""
     },
     {
@@ -4485,30 +1701,10 @@
       "output": {
         ".html": {
           "relative_path": "api/chia.dotnet.VDFProof.html",
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-          "hash": "1IZik64XG/GwRh3Wj6mM6ThUTHfXaX1b1qVTjlfuId8="
-        }
-      },
-      "is_incremental": false,
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-          "hash": "FhsEdm7GSaUsFcH03vrFWLL97VH/rFIIayT9vSv801c="
-        }
-      },
-      "is_incremental": true,
-=======
           "hash": "1IZik64XG/GwRh3Wj6mM6ThUTHfXaX1b1qVTjlfuId8="
         }
       },
       "is_incremental": false,
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
       "version": ""
     },
     {
@@ -4517,30 +1713,10 @@
       "output": {
         ".html": {
           "relative_path": "api/chia.dotnet.VerifiedCredential.html",
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-          "hash": "7rckK9XdGWnYANxnkIaEy3Z5Kqvgisw3QehZTwbAshs="
-        }
-      },
-      "is_incremental": false,
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-          "hash": "KKxvItRR5IC82gqMkIDb4w7llkj7y9JDD6KVlZtgd5k="
-        }
-      },
-      "is_incremental": true,
-=======
           "hash": "7rckK9XdGWnYANxnkIaEy3Z5Kqvgisw3QehZTwbAshs="
         }
       },
       "is_incremental": false,
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
       "version": ""
     },
     {
@@ -4549,25 +1725,7 @@
       "output": {
         ".html": {
           "relative_path": "api/chia.dotnet.VerifiedCredentialManager.html",
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-          "hash": "rBr/ti2GRPfsJkej7jIdD/ZNFiHi6i1SuEcmZb4JxNs="
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-          "hash": "xmZ4QG7HrWqTJQJD25N64KU5sqH1qY2bbJvGDCnu0WI="
-=======
-          "hash": "rBr/ti2GRPfsJkej7jIdD/ZNFiHi6i1SuEcmZb4JxNs="
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-=======
           "hash": "FXYjL8OhMpj/TSbLcWZLdwqy4y9uMfzscNZ0punwWw0="
->>>>>>> main
         }
       },
       "is_incremental": false,
@@ -4579,25 +1737,7 @@
       "output": {
         ".html": {
           "relative_path": "api/chia.dotnet.Wallet.html",
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-          "hash": "bs512NEQfZ7Jn0KhVQ04tGRqD3/ei6wte2D+ybIBtS0="
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-          "hash": "lHLFmK33V9GczkU3mRldzyb2AzEU0GbZ1QS5fvieB3g="
-=======
-          "hash": "bs512NEQfZ7Jn0KhVQ04tGRqD3/ei6wte2D+ybIBtS0="
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-=======
           "hash": "6rcjm2pu14JYNeAeFFZBXnLGKMYmrixxbwe1vkECacY="
->>>>>>> main
         }
       },
       "is_incremental": false,
@@ -4609,30 +1749,10 @@
       "output": {
         ".html": {
           "relative_path": "api/chia.dotnet.WalletBalance.html",
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-          "hash": "GjXu6oBoaInV1BUNZKgDoWKtfboEG7rqE7JbEG57Dgw="
-        }
-      },
-      "is_incremental": false,
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-          "hash": "LjnC9C6iDcR6nP6IjPRSOQT7STJM9uDCPaN9/XrW2fU="
-        }
-      },
-      "is_incremental": true,
-=======
           "hash": "GjXu6oBoaInV1BUNZKgDoWKtfboEG7rqE7JbEG57Dgw="
         }
       },
       "is_incremental": false,
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
       "version": ""
     },
     {
@@ -4641,30 +1761,10 @@
       "output": {
         ".html": {
           "relative_path": "api/chia.dotnet.WalletInfo.html",
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-          "hash": "Qr9GrQEqhXgchl9+nG2vBb3DYwK067YkDr8wvHp9unE="
-        }
-      },
-      "is_incremental": false,
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-          "hash": "qeqXD/6DYiBETgtWDkzWzw/KOqVLidEwDoWMZQHaofA="
-        }
-      },
-      "is_incremental": true,
-=======
           "hash": "Qr9GrQEqhXgchl9+nG2vBb3DYwK067YkDr8wvHp9unE="
         }
       },
       "is_incremental": false,
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
       "version": ""
     },
     {
@@ -4673,25 +1773,7 @@
       "output": {
         ".html": {
           "relative_path": "api/chia.dotnet.WalletProxy.html",
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-          "hash": "7TuR/WTHs8YulM3YdkfxNCm8IGEXFYRZqYSNJFSjCj0="
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-          "hash": "ZP32Q2mz5q0ZvfO1PWzTTVxaL2aX46AhDzBOsNpgwWc="
-=======
-          "hash": "7TuR/WTHs8YulM3YdkfxNCm8IGEXFYRZqYSNJFSjCj0="
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-=======
           "hash": "8VG9lSHFPgsfQdF7NffqbU/hBuGP1/6A7fn2dlFVT+k="
->>>>>>> main
         }
       },
       "is_incremental": false,
@@ -4703,30 +1785,10 @@
       "output": {
         ".html": {
           "relative_path": "api/chia.dotnet.WalletType.html",
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-          "hash": "6jfpMYE0QPBxDrpcR8dAHV1k5idD/yOgax9buBFS32I="
-        }
-      },
-      "is_incremental": false,
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-          "hash": "DCXNodqHOnZKVwpiyNFkJw4v5ULqMsjS16rUgacxiNk="
-        }
-      },
-      "is_incremental": true,
-=======
           "hash": "6jfpMYE0QPBxDrpcR8dAHV1k5idD/yOgax9buBFS32I="
         }
       },
       "is_incremental": false,
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
       "version": ""
     },
     {
@@ -4735,30 +1797,10 @@
       "output": {
         ".html": {
           "relative_path": "api/chia.dotnet.WebSocketRpcClient.html",
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-          "hash": "buie7cR9X2fIXbCj/DuGf+H1onDNWkgEeUuE7sAV2vk="
-        }
-      },
-      "is_incremental": false,
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-          "hash": "Eb6XEvm7zvF3N+t0A0p/zNREPMBjv3bUzpp6Sc4/vrU="
-        }
-      },
-      "is_incremental": true,
-=======
           "hash": "buie7cR9X2fIXbCj/DuGf+H1onDNWkgEeUuE7sAV2vk="
         }
       },
       "is_incremental": false,
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
       "version": ""
     },
     {
@@ -4767,30 +1809,10 @@
       "output": {
         ".html": {
           "relative_path": "api/chia.dotnet.bech32.Bech32M.html",
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-          "hash": "0xSA0O/QsOr/UUkCqBUSDZHC7TDJSj1n7qNSSFNp+CY="
-        }
-      },
-      "is_incremental": false,
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-          "hash": "KCOxsUWi1Z6l9bk2NdZiK4tXnBrCLnWoc1LF8TtG7Dw="
-        }
-      },
-      "is_incremental": true,
-=======
           "hash": "0xSA0O/QsOr/UUkCqBUSDZHC7TDJSj1n7qNSSFNp+CY="
         }
       },
       "is_incremental": false,
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
       "version": ""
     },
     {
@@ -4799,30 +1821,10 @@
       "output": {
         ".html": {
           "relative_path": "api/chia.dotnet.bech32.HexBytes.html",
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-          "hash": "VZcVdu5HOkhk993/GI515jHHfdv+61R3TNWP7gx+QMM="
-        }
-      },
-      "is_incremental": false,
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-          "hash": "9TGL98nK4rQUIsXaV5l4LjunHSI4HUqeMdGebuvnTsM="
-        }
-      },
-      "is_incremental": true,
-=======
           "hash": "VZcVdu5HOkhk993/GI515jHHfdv+61R3TNWP7gx+QMM="
         }
       },
       "is_incremental": false,
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
       "version": ""
     },
     {
@@ -4834,21 +1836,7 @@
           "hash": "Kbh8QY0NWD7B1XSpOoyjQlCu2PZUyxMK4MYMjD7eXqU="
         }
       },
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-      "is_incremental": false,
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-      "is_incremental": true,
-=======
       "is_incremental": false,
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
       "version": ""
     },
     {
@@ -4869,30 +1857,10 @@
       "output": {
         ".html": {
           "relative_path": "api/index.html",
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
           "hash": "myR3zif0cEKBP4p1FdIR5Rngc1G2xNtfbFzw09a+ZOQ="
         }
       },
       "is_incremental": false,
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-          "hash": "6mDCCljQ79PhHLK2UAYT2JJE9LaVwTnlh2E/h9TUwjE="
-        }
-      },
-      "is_incremental": true,
-=======
-          "hash": "myR3zif0cEKBP4p1FdIR5Rngc1G2xNtfbFzw09a+ZOQ="
-        }
-      },
-      "is_incremental": false,
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
       "version": ""
     },
     {
@@ -4913,30 +1881,10 @@
       "output": {
         ".html": {
           "relative_path": "articles/intro.html",
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-          "hash": "XFBGBmOk8DvMg7E/PvaFC0u7YLIoSYkL24Rg4Bgy+Rs="
-        }
-      },
-      "is_incremental": false,
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-          "hash": "/W+yxtMpYtq3DU/0CsmrhNgsVyXa+c6ljhjnEhduD7A="
-        }
-      },
-      "is_incremental": true,
-=======
           "hash": "XFBGBmOk8DvMg7E/PvaFC0u7YLIoSYkL24Rg4Bgy+Rs="
         }
       },
       "is_incremental": false,
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
       "version": ""
     },
     {
@@ -4968,30 +1916,10 @@
       "output": {
         ".html": {
           "relative_path": "index.html",
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-          "hash": "tiNKZ71Rk5iWK3BtGwbMcC0nIf+qJ+Y5kFsMyGoPBd0="
-        }
-      },
-      "is_incremental": false,
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-          "hash": "PuDh4oVGqY3GaSBnuCmoneoDbcRHa3Vz97t4WAPDwyA="
-        }
-      },
-      "is_incremental": true,
-=======
           "hash": "tiNKZ71Rk5iWK3BtGwbMcC0nIf+qJ+Y5kFsMyGoPBd0="
         }
       },
       "is_incremental": false,
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
       "version": ""
     },
     {
@@ -5010,34 +1938,6 @@
   "incremental_info": [
     {
       "status": {
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-        "can_incremental": true,
-        "incrementalPhase": "build",
-        "total_file_count": 0,
-        "skipped_file_count": 0
-      },
-      "processors": {
-        "ConceptualDocumentProcessor": {
-          "can_incremental": true,
-          "incrementalPhase": "build",
-          "total_file_count": 3,
-          "skipped_file_count": 3
-        },
-        "ManagedReferenceDocumentProcessor": {
-          "can_incremental": true,
-          "incrementalPhase": "build",
-          "total_file_count": 154,
-          "skipped_file_count": 153
-=======
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
         "can_incremental": false,
         "details": "Disable incremental build by force rebuild option.",
         "incrementalPhase": "build",
@@ -5057,14 +1957,6 @@
           "incrementalPhase": "build",
           "total_file_count": 154,
           "skipped_file_count": 0
-<<<<<<< HEAD
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-=======
-<<<<<<< HEAD
-=======
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
         },
         "ResourceDocumentProcessor": {
           "can_incremental": false,
@@ -5084,24 +1976,8 @@
     },
     {
       "status": {
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-        "can_incremental": false,
-        "details": "Cannot support incremental post processing, the reason is: it's disabled.",
-=======
-<<<<<<< HEAD
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
-        "can_incremental": true,
-        "details": "Can support incremental post processing.",
-=======
         "can_incremental": false,
         "details": "Cannot support incremental post processing, the reason is: it's disabled.",
->>>>>>> 4f31ff04199df336a8c69c6ad030b8b8f881ce93
-<<<<<<< HEAD
-=======
->>>>>>> 3a4fea754a815b429e40dd0e330a5b6534d2cf56
->>>>>>> 6aa01cd02a095f2438c1538a02446b9b37761fe5
         "incrementalPhase": "postProcessing",
         "total_file_count": 0,
         "skipped_file_count": 0
diff --git a/src/chia-dotnet/chia-dotnet.csproj b/src/chia-dotnet/chia-dotnet.csproj
index b4659d80..b9bb9a19 100644
--- a/src/chia-dotnet/chia-dotnet.csproj
+++ b/src/chia-dotnet/chia-dotnet.csproj
@@ -5,7 +5,7 @@
     <RootNamespace>chia.dotnet</RootNamespace>
     <EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-    <Version>2.0.0-alpha04</Version>
+    <Version>2.0.0-beta01</Version>
     <Authors>dkackman</Authors>
     <Company>dkackman</Company>
     <Description>A .net client library for chia™ RPC interfaces that runs on linux and windows.</Description>
@@ -19,8 +19,8 @@
     <PackageReleaseNotes>Chia 1.8.2 support</PackageReleaseNotes>
     <PackageIcon>chia-leaf-logo-384x384.png</PackageIcon>
     <PackageIconUrl />
-    <AssemblyVersion>2.0.0.4</AssemblyVersion>
-    <FileVersion>2.0.0.4</FileVersion>
+    <AssemblyVersion>2.0.0.5</AssemblyVersion>
+    <FileVersion>2.0.0.5</FileVersion>
     <Nullable>enable</Nullable>
     <Title>chia.dotnet</Title>
     <PackageReadmeFile>README.md</PackageReadmeFile>