spectrogram
merge conflict resolved