Merge helpor

The old auto-generated edit note is gone :frowning:
Other than that, it works!