merging code from cloud