updated melon
mp3 added, and updated melon version to fix animations
fixed conflict