fixed issue when returning after melee and issue when choosing new opponent