What states became Berlin in 1980