Merge all changes from cm