merge from cm