EDF Energy is, after much consolidation, the UK’s biggest energy provider. Its next task is to bring its pension funds in line with the mergers and extend the offer to all employees. Sam Greene reports