Under the deal , President Bush dropped his demand that Congress redefine the nation 's obligations under the Geneva Conventions , handing a victory to a group of Republicans , including Senator John McCain of Arizona , whose opposition had created a showdown over a fundamental aspect of the rules for battling terrorism .