added favorite Code School path
fix conflicts