fixed merge conflicts

CHANGELOG.md

CRM/Civirules/Trigger.php

CRM/Civirules/Trigger/Cron.php

CRM/Civirules/Trigger/Post.php

CRM/Civirules/Upgrader.php

CRM/CivirulesConditions/Form/Membership/EndDateChanged.php

CRM/CivirulesConditions/Form/Membership/Type.php

CRM/CivirulesConditions/Generic/FieldChanged.php

CRM/CivirulesConditions/Membership/EndDateChanged.php

CRM/CivirulesConditions/Membership/Type.php

info.xml

sql/conditions.json

...RM/CivirulesConditions/Form/Membership/EndDateChanged.tpl

templates/CRM/CivirulesConditions/Form/Membership/Type.tpl

xml/Menu/civirules.xml