integrated musicTree with musicUSBView
fixed merge conflict