diff --git a/python/paddle/fluid/transpiler/distribute_transpiler.py b/python/paddle/fluid/transpiler/distribute_transpiler.py
index b6de0e9a99eb7509756de2ba209745b4f91d3400..5d348f0995fbff7bbefa3324caffb448c98f552f 100644
--- a/python/paddle/fluid/transpiler/distribute_transpiler.py
+++ b/python/paddle/fluid/transpiler/distribute_transpiler.py
@@ -193,7 +193,6 @@ class DistributeTranspiler(object):
                trainer_id=trainer_id
            )
     """
->>>>>>> develop
 
     def __init__(self, config=None):
         if config is not None: