Resolving the conflicts.