This is a second proposed edit to try to get a "merge conflict" to happe...

...n