Sky and Discovery overcome dispute to sign new deal