The House and Senate agreed to a $633.3 billion defense authorization bill Tuesday, resolving a number of contentious policy divisions and paving the way for the legislation’s passage this week.

The heads of the House and Senate Armed Services panels emerged from a weeklong conference committee with the final bill, which includes new sanctions against Iran, a mandate for the Pentagon to study a potential East Coast missile defense site and compromise language on military detention of U.S. citizens.

The conference report also removed several contentious policy provisions that were in either the House or Senate bills: a prohibition on the military’s use of biofuels, a ban on same-sex marriage ceremonies on military bases and an open-ended restriction on transferring Guantanamo detainees to the United States.