Conflict and its Resolution in Contemporary Africa