add hangman in place
fix merge issues