git checkout master
git cherry-pick bugFix
