Theories of choice and conflict in psychology and economics