fix error + add screencast slide
merge conflict