Pushing the fixed version, with combatant included
Seems an empty commit

but I don't want eclipse flipping out