Add one more attendee
merge Bee-Doh
merge local and remote