diff --git a/examples/DDG4/scripts/TestProperties.py b/examples/DDG4/scripts/TestProperties.py
index c8cc9433614dfbbdba54fbe71dbca40ad8a3578f..b8aeb6cbd60a0d21e0a8b6ed4b21e34479adebbd 100644
--- a/examples/DDG4/scripts/TestProperties.py
+++ b/examples/DDG4/scripts/TestProperties.py
@@ -284,6 +284,7 @@ def run():
                               (111 * GeV,222 * GeV,333 * GeV,444 * GeV)]
 
   #  Check read access:
+<<<<<<< HEAD
   print('-------------------------------------------------------')
   print(act.prop_str)              #     'Hello World!'
   print(act.prop_bool)             #     True
@@ -295,6 +296,29 @@ def run():
   print(act.prop_PxPyPzEVector)    #     (1 * GeV,2 * GeV,3 * GeV,4 * GeV)
   print('-------------------------------------------------------')
 >>>>>>> c61ce8aa (Fix python style according to Flake8)
+||||||| parent of 131094de (Fix python style according to Flake8)
+  print('-------------------------------------------------------')
+  print(act.prop_str)              #     'Hello World!'
+  print(act.prop_bool)             #     True
+  print(act.prop_int)              #     1234
+  print(act.prop_float)            #     1234567.8
+  print(act.prop_double)           #     1234567.8
+  print(act.prop_XYZPoint)         #     (1,2,3)
+  print(act.prop_XYZVector)        #     (1 * m,2 * m,3 * m)
+  print(act.prop_PxPyPzEVector)    #     (1 * GeV,2 * GeV,3 * GeV,4 * GeV)
+  print('-------------------------------------------------------')
+=======
+  print('--> %s'%(str('-------------------------------------------------------'),))
+  print('--> %s'%(str(act.prop_str),))              #     'Hello World!'
+  print('--> %s'%(str(act.prop_bool),))             #     True
+  print('--> %s'%(str(act.prop_int),))              #     1234
+  print('--> %s'%(str(act.prop_float),))            #     1234567.8
+  print('--> %s'%(str(act.prop_double),))           #     1234567.8
+  print('--> %s'%(str(act.prop_XYZPoint),))         #     (1,2,3)
+  print('--> %s'%(str(act.prop_XYZVector),))        #     (1 * m,2 * m,3 * m)
+  print('--> %s'%(str(act.prop_PxPyPzEVector),))    #     (1 * GeV,2 * GeV,3 * GeV,4 * GeV)
+  print('--> %s'%(str('-------------------------------------------------------'),))
+>>>>>>> 131094de (Fix python style according to Flake8)
 
   act.enableUI()