# Conflicts: # src/entities/base/mapObject.ts # src/events/gameMaster/assetManager/mapObject/update.ts