Lawmakers reach deal on border wall funding