different browsers resolve the conflicts differently, and the "proper" resolution is not what we actually want. Reported by Peter Funk <pf@artcom-gmbh.de>.
This fixes SourceForge bug #113810.