I just pull from https://github.com/cocos2d/cocos2d-x.git and merge the conflict script  file, please help me correct it if I made an error.