game finished
fix conflict