The two companies had been engaged in a spat over Visa’s cross-border interchange fees, which had risen after the UK left the EU