Avoid duplicate edit forms when a collision occurs in normal edit mode (i.e. not side-by-side). Fixes #580.