fix conflict

README.md

@@ -287,7 +287,15 @@ For more details about the test, see [here](./core/src/test/Readme.md).
 
 4. `Null in aggregration` is not supported, e.g. `select sum(null) from t group by col1`.
 
-5.  The dependency `tispark-assembly` should not be packaged into `JAR of JARS` file (for example, build with spring-boot-maven-plugin), or you will get `ClassNotFoundException`. You can solve it by adding `spark-wrapper-spark-version` in your dependency or constructing another forms of jar file.
+5. The dependency `tispark-assembly` should not be packaged into `JAR of JARS` file (for example, build with spring-boot-maven-plugin), or you will get `ClassNotFoundException`. You can solve it by adding `spark-wrapper-spark-version` in your dependency or constructing another forms of jar file.
+
+6. TiSpark doesn't support collations now. `new_collations_enabled_on_first_bootstrap` should not be set to `true`.
+
+7. TiSpark doesn't support TLS now. You can't connect TiDB with TLS.
+
+8. TiSpark doesn't support collations now. `new_collations_enabled_on_first_bootstrap` should not be set to `true`.
+
+9. If `spark.sql.ansi.enabled` is false an overflow of sum(bigint) will not cause an error but “wrap” the result, or you can cast bigint to decimal to avoid the overflow.
 
 ## Follow us
 

pom.xml

@@ -80,7 +80,7 @@
         <scalatest.version>3.0.8</scalatest.version>
         <argLine>-Dfile.encoding=UTF-8 -Duser.timezone=GMT+8</argLine>
         <mysql.connector.version>8.0.29</mysql.connector.version>
-        <gpg.keyname>fake gpg keyname</gpg.keyname>
+        <gpg.pub.key>fake gpg keyname</gpg.pub.key>
         <gpg.skip>true</gpg.skip>
         <javadoc.skip>true</javadoc.skip>
         <skipFetchTestData>false</skipFetchTestData>