updated changelog

Author: Stephan Dilly

CHANGELOG.md

@@ -7,9 +7,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## Unreleased
 
+## Added
+- support rebasing branches with conflicts ([#895](https://github.com/extrawurst/gitui/issues/895))
+
 ## Fixed
 - appropriate error message when pulling deleted remote branch ([#911](https://github.com/extrawurst/gitui/issues/991))
-- improved color contrast in branches popup for light themes ([#922](https://github.com/extrawurst/gitui/issues/922))
+- improved color contrast in branches popup for light themes  [[@Cottser](https://github.com/Cottser)] ([#922](https://github.com/extrawurst/gitui/issues/922))
 
 ## [0.17.1] - 2021-09-10