Resolving the conflicts