Fixed url conflicts

Merged okhin requested to merge url_conflicts-1d2c09f8 into master

Created by: jpic

Merge request reports