NY lawmakers strike deal to bring back 421-a tax break