Fixing the url parameters
Merge