conflicts with sorcery
fix merge conflicts