added merge
integrated merge, now crawling should work