Mourinho and Guardiola resume a mellowing rivalry