added myself
resolved conflict in attendees