melody modifiers working
merge conflict