Merge pull request tronprotocol#2339 from tronprotocol/p2p_adv_t

Resolving code conflict

Author: xxo1shine

src/main/java/org/tron/program/Version.java

@@ -1,6 +1,7 @@
 package org.tron.program;
 
 public class Version {
+
   private static final String version = "3.6.1";
   public static final String versionName = "Odyssey-v3.5.1-890-gd39973cbb";
   public static final String versionCode = "10803";