Mastercard settles long-running UK dispute