I added a new stanza to master branch to test merging differences
I broke everything