Fixed Client Connection Issues
Fixed Conflict