resolve code conflicts

Author: zeusoo001

README.md

@@ -12,11 +12,7 @@
 
 <p align="center">
   <a href="https://gitter.im/tronprotocol/allcoredev">
-    <img src="https://camo.githubusercontent.com/da2edb525cde1455a622c58c0effc3a90b9a181c/68747470733a2f2f6261646765732e6769747465722e696d2f4a6f696e253230436861742e737667">
-  </a>
-
-  <a href="https://travis-ci.org/tronprotocol/java-tron">
-    <img src="https://travis-ci.org/tronprotocol/java-tron.svg?branch=develop">
+    <img src="https://img.shields.io/gitter/room/tronprotocol/java-tron.svg">
   </a>
 
   <a href="https://codecov.io/gh/tronprotocol/java-tron">

framework/src/test/java/org/tron/core/zksnark/ShieldedReceiveTest.java

@@ -320,8 +320,8 @@ public void testBroadcastBeforeAllowZksnark()
   }
 
   /*
-   * generate spendproof, dataToBeSigned, outputproof example dynamically according to
-   * the params file.
+   * generate spendproof, dataToBeSigned,
+   * outputproof example dynamically according to the params file
    */
   public String[] generateSpendAndOutputParams() throws ZksnarkException, BadItemException {
     librustzcashInitZksnarkParams();