Vivendi and Mediaset agree to make peace