Resolving the Conflict