last fix on combatsToResolve