VW and Porsche Merger Is Back on Track