working to stabilize sorcery version
resolving merge conflict in gemfile.lock