Merge  with cocos2d:v3