Remove left over conflict marker

Author: jsji

clang/lib/Serialization/ASTReaderStmt.cpp

@@ -3887,7 +3887,6 @@ Stmt *ASTReader::ReadStmtFromStream(ModuleFile &F) {
       S = new (Context) BuiltinBitCastExpr(Empty);
       break;
 
-<<<<<<< HEAD
     case EXPR_SYCL_BUILTIN_NUM_FIELDS:
       S = new (Context) SYCLBuiltinNumFieldsExpr(Empty);
       break;