When did civil war end