Very hard History quiz

1. What city was reunited with its 32 boroughs under Mayor "Red Ken" Livingstone, whose leftist criticism had led Margaret Thatcher to disband the megacity in the first place?