Revert change to sinatra service X-Conflicts setting