merge cm changes