merging cm  new stuff