Update user canel event error message handling
Update indexing of video position
Resolve conflicts