Resolving Conflics