Resolve merge conflicts

CHANGELOG.md

@@ -9,8 +9,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Added
 
-- Scroll to replied element in timeline when clicking
-
 ### Changed
 
 ### Deprecated
@@ -19,11 +17,21 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Fixed
 
-- Show correct indicator message when an invitation is rejected or revoked
 - Wait for database being closed before trying to delete user folder
 
 ### Security
 
+## 3.5.5
+
+### Added
+
+- Scroll to replied element in timeline when clicking
+- Add "deactivate account" functionality
+
+### Fixed
+
+- Show correct indicator message when an invitation is rejected or revoked
+
 ## 3.5.4
 
 ### Added