diff --git a/CHANGELOG.md b/CHANGELOG.md
index 878ff984..c23c5d29 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,8 @@
+# v2.4.5
+- [#324](https://github.com/xmrig/xmrig/pull/324) Fixed build without libmicrohttpd (CMake cache issue).
+- [#341](https://github.com/xmrig/xmrig/issues/341) Fixed wrong exit code and added command line option `--dry-run`.
+- [#385](https://github.com/xmrig/xmrig/pull/385) Up to 20% performance increase with for non-AES CPU and fixed Intel Core 2 cache detection.
+
 # v2.4.4
  - Added libmicrohttpd version to --version output.
  - Fixed bug in singal handler, in some cases miner wasn't shutdown properly.
diff --git a/README.md b/README.md
index bea99be5..cef87581 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,12 @@
 [XMRig](https://github.com/xmrig) is a team that has some high performance Monero (XMR) miners, with official support for Windows.
 This fork is originally based on the [CPU-mining](https://github.com/xmrig/xmrig) version with some optimizations/rewrites, interesting features for final users and a little code refactors.
 
+<<<<<<< HEAD
 * This software is like the [CPU-mining](https://github.com/xmrig/xmrig) version; but there is also a [NVIDIA GPU version](https://github.com/xmrig/xmrig-nvidia) and [AMD GPU version]( https://github.com/xmrig/xmrig-amd).
+=======
+* This is the **CPU-mining** version, there is also a [NVIDIA GPU version](https://github.com/xmrig/xmrig-nvidia) and [AMD GPU version]( https://github.com/xmrig/xmrig-amd).
+* You can use [config.xmrig.com](https://config.xmrig.com/) to generate/edit/share your configurations. :new:
+>>>>>>> c9acc2912e9e71d234648bec2595137bec355dfc
 * [Roadmap](https://github.com/xmrig/xmrig/issues/106) for next releases.
 
 ## Own features