last changes to cloud
successful merge