House-Senate deal reached on payroll tax measure