Africa: Conflict is not going away, but it is evolving