Useless experimental changes that will probably cause merge conflicts, edition #1.
Fixing merge conflict, edition #1.