Will lawmakers battle over school choice again? House says no, but teacher pay bill contains the language