init z.sh in bash_profile
fix merge conflicts