Making peace during war