attendee repo fix merge