merge cm10.2 sources