add favorite Code School path
fix merge conflict