Merge pull request #6464

2d8c49d Clean up tx prioritization when conflict mined (Casey Rodarmor)

Author: laanwj

src/txmempool.cpp

@@ -512,6 +512,7 @@ void CTxMemPool::removeConflicts(const CTransaction &tx, std::list<CTransaction>
             if (txConflict != tx)
             {
                 remove(txConflict, removed, true);
+                ClearPrioritisation(txConflict.GetHash());
             }
         }
     }