fixed merge conflicts in pitchdEtector.h and testApp.h