update stats from server
fixed merge