Bush expects accord on McCain’s bill