Update VideoTest.groovy

Remove conflict marker