Combat mode finished

I think