Resolve merge conflicts

CHANGELOG.md

@@ -180,6 +180,15 @@ Up requirements to Django 4.0+, Twisted 22+, Python 3.9 or 3.10
   e.g. webclient pane filtering where desired. (volund)
 - Added `Account.uses_screenreader(session=None)` as a quick shortcut for
   finding if a user uses a screenreader (and adjust display accordingly).
+- Fixed bug in `cmdset.remove()` where a command could not be deleted by `key`,
+  even though doc suggested one could (ChrisLR)
+- New contrib `name_generator` for building random real-world based or fantasy-names
+  based on phonetic rules.
+- Enable proper serialization of dict subclasses in Attributes (aogier)
+- `object.search` fuzzy-matching now uses `icontains` instead of `istartswith`
+  to better match how search works elsewhere (volund)
+- The `.at_traverse` hook now receives a `exit_obj` kwarg, linking back to the
+  exit triggering the hook (volund)
 
 
 ## Evennia 0.9.5