validation for guess is working
fixed merge conflicts