Resolve VideoFragment conflict