update to call back
fixes to conflicts
fixes to the routes
fixes to the correct song response