added poem groups
fixed merge conflict