Add conflict description dialog