Social conflict and the city