diff --git a/client_log.py b/client_log.py
index aa579d3..267a279 100644
--- a/client_log.py
+++ b/client_log.py
@@ -31,3 +31,5 @@ def log_wrap(*args, **kwargs):
 logger.addHandler(sh)
 
 logger.setLevel(logging.DEBUG)
+
+
diff --git a/client_main.py b/client_main.py
index cb77afb..bc672ec 100644
--- a/client_main.py
+++ b/client_main.py
@@ -46,3 +46,4 @@
 else:
     jim_client.close()
 
+
diff --git a/jim_client.py b/jim_client.py
index aa021a1..fdcbfeb 100644
--- a/jim_client.py
+++ b/jim_client.py
@@ -187,3 +187,4 @@ def _send_message(self, out_socket, out_jim_msg):
             return False
 
 
+
diff --git a/jim_message.py b/jim_message.py
index c6845f0..2c97016 100644
--- a/jim_message.py
+++ b/jim_message.py
@@ -214,3 +214,4 @@ def response_message(response, encoding):
         return jim_msg
 
 
+
diff --git a/jim_server.py b/jim_server.py
index 848ce45..da27ca2 100644
--- a/jim_server.py
+++ b/jim_server.py
@@ -3,6 +3,7 @@
 import socket
 import select
 import time
+import socketserver
 
 from jim_user import *
 from jim_message import *
@@ -282,15 +283,10 @@ def _msg_message_handler(self, socket, jim_msg):
                     else:
                         return user_to.socket, jim_msg
 
-<<<<<<< HEAD
-        socket.close()
-
-=======
                 else:
                     return socket, JimMessage.response_message(RESPONSE_CLIENT_NOT_FOUND, self.encoding)               
             
         else:
             return socket, JimMessage.response_message(RESPONSE_CLIENT_UNAUTHORIZED, self.encoding)
        
-        
->>>>>>> lesson-2
+        
\ No newline at end of file
diff --git a/jim_user.py b/jim_user.py
index 8e8b922..b4ff507 100644
--- a/jim_user.py
+++ b/jim_user.py
@@ -12,8 +12,5 @@ def __init__(self):
         self.is_active = None
         self.date_joined = None
         self.last_login = None
-<<<<<<< HEAD
 
-=======
- 
->>>>>>> lesson-2
+
diff --git a/pytest.bat b/pytest.bat
index 9367a4a..25f847d 100644
--- a/pytest.bat
+++ b/pytest.bat
@@ -1,8 +1,5 @@
 
 @py -m pytest -v %1
 @pause
-<<<<<<< HEAD
 
-=======
- 
->>>>>>> lesson-2
+
diff --git a/server_log.py b/server_log.py
index 08a5b20..016cacd 100644
--- a/server_log.py
+++ b/server_log.py
@@ -2,6 +2,7 @@
 
 import sys
 import logging
+from logging.handlers import TimedRotatingFileHandler
 from functools import wraps
 from datetime import date
 
@@ -16,11 +17,11 @@ def log_wrap(*args, **kwargs):
     return log_wrap
     
 
-logger_name = f"jim_server_{date.today().isoformat()}"
+logger_name = f"jim_server"
 logger = logging.getLogger(logger_name)
 formatter = logging.Formatter("%(asctime)s %(levelname)s %(message)s")
 
-fh = logging.FileHandler(f"{logger_name}.log", encoding="utf-8", delay=True)
+fh = TimedRotatingFileHandler(f"{logger_name}.log", when="D", encoding="utf-8", delay=True)
 fh.setLevel(logging.DEBUG)
 fh.setFormatter(formatter)
 logger.addHandler(fh)
diff --git a/server_main.py b/server_main.py
index c9bbb80..8830c97 100644
--- a/server_main.py
+++ b/server_main.py
@@ -7,7 +7,7 @@
 
 SERVER_HOST = ""
 SERVER_PORT = 7777
-MAX_USERS = 1
+MAX_USERS = 5
 MAX_BUF_SIZE = 1024
 PROBE_INTERVAL_SEC = 60
 DEFAULT_ENCODING = "utf-8"
@@ -41,3 +41,4 @@
 jim_server.user_list = user_list
 jim_server.run_server()
     
+
diff --git a/start_client.bat b/start_client.bat
index 3d341db..1f440cf 100644
--- a/start_client.bat
+++ b/start_client.bat
@@ -2,3 +2,4 @@
 @py client_main.py %1 %2 %3 %4 %5
 @pause
 
+
diff --git a/start_server.bat b/start_server.bat
index d2abd43..9df8e53 100644
--- a/start_server.bat
+++ b/start_server.bat
@@ -1,8 +1,5 @@
 
 @py server_main.py %1 %2 %3 %4
 @pause
-<<<<<<< HEAD
 
-=======
- 
->>>>>>> lesson-2
+
diff --git a/test_client_argv.py b/test_client_argv.py
index 80b2e78..57fdb80 100644
--- a/test_client_argv.py
+++ b/test_client_argv.py
@@ -34,11 +34,6 @@ def test_parse_client_args():
     argv = ("client_main.py", "-p", "XXX")
     assert parse_client_args(argv) == (None, None, None)
     
-<<<<<<< HEAD
-    argv = ("client_main.py", "localhost", "7777")
-    assert parse_client_args(argv) == ("localhost", 7777)
-
-=======
     argv = ("client_main.py", "-a", "localhost", "-p", "7777")
     assert parse_client_args(argv) == ("localhost", 7777, None)
 
@@ -48,4 +43,4 @@ def test_parse_client_args():
     argv = ("client_main.py", "-w", "-a", "localhost", "-p", "7777")
     assert parse_client_args(argv) == ("localhost", 7777, False)
     
->>>>>>> lesson-2
+
diff --git a/test_server_argv.py b/test_server_argv.py
index cf1a2b6..f659406 100644
--- a/test_server_argv.py
+++ b/test_server_argv.py
@@ -32,3 +32,4 @@ def test_parse_server_args():
     assert parse_server_args(argv) == ("localhost", 7777)
 
 
+
diff --git a/test_server_dispatch_message.py b/test_server_dispatch_message.py
index 29a7b08..ade4d70 100644
--- a/test_server_dispatch_message.py
+++ b/test_server_dispatch_message.py
@@ -112,3 +112,4 @@ def test_server_dispatch_message():
     socket_, out_jim_msg = server.dispatch_message(socket.socket(socket.AF_INET, socket.SOCK_STREAM), in_jim_msg)
     assert out_jim_msg.response == RESPONSE_CLIENT_INVALID_CRED
 
+