add time control for a long-time spider
Resolve merge conflict