changed param name and test according to comments

Author: leahmcguire

mllib/src/test/scala/org/apache/spark/ml/tuning/CrossValidatorSuite.scala

@@ -56,11 +56,7 @@ class CrossValidatorSuite extends SparkFunSuite with MLlibTestSparkContext {
     val parent = cvModel.bestModel.parent.asInstanceOf[LogisticRegression]
     assert(parent.getRegParam === 0.001)
     assert(parent.getMaxIter === 10)
-<<<<<<< HEAD
-    assert(cvModel.avgMetrics.length == lrParamMaps.length)
-=======
-    assert(cvModel.crossValidationMetrics.length == 4)
->>>>>>> rebasing
+    assert(cvModel.avgMetrics.length === lrParamMaps.length)
   }
 
   test("validateParams should check estimatorParamMaps") {