Be more flexible about URLs with highlighting a source range
Resolve merge conflicts