undo: only merge geometry changes on the feature (fixes #8265)