fixed config file with correct url and base url fields
merged old config and new config to refelct corrected url and base url fields