participant:edit handler added
merge conflicts fixed