- added participants in getUserAv and getMatchAv
- fixed conflicts