fix bugs of inifinite loop in StreamItemDocument
re-configure terrier
try to resolve conflicts