new_fight added
the old_fight continues
new_fight continued
Merge branch 'issbr'