conflict unsolved