I'll take a look to this. Also, I've rebased my pull request on the latest cocos2d-x. This should fix all the merge problem you were having. Please let me know.