Legacy url redirection completed
Conflict fixed