Tentative deal is reached in Republican fight over proxy voting for new parents