merges from cm