In 1952, following a referendum, Baden, Württemberg-Baden, and Württemberg-Hohenzollern merged into Baden-Württemberg.  In 1957, the Saar Protectorate rejoined the Federal Republic as which city