A revised diffusion model for conflict tasks | Synapse