Talks have helped to steady a rocky relationship between the world's top two economies - but the rivalry persists.
