resolving the conflict after merging with master

Author: SaurabhChawla100

sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/csv/CSVInferSchema.scala

@@ -41,7 +41,6 @@ class CSVInferSchema(val options: CSVOptions) extends Serializable {
 
   private val dateFormatter = DateFormatter(
     options.dateFormat,
-    options.zoneId,
     options.locale,
     legacyFormat = FAST_DATE_FORMAT,
     isParsing = true)

sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/json/JsonInferSchema.scala

@@ -47,7 +47,6 @@ private[sql] class JsonInferSchema(options: JSONOptions) extends Serializable {
 
   private val dateFormatter = DateFormatter(
     options.dateFormat,
-    options.zoneId,
     options.locale,
     legacyFormat = FAST_DATE_FORMAT,
     isParsing = true)