Republicans Fold on Border Measures with New Spending Deal