Update apply.sh to create non-existed dirs
Fix the conflicts