added cloud
merge conflic solved