Repsol-YPF: burying the hatchet?