add player2 disconnect wait
fix merge