merging cm changes