Conflicts: features/backend/project_activity_resources/activity.feature features/backend/triggers_resources/triggers.feature features/bootstrap/RestContext.php
Conflicts: features/backend/project_activity_resources/activity.feature features/backend/triggers_resources/triggers.feature features/bootstrap/RestContext.php