Vodafone and TPG merger back on