Standardize the redirects
Merge conflict fix