add sqrt(mag) case; add fps1.wav and fps1.lab as an easy practical example; tweak beat-map integration
resolve merge conflicts in mergetool opendiff