Conflict and Its Resolution in Contemporary Africa