fixed reidrect
fixing merge conflict