# Conflicts: # src/logic/scripting/descriptors_manager.cpp # src/logic/scripting/descriptors_manager.hpp