Change to TYE from FlyPunch
Fixed link to confirmation
Fixed conflict
Fixed index link again
Keep TYE links working