Fix merge conflict error in video.py