they had a run in during the meeting but resolved it quickly