ZEGO previous changes are merged in

Changes are merged but there is quite a bit of stutter.