Update SqlParser.scala

Author: YanjieGao

sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/SqlParser.scala

@@ -119,12 +119,8 @@ class SqlParser extends StandardTokenParsers with PackratParsers {
   protected val UNCACHE = Keyword("UNCACHE")
   protected val UNION = Keyword("UNION")
   protected val WHERE = Keyword("WHERE")
-<<<<<<< HEAD
   protected val EXCEPT = Keyword("EXCEPT")
-=======
-   protected val WHERE = Keyword("EXCEPT")
 
->>>>>>> origin/master
 
   // Use reflection to find the reserved words defined in this class.
   protected val reservedWords =