Started to make a music manager
Fixed merge conflict