modify player1 by wei-chien
fix merge confliction
little adjustment