finished mergeSeries(), easier to change how conflicts are handled