Added note-to-frequency dictionary
fix merge conflict