fix merge conflict in wav.py