latest server changes
fixing conflicts