solve conflits