add music
fix imports merging problem