added wavs
fixed conflicts