diff --git a/smart_bridge/src/tasks/CountDown.cpp b/smart_bridge/src/tasks/CountDown.cpp
index c6da85d..a7a0b47 100644
--- a/smart_bridge/src/tasks/CountDown.cpp
+++ b/smart_bridge/src/tasks/CountDown.cpp
@@ -2,7 +2,6 @@
 
 CountDown::CountDown(int countDown) : Task()
 {
-    this->setStatus(false);
     this->setStatus(false);
     this->lcd = new LCD(0x27, 16, 2);
     this->resetCountDown(N3);
@@ -50,7 +49,6 @@ void CountDown::startCountDown()        // NOTE: Chiama direttamente this->setAc
 void CountDown::printCountDown()
 {
     int count = getCountDown();
-    // Serial.println("Countdown: " + String(count) + " seconds");
     lcd->write(("Countdown: " + String(count)).c_str(), 0, 0);
 }
 
@@ -58,16 +56,9 @@ void CountDown::endsCountDown()
 {
     if (getCountDown() <= 0)
     {
-<<<<<<< HEAD
-        this->setStatus(true);
-        this->isCompleted();
-        this->printsEndsCountdown();
-        this->resetCountDown(N3);
-=======
         this->isCompleted();            // NOTE: non credo serva
         this->printsEndsCountdown();    // NOTE: meglio chiamare direttamente la stampa, si usa meno spazio sullo stack
         this->resetCountDown(N3);       
->>>>>>> 005e2fa ([REFACTOR] Refactoring)
         Serial.println("CountDown::Countdown resetted");
         this->setCompleted();
     }
@@ -109,23 +100,10 @@ bool CountDown::getStatus()
     return this->status;
 }
 
-void CountDown::setStatus(bool value)
-{
-    this->status = value;
-}
-
-bool CountDown::getStatus()
-{
-    return this->status;
-}
-
 void CountDown::tick()
 {
     startCountDown();
     printCountDown();
     decreaseCountDown();
-<<<<<<< HEAD
-=======
     endsCountDown();        // NOTE: lo chiami già in decreaseCountDown(), non serve chiamarlo qui.
->>>>>>> 005e2fa ([REFACTOR] Refactoring)
 }
\ No newline at end of file