Allow connecting a word to the right of a poem
Resolve merge conflicts