# Conflicts: # core/libs/world/include/ymir/world/wave/WaveForces.h # core/libs/world/src/wave/WaveForces.cpp