ally combat overrides collision ai

fixes #61