fixed rebasing for CHANGELOG and bitcoin-tests

Author: rdeioris

.github/workflows/bitcoin-tests.yml

@@ -143,7 +143,6 @@ jobs:
           - tests::nakamoto_integrations::clarity_cost_spend_down
           - tests::nakamoto_integrations::v3_blockbyhash_api_endpoint
           - tests::nakamoto_integrations::v3_blockbyheight_api_endpoint
-          - tests::nakamoto_integrations::clarity_cost_spend_down
           # TODO: enable these once v1 signer is supported by a new nakamoto epoch
           # - tests::signer::v1::dkg
           # - tests::signer::v1::sign_request_rejected

CHANGELOG.md

@@ -15,7 +15,6 @@ and this project adheres to the versioning scheme outlined in the [README.md](RE
 - Add `tenure_cost_limit_per_block_percentage` to the miner config file to control the percentage remaining tenure cost limit to consume per nakamoto block.
 - Add `/v3/blockbyhash` and `/v3/blockbyheight` rpc endpoints
 - Add `/v3/blocks/height/:block_height` rpc endpoint
-- Add `tenure_cost_limit_per_block_percentage` to the miner config file to control the percentage remaining tenure cost limit to consume per nakamoto block.
 
 ## [3.0.0.0.1]