Fix conflicting URLs

Merged okhin requested to merge url_conflicts-992fc8a0 into master

Created by: jpic

Merge request reports