finished invite
fixed conflicts