check video links left
fix merge conflict