fix merge conflict

diff --cc CHANGELOG.md
index d4a74d30c2042717a14c90379bd9d9fbfba1ad48,7869e299bb293169083653f83fcba907f8af71bc..feacf2c5e570cf276dad58b0fbbbc905f66a4f41
--- 1/CHANGELOG.md
--- 2/CHANGELOG.md
+++ b/CHANGELOG.md
@@@ -38,7 -41,10 +41,11 @@@ The format is based on [Keep a Changelo
  - Metadata: RelMe provider
  - OAuth: added support for refresh tokens
  - Emoji packs and emoji pack manager
+ - Object pruning (`mix pleroma.database prune_objects`)
+ - OAuth: added job to clean expired access tokens
+ - MRF: Support for rejecting reports from specific instances (`mrf_simple`)
+ - MRF: Support for stripping avatars and banner images from specific instances (`mrf_simple`)
 +- Ability to reset avatar, profile banner and backgroud
  
  ### Changed
  - **Breaking:** Configuration: move from Pleroma.Mailer to Pleroma.Emails.Mailer