Re-commit ChatServer