DONE WIT SHIT YO
fixed melody attribute to be an arr of midi val rather than freq
merge confl