diff --git a/check_smart/check_smart.cpp b/check_smart/check_smart.cpp
index ad10af5..56f6d03 100644
--- a/check_smart/check_smart.cpp
+++ b/check_smart/check_smart.cpp
@@ -199,6 +199,10 @@ void set_timeout(unsigned int sec)
   sa.sa_handler = &timer_handler;
   sigaction (SIGVTALRM, &sa, 0);
 <<<<<<< HEAD
+<<<<<<< HEAD
+=======
+
+>>>>>>> f3a48aed56edc3f5053f68421dbc764d5930797f
 =======
 
 >>>>>>> f3a48aed56edc3f5053f68421dbc764d5930797f