Resolving Conflicting Preferences in School Choice: The 'Boston' Mechanism Reconsidered