clean up
Add test to attendee_repository
fix merge conflict