fixed merge/sync issue in server.py and also fixed a bug