corrected a merge mistake in CHANGELOG