fix confilct
Merge remote-tracking branch 'GuessWord/master'