Resolving the conflict Jesse introduced yesterday