Actually, under the German Constitution, Berlin is a city-state, that is, it is both a city and a state at the same time.
Interesting. I did not know that.
I know they chose Bonn as capitol of West Germany so no one would complain when they moved it back to Berlin.