diff --git a/examples/DDG4/scripts/TestProperties.py b/examples/DDG4/scripts/TestProperties.py
index b8aeb6cbd60a0d21e0a8b6ed4b21e34479adebbd..7022e8ce0aeffd803c591cb8b55d49092ee9f65d 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
 <<<<<<< HEAD
   print('-------------------------------------------------------')
   print(act.prop_str)              #     'Hello World!'
@@ -319,6 +320,29 @@ def run():
   print('--> %s'%(str(act.prop_PxPyPzEVector),))    #     (1 * GeV,2 * GeV,3 * GeV,4 * GeV)
   print('--> %s'%(str('-------------------------------------------------------'),))
 >>>>>>> 131094de (Fix python style according to Flake8)
+||||||| parent of d656762e (Fix python style according to Flake8)
+  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('-------------------------------------------------------'),))
+=======
+  print('--> {value}'.format(value='-------------------------------------------------------'))
+  print('--> {value}'.format(value=str(act.prop_str)))              #     'Hello World!'
+  print('--> {value}'.format(value=str(act.prop_bool)))             #     True
+  print('--> {value}'.format(value=str(act.prop_int)))              #     1234
+  print('--> {value}'.format(value=str(act.prop_float)))            #     1234567.8
+  print('--> {value}'.format(value=str(act.prop_double)))           #     1234567.8
+  print('--> {value}'.format(value=str(act.prop_XYZPoint)))         #     (1,2,3)
+  print('--> {value}'.format(value=str(act.prop_XYZVector)))        #     (1 * m,2 * m,3 * m)
+  print('--> {value}'.format(value=str(act.prop_PxPyPzEVector)))    #     (1 * GeV,2 * GeV,3 * GeV,4 * GeV)
+  print('--> {value}'.format(value='-------------------------------------------------------'))
+>>>>>>> d656762e (Fix python style according to Flake8)
 
   act.enableUI()