solve conflicts

game/engines/default/engine/Birther.lua

game/engines/default/engine/Chat.lua

game/engines/default/engine/I18N.lua

game/engines/default/engine/dialogs/ShowEquipInven.lua

game/engines/default/engine/dialogs/ShowEquipment.lua

game/engines/default/engine/dialogs/ShowInventory.lua

game/engines/default/engine/dialogs/ShowPickupFloor.lua

game/engines/default/engine/dialogs/ShowStore.lua

game/engines/default/engine/ui/Inventory.lua

game/engines/default/engine/utils.lua

game/modules/tome/class/Actor.lua

game/modules/tome/class/GameState.lua

game/modules/tome/class/Object.lua

game/modules/tome/class/Party.lua

game/modules/tome/class/interface/Combat.lua

game/modules/tome/class/uiset/ClassicPlayerDisplay.lua

game/modules/tome/class/uiset/Minimalist.lua

game/modules/tome/data/calendar_allied.lua

game/modules/tome/data/calendar_dwarf.lua

game/modules/tome/data/damage_types.lua