Update CHANGELOG.md

(cherry picked from commit aa1b1a7)

# Conflicts:
#	CHANGELOG.md

CHANGELOG.md

@@ -72,6 +72,11 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - Fix message to the client if there is a iface problem. [#695](https://github.com/greenbone/openvas/pull/695)
 - Fix SIGSEGV when no best route is found. [#702](https://github.com/greenbone/openvas/pull/702)
 - Fix host count when reverse_lookup_only is enabled. [#715](https://github.com/greenbone/openvas/pull/715)
+<<<<<<< HEAD
+=======
+- Use host from the orignal hosts list when boreas is enabled. Backport of [PR #727](https://github.com/greenbone/openvas/pull/727). [#725](https://github.com/greenbone/openvas/pull/725)
+- The function description of nasl_ssh_shell_read() has been fixed. [#755](https://github.com/greenbone/openvas/pull/755)
+>>>>>>> aa1b1a7b (Update CHANGELOG.md)
 
 ### Removed
 - Remove code from the openvas daemon era. Do not flushall redis. [#689](https://github.com/greenbone/openvas/pull/689)