diff --git a/frappy/params.py b/frappy/params.py
index 8d33871..a2e0639 100644
--- a/frappy/params.py
+++ b/frappy/params.py
@@ -169,7 +169,11 @@ class Parameter(Accessible):
         OrType(FloatRange(0), EnumType(always=0, never=999999999, default=-1)),
         export=False, default=-1)
     influences = Property(
+<<<<<<< HEAD
         'optional hint about affected parameters', ArrayOf(StringType()),
+=======
+        'optional hint about effected parameters', ArrayOf(StringType()),
+>>>>>>> update 2023-05-30 from gitmlz
         extname='influences', export=True, mandatory=False, default=[])
 
     # used on the instance copy only