fix conflict

changelog.md

@@ -1,6 +1,9 @@
 # CHANGELOG
 
 ## Unreleased
+* [1574](https://github.com/zeta-chain/node/pull/1574) added password prompts for hotkey and tss keyshare in zetaclient
+Starting zetaclient now requires two passwords to be input; one for the hotkey and another for the tss key-share.
+* `zetaclientd start` : 2 inputs required from stdin
 
 ## Version: v12.0.0
 
@@ -23,9 +26,6 @@ Observer params and core params have been merged into chain params:
 Getting the correct TSS address for Bitcoin now requires proviidng the Bitcoin chain id:
 * `GetTssAddress` : Changed from `/zeta-chain/observer/get_tss_address/` to `/zeta-chain/observer/getTssAddress/{bitcoin_chain_id}` . Optional bitcoin chain id can now be passed as a parameter to fetch the correct tss for required BTC chain. This parameter only affects the BTC tss address in the response.
 
-Starting zetaclient now requires two passwords to be input; one for the hotkey and another for the tss key-share.
-* `zetaclientd start` : 2 inputs required from stdin
-
 ### Features
 
 * [1549](https://github.com/zeta-chain/node/pull/1549) - add monitoring for vote tx results in ZetaClient
@@ -35,7 +35,6 @@ Starting zetaclient now requires two passwords to be input; one for the hotkey a
 * enable zetaclients to use dynamic gas price on zetachain - enables >0 min_gas_price in feemarket module
 * add static chain data for Sepolia testnet
 * added metrics to track the burn rate of the hotkey in the telemetry server as well as prometheus
-* [1574](https://github.com/zeta-chain/node/pull/1574) added password prompts for hotkey and tss keyshare in zetaclient
 
 ### Fixes