a few updates and youtube link
fixing db merge conflict