Add new coursetree
Fix merge conflicts