What two cities were at war during this time