fix conflict

Author: HeartSaVioR

sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/state/RocksDBStateStoreProvider.scala

@@ -520,7 +520,7 @@ private[sql] class RocksDBStateStoreProvider
 
         if (storeConf.rowChecksumEnabled) {
           // multiGet provides better perf for row checksum, since it avoids copying values
-          val encodedValuesIterator = rocksDB.multiGet(
+          val encodedValuesIterator = rocksDB.getMergedValues(
             keyEncoder.encodeKeyWithEventTime(key, eventTime), columnFamilyName)
           valueEncoder.decodeValues(encodedValuesIterator)
         } else {