synchronization of lecture videos and images
minor fix
resolve conflict