U.S. and Germany Defuse an Energy Dispute, Easing Tensions