fix video flicker bug
fix confilict