Update models to participanttracker package
Fix merge conflict