solve conflics