resolve conflict
change video page to work page