Made the editor use the former rule about collisions.

The new rule about making a passable overwrite a blocker was causing
more troubles than solving things, so I reverted that to simply
block as soon as there is a blocker.