correct urls added to config files
merging final changes