url redirection fixes...
merge conflict fix