Audio player controls
Fixed merge conflicts