comflict solved?