diff --git a/.gitignore b/.gitignore
index 790fd89..80d5f5f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,6 @@ jiangchao
 __pycache__
 
 test.py
+example.py 
+
+ReEncrypt.py
diff --git a/src/tpre.py b/src/tpre.py
index c005413..f4b8a85 100644
--- a/src/tpre.py
+++ b/src/tpre.py
@@ -125,6 +125,7 @@ def Setup(sec: int) -> Tuple[CurveFp, Tuple[int, int],
     sec: an init safety param
     
     return:
+<<<<<<< HEAD
     G: sm2 curve
     g: generator
     U: another generator
@@ -196,6 +197,7 @@ def GenerateKeyPair(
     public_key_x = int.from_bytes(bytes(sm2.public_key.x),"big")
     public_key_y = int.from_bytes(bytes(sm2.public_key.y),"big")
     public_key = (public_key_x, public_key_y)
+      
     
     secret_key = int.from_bytes(bytes(sm2.private_key),"big")