add mock meeting
fix merge conflits