Merge "refactored the git checkout code"