Agreement between economic powerhouses reached after heads of state meet, following months of exacerbated tensions.