diff --git a/rbkit-lib/ui/actiontoolbar.cpp b/rbkit-lib/ui/actiontoolbar.cpp
index 1270246..4d488e2 100644
--- a/rbkit-lib/ui/actiontoolbar.cpp
+++ b/rbkit-lib/ui/actiontoolbar.cpp
@@ -68,8 +68,11 @@ void ActionToolbar::setupSubscriber()
             subscriber, SLOT(startListening(QString, QString)));
     connect(this, SIGNAL(triggerGc()), subscriber, SLOT(triggerGc()));
     connect(this, SIGNAL(takeSnapshot()), subscriber, SLOT(takeSnapshot()));
+<<<<<<< HEAD
     connect(this, SIGNAL(startCPUProfiling()), subscriber, SLOT(startCPUProfiling()));
     connect(this, SIGNAL(stopCPUProfiling()), subscriber, SLOT(stopCPUProfiling()));
+=======
+>>>>>>> 000ee54... issue #174
     connect(this, SIGNAL(startCPUSnapshot()), subscriber, SLOT(startCPUSnapshot()));
 
     connect(subscriber, &Subscriber::errored, centralWidget, &CentralWidget::onError);
@@ -158,8 +161,11 @@ void ActionToolbar::setupToolBar()
                              QIcon(":/icons/Compare-32.png"),
                              "cpu_profiling");
 
+<<<<<<< HEAD
     connect(stopCPUButton, &QToolButton::clicked, this, &ActionToolbar::performStopCPUAction);
 
+=======
+>>>>>>> 000ee54... issue #174
     cpusnapshotButton = toolBar->addRibbonAction("Take Snapshot",
                                               "start_snapshot",
                                               QIcon(":/icons/snapshot-32.png"),
@@ -174,6 +180,7 @@ void ActionToolbar::performGCAction()
     emit triggerGc();
 }
 
+<<<<<<< HEAD
 void ActionToolbar::performStartCPUAction() {
     emit startCPUProfiling();
 }
@@ -181,6 +188,8 @@ void ActionToolbar::performStartCPUAction() {
 void ActionToolbar::performStopCPUAction() {
     emit stopCPUProfiling();
 }
+=======
+>>>>>>> 000ee54... issue #174
 void ActionToolbar::performCPUSnapshot() {
     emit startCPUSnapshot();
 }