add cloud conflict