Berlin, Paris overcome rift over nuclear energy, French official says