fixing syntax in urls, removed merge marker