Add redirect
Fixed conflict