fix branch slide
git merge slide