merge latest cm