change redirect logic
fix conflict