fix path
git logic
refine logic