diff --git a/src/colnod/requestmanager.cpp b/src/colnod/requestmanager.cpp
index 5d0e79c..ebfdefb 100644
--- a/src/colnod/requestmanager.cpp
+++ b/src/colnod/requestmanager.cpp
@@ -9,7 +9,11 @@ RequestManager::RequestManager()
 std::shared_ptr<Response> RequestManager::login()
 {
     Q_ASSERT(!loginResponse);
+<<<<<<< src/colnod/requestmanager.cpp
     loginResponse = std::make_shared<Response>();
+=======
+    loginResponse = new Response;
+>>>>>>> src/colnod/requestmanager.cpp
     QNetworkRequest request;
     QString hash = encryptedPassword(this->password);
     authHeader = getLoginHeader(this->user, hash);
diff --git a/test/unitTests/complextest.cpp b/test/unitTests/complextest.cpp
index 6e7ae9d..915dc90 100644
--- a/test/unitTests/complextest.cpp
+++ b/test/unitTests/complextest.cpp
@@ -2,6 +2,7 @@
 
 void ComplexTest::initTestCase()
 {
+<<<<<<< test/unitTests/complextest.cpp
     //    auto reqMan1 = new RequestManager;
     //    QList<QString> ids;
     //    ids.append("582c982d-6fd7-4856-8548-7ce542791c7a");
@@ -12,6 +13,17 @@ void ComplexTest::initTestCase()
     //    deleteTokensRespSpy.wait(timeout);
     //    QTest::qWait(2500);
     // Logger *logger = Logger::getLogger();
+=======
+    auto reqMan1 = new RequestManager;
+    QList<QString> ids;
+    ids.append("582c982d-6fd7-4856-8548-7ce542791c7a");
+    ids.append("3ff23b41-3da3-4b33-82ce-d8e2d8c9a546");
+    Response* deleteTokensResp = reqMan1->deleteTokens(&ids);
+    QSignalSpy deleteTokensRespSpy(deleteTokensResp, &Response::ready);
+    QCOMPARE(deleteTokensRespSpy.count(), 0);
+    deleteTokensRespSpy.wait(10000);
+    QTest::qWait(2500);
+>>>>>>> test/unitTests/complextest.cpp
     start = QDateTime::currentMSecsSinceEpoch()-2000;
     api = new SyncManager();
     qDebug() << start;
@@ -21,6 +33,7 @@ void ComplexTest::initTestCase()
 
 void ComplexTest::cleanupTestCase()
 {
+<<<<<<< test/unitTests/complextest.cpp
     //    QList<QString> ids;
     //    ids.append("582c982d-6fd7-4856-8548-7ce542791c7a");
     //    ids.append("3ff23b41-3da3-4b33-82ce-d8e2d8c9a546");
@@ -30,10 +43,22 @@ void ComplexTest::cleanupTestCase()
     //    QCOMPARE(deleteTokensRespSpy.count(), 0);
     //    deleteTokensRespSpy.wait(timeout);
     //    QCOMPARE(deleteTokensRespSpy.count(), 1);
+=======
+    QList<QString> ids;
+    ids.append("582c982d-6fd7-4856-8548-7ce542791c7a");
+    ids.append("3ff23b41-3da3-4b33-82ce-d8e2d8c9a546");
+    auto reqMan = new RequestManager;
+    Response* deleteTokensResp = reqMan->deleteTokens(&ids);
+    QSignalSpy deleteTokensRespSpy(deleteTokensResp, &Response::ready);
+    QCOMPARE(deleteTokensRespSpy.count(), 0);
+    deleteTokensRespSpy.wait(10000);
+    QCOMPARE(deleteTokensRespSpy.count(), 1);
+>>>>>>> test/unitTests/complextest.cpp
 }
 
 void ComplexTest::complexTest()
 {
+<<<<<<< test/unitTests/complextest.cpp
 //    // LOGIN_BEGIN
 //    reqMan = new RequestManager;
 //    QSignalSpy loginSpy(reqMan, &RequestManager::successLogin);
@@ -111,6 +136,87 @@ void ComplexTest::complexTest()
 //    QCOMPARE(loginRespSpy.count(), 1);
 //    QCOMPARE(getNumOfSubjects(), numOfSubjects);
 //    QCOMPARE(getNumOfTokens(), numOfTokens);
+=======
+    // LOGIN_BEGIN
+    reqMan = new RequestManager;
+    QSignalSpy loginSpy(reqMan, &RequestManager::successLogin);
+    QVERIFY(reqMan);
+    Response* loginResp = reqMan->login();
+    QSignalSpy loginRespSpy(loginResp, &Response::ready);
+    QCOMPARE(loginSpy.count(), 0);
+    QCOMPARE(loginRespSpy.count(), 0);
+    loginSpy.wait(10000);
+    QCOMPARE(loginResp->getStatusCode(), 200); // HTTP status code check
+    QCOMPARE(loginSpy.count(), 1); // Checking multiple calls
+    QCOMPARE(loginRespSpy.count(), 1);
+    auto doc0 = getJsonDoc(loginResp->getJson());
+    QVERIFY(doc0.object()["id"].isString());
+    // LOGIN_END
+
+    // NUMBER_OF_SUBJECTS_AND_TOKENS_BEGIN
+    int numOfSubjects = getNumOfSubjects();
+    QCOMPARE(numOfSubjects, 2893); // should be still the same, if false db has been changed
+    int numOfTokens = getNumOfTokens();
+    QCOMPARE(numOfTokens, 2881); // should be still the same, if false db has been changed, or deleteTokens didnt work in previous test
+    // NUMBER_OF_SUBJECTS_AND_TOKENS_END
+
+
+    // ADD_TOKENS_CHECK_BEGIN
+    QList<QPointer<Token>> tokens;
+    tokens.append(getTestToken());
+    Response* setTokensResp = reqMan->setTokens(&tokens);
+    QSignalSpy setTokensRespSpy(setTokensResp, &Response::ready);
+    QCOMPARE(setTokensRespSpy.count(), 0);
+    setTokensRespSpy.wait(10000);
+    QCOMPARE(setTokensRespSpy.count(), 1);
+    QCOMPARE(setTokensResp->getStatusCode(), 200);
+    QCOMPARE(getNumOfTokens(), numOfTokens + 1);
+    // ADD_TOKENS_CHEK_END
+
+    // CHECK_UPDATED_TOKENS_BEGIN
+    Response* getTokensUpdatedResp = reqMan->getTokensUpdated(start);
+    //start = QDateTime::currentMSecsSinceEpoch();
+    QSignalSpy getTokensUpdatedRespSpy(getTokensUpdatedResp, &Response::ready);
+    QCOMPARE(getTokensUpdatedRespSpy.count(), 0);
+    getTokensUpdatedRespSpy.wait(10000);
+    QCOMPARE(getTokensUpdatedResp->getStatusCode(), 200);
+    QCOMPARE(getTokensUpdatedRespSpy.count(), 1);
+    auto doc1 = getJsonDoc(getTokensUpdatedResp->getJson());
+    QCOMPARE(doc1.object()["items"].toArray().size(), 1);
+    // CHECK_UPDATED_TOKENS_END
+
+    // DELETE_TOKENS_CHECK_BEGIN
+    QList<QString> ids;
+    ids.append("582c982d-6fd7-4856-8548-7ce542791c7a");
+    Response* deleteTokensResp = reqMan->deleteTokens(&ids);
+    QSignalSpy deleteTokensRespSpy(deleteTokensResp, &Response::ready);
+    QCOMPARE(deleteTokensRespSpy.count(), 0);
+    deleteTokensRespSpy.wait(10000);
+    QCOMPARE(deleteTokensRespSpy.count(), 1);
+    QCOMPARE(deleteTokensResp->getStatusCode(), 200);
+    // DELETE_TOKENS_CHECK_END
+
+    // CHECK_DELETED_TOKENS_BEGIN
+    Response* getTokensDeletedResp = reqMan->getTokensDeleted(start);
+    start = QDateTime::currentMSecsSinceEpoch();
+    QSignalSpy getTokensDeletedRespSpy(getTokensDeletedResp, &Response::ready);
+    QCOMPARE(getTokensDeletedRespSpy.count(), 0);
+    getTokensDeletedRespSpy.wait(10000);
+    QCOMPARE(getTokensDeletedResp->getStatusCode(), 200);
+    QCOMPARE(getTokensDeletedRespSpy.count(), 1);
+    auto doc2 = getJsonDoc(getTokensDeletedResp->getJson());
+    QCOMPARE(doc2.object()["items"].toArray().size(), 1);
+    QVERIFY(doc2.object()["items"].toArray().contains("582c982d-6fd7-4856-8548-7ce542791c7a"));
+    // CHECK_DELETED_TOKENS_END
+
+
+
+    // LAST_TESTS (for sure)
+    QCOMPARE(loginSpy.count(), 1); // Checking multiple calls
+    QCOMPARE(loginRespSpy.count(), 1);
+    QCOMPARE(getNumOfSubjects(), numOfSubjects);
+    QCOMPARE(getNumOfTokens(), numOfTokens);
+>>>>>>> test/unitTests/complextest.cpp
 }
 
 void ComplexTest::fullSync()
diff --git a/test/unitTests/complextest.h b/test/unitTests/complextest.h
index f66020b..dff7f19 100644
--- a/test/unitTests/complextest.h
+++ b/test/unitTests/complextest.h
@@ -32,10 +32,14 @@ private:
     QString host = "https://192.168.1.3";
     QString user = "spaceti";
     QString password = "spaceti1";
-    RequestManager* reqMan = nullptr;
     uint64_t start = 0;
+<<<<<<< test/unitTests/complextest.h
     SyncManager* api = nullptr;
 
     static constexpr qint16 timeout = 10000;
+=======
+    RequestManager* reqMan = nullptr;
+    ColnodAPI* api = nullptr;
+>>>>>>> test/unitTests/complextest.h
 };