Fixed typo in global redirect
Fixed merge