Resolve conflicts

jupyter_server/services/sessions/sessionmanager.py

@@ -210,6 +210,7 @@ def __init__(self, *args, **kwargs):
     _cursor = None
     _connection = None
     _columns = {"session_id", "path", "name", "type", "kernel_id"}
+
     @property
     def cursor(self):
         """Start a cursor and create a database called 'session'"""