Remove stray line from merge conflict.
Add the rust-url dependency to Cargo.toml
Upgrade to rust-url change: the url_ crate was renamed url.