Resolved conflicts

src/core/Controller.cpp

@@ -23,7 +23,7 @@
  */
 
 
-#include <assert.h>
+#include <cassert>
 
 
 #include "backend/cpu/Cpu.h"
@@ -44,20 +44,9 @@ xmrig::Controller::~Controller()
 }
 
 
-bool xmrig::Controller::isReady() const
-{
-    return Base::isReady() && m_network;
-}
-
-
 int xmrig::Controller::init()
 {
-    Cpu::init();
-
-    const int rc = Base::init();
-    if (rc != 0) {
-        return rc;
-    }
+    Base::init();
 
     m_network = new Network(this);
     return 0;