conflict resolving 1