rebasing and updating ember with ccp