{"type":"video","version":"1.0","html":"<iframe src=\"https://www.loom.com/embed/c1514abd4bef4f41b103b8d6e10b57f1\" frameborder=\"0\" width=\"1280\" height=\"960\" webkitallowfullscreen mozallowfullscreen allowfullscreen></iframe>","height":960,"width":1280,"provider_name":"Loom","provider_url":"https://www.loom.com","thumbnail_height":960,"thumbnail_width":1280,"thumbnail_url":"https://cdn.loom.com/sessions/thumbnails/c1514abd4bef4f41b103b8d6e10b57f1-00001.jpg","duration":593,"title":"GitHub Introduction &amp; Basics Part 2","description":"Please see updated diagram for merge conflict which was incorrect: https://docs.google.com/drawings/d/1bUOKIJYZKQ5IgKN3j2oI5xISM1KmGzM1lcoCFKcY4ms/edit?usp=sharing"}