# Conflicts: # apps/openmw/mwgui/container.cpp # apps/openmw/mwmechanics/actors.cpp # apps/openmw/mwworld/worldimp.hpp