add wiki content crawl
resolve merge conflict