PoldiAutoCorrelation - more fixes for merging