# Conflicts: # cocos/scripting/js-bindings/auto/jsb_creator_auto.cpp # cocos/scripting/js-bindings/manual/jsb_creator_physics_manual.cpp