add sorcery login
merge conflicts