initial scrape prepared
fixed conflicts