Vodafone and Three make progress in merger talks