resolved second git merge conflict with youtube video