diff --git a/README.md b/README.md
index 38b3f2df..002cafd6 100644
--- a/README.md
+++ b/README.md
@@ -2,16 +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
+XMRig is a high performance Monero (XMR) CPU miner, with official support for Windows.
+Originally based on cpuminer-multi with heavy optimizations/rewrites and removing a lot of legacy code, since version 1.0.0 completely rewritten from scratch on C++.
+
 * 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:
-<<<<<<< HEAD
->>>>>>> c9acc2912e9e71d234648bec2595137bec355dfc
-=======
->>>>>>> pr/3
-* [Roadmap](https://github.com/xmrig/xmrig/issues/106) for next releases.
 
 ## Own features