Clean up messed up changelog merge

Author: thetek42

CHANGELOG.md

@@ -8,12 +8,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ## [Unreleased]
 
 ### Added
-- `save-image` now checks if the ELF contains the app descriptor (#920)
-- Add support for secure padding for save-image (#876)
 
 ### Changed
 
 - Renamed `--check-app-descriptor` to `--ignore-app-descriptor` (#833)
+- Add support for secure padding for save-image (#876)
 
 ### Fixed
 
@@ -58,7 +57,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - `DefaultProgressCallback` which implements `ProgressCallbacks` but all methods are no-ops (#904)
 - `ProgressCallbacks` now has a `verifying` method to notify when post-flash checksum checking has begun (#908)
 - Implement `From<Connection> for Port` and both `From<Flasher> for Connection` and `Port` conversions (#915)
-- Add support for serial port configuration files. (#777)
 
 ### Changed