diff --git a/app/models/managers/LogMaintainer.php b/app/models/managers/LogMaintainer.php
index f2b5941..b852d7c 100644
--- a/app/models/managers/LogMaintainer.php
+++ b/app/models/managers/LogMaintainer.php
@@ -14,11 +14,7 @@ class LogMaintainer
 					unlink ($dir . $file);
 				}
 			} else {
-<<<<<<< HEAD
 				$this->cleaningDir ($dir . $file . "/", $seconds);
-=======
-				$this->cleaningDir ($path . $file . "/", $seconds);
->>>>>>> 1a448663f05f2b4ad7456a89d50312be302cd494
 			}
 		}
 	}
@@ -27,8 +23,4 @@ class LogMaintainer
 		$seconds = $days * 86400;
 		$this->cleaningDir ('../logs/', $seconds);
 	}
-<<<<<<< HEAD
 }
-=======
-}
->>>>>>> 1a448663f05f2b4ad7456a89d50312be302cd494