Fix blocks
Selenium replace
Resolve conflict