test pull conflict
Dinglei test pull --rebase new
Merge branch 'master' of https://github.com/devilknight1986/FiveChessGame