Updated video tracking to use new merge function

also changed suspended to completed on stop_video