Deal reached to avert government shutdown