reconciled merge conflicts in sounds_controller