Fixed merge conflicts
Fixing redirect