added gamefinish unfinished
fixed conflict