Updated document
Update junit
Resolve conficts