merge SmartCloud edit