Fixed game erb
changed to opponent_for
fixed merge conflicts