diff --git a/java/GmSSL.c b/java/GmSSL.c
index 9c1de5c0..55c38873 100755
--- a/java/GmSSL.c
+++ b/java/GmSSL.c
@@ -1256,6 +1256,7 @@ end:
 
 }
 
+<<<<<<< HEAD
 /*
 static int gmssl_pkey_encrypt(const char *algor, const unsigned char *in, size_t inlen,
 	unsigned char *out, size_t *outlen, const unsigned char *key, size_t keylen)
@@ -1265,6 +1266,10 @@ static int gmssl_pkey_encrypt(const char *algor, const unsigned char *in, size_t
 
 JNIEXPORT jbyteArray JNICALL Java_GmSSL_publicKeyDecrypt(
 	JNIEnv *env, jobject this, jstring algor,
+=======
+JNIEXPORT jbyteArray JNICALL Java_GmSSL_privateKeyDecrypt(
+	JNIEnv *env, jobject this, jstring algor, jint flag,
+>>>>>>> origin/master
 	jbyteArray in, jbyteArray key)
 {
 	jbyteArray ret = NULL;
diff --git a/java/GmSSL.java b/java/GmSSL.java
index 0175f1cb..32c772b2 100755
--- a/java/GmSSL.java
+++ b/java/GmSSL.java
@@ -60,6 +60,7 @@ public class GmSSL {
 	public native int getCipherIVLength(String cipher);
 	public native int getCipherKeyLength(String cipher);
 	public native int getCipherBlockSize(String cipher);
+<<<<<<< HEAD
 	public native byte[] symmetricEncrypt(String cipher, byte[] in, byte[] key, byte[] iv);
 	public native byte[] symmetricDecrypt(String cipher, byte[] in, byte[] key, byte[] iv);
 	public native int getDigestLength(String digest);
@@ -73,6 +74,26 @@ public class GmSSL {
 	public native byte[] publicKeyDecrypt(String algor, byte[] in, byte[] privateKey);
 	public native byte[] deriveKey(String algor, int keyLength, byte[] peerPublicKey, byte[] privateKey);
 	public native String[] getErrorStrings();
+=======
+	public native byte [] symmetricEncrypt(String cipher, int flag, byte [] in, byte [] key, byte [] iv);
+	public native byte [] symmetricDecrypt(String cipher, int flag, byte [] in, byte [] key, byte [] iv);
+	public native String [] getDigests(boolean aliases);
+	public native int getDigestLength(String digestAlgor);
+	public native int getDigestBlockSize(String digestAlgor);
+	public native byte [] digest(String algor, int flag, byte [] data);
+	public native String [] getMacs(boolean aliases);
+	public native String [] getMacLength(String algor);
+	public native byte [] mac(String algor, int flag, byte [] data, byte [] key);
+	public native String [] getSignAlgorithms(boolean aliases);
+	public native byte [] sign(String algor, int flag, byte [] data, byte [] privateKey);
+	public native int verify(String algor, int flag, byte [] digest, byte [] signature, byte [] publicKey);
+	public native String [] getPublicKeyEncryptions(boolean aliases);
+	public native byte [] publicKeyEncrypt(String algor, int flag, byte [] in, byte [] publicKey);
+	public native byte [] privateKeyDecrypt(String algor, int falg, byte [] in, byte [] privateKey);
+	public native String [] getDeriveKeyAlgorithms(boolean aliases);
+	public native byte [] deriveKey(String algor, int flag, int keyLength, byte [] peerPublicKey, byte [] privateKey);
+	public native String getErrorString();
+>>>>>>> origin/master
 
 	public static void main(String[] args) {
 		int i;