Competing bills deal with 2025 sales tax expiration