istorie conflict