add sorcery contribution
merge branch and fix conflicts